[ty] avoid standalone expressions for simple subscript targets

2025-10-09 15:57:54 -07:00
484 changed files with 5762 additions and 16618 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -142,7 +142,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
@@ -361,37 +361,6 @@ jobs:
          cargo nextest run --all-features --profile ci
          cargo test --all-features --doc

-  cargo-test-macos:
-    name: "cargo test (macos)"
-    runs-on: macos-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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          persist-credentials: false
-      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
-      - name: "Install cargo nextest"
-        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"
-        run: |
-          cargo nextest run --all-features --profile ci
-          cargo test --all-features --doc
-
  cargo-test-wasm:
    name: "cargo test (wasm)"
    runs-on: ubuntu-latest
@@ -422,6 +391,23 @@ 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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - name: "Install Rust toolchain"
+        run: rustup show
+      - name: "Install mold"
+        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+      - name: "Build"
+        run: cargo build --release --locked
+
  cargo-build-msrv:
    name: "cargo build (msrv)"
    runs-on: depot-ubuntu-latest-8
@@ -466,7 +452,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@a66119fbb1c952daba62640c2609111fe0803621 # v1.15.7
+        uses: cargo-bins/cargo-binstall@38e8f5e4c386b611d51e8aa997b9a06a3c8eb67a # v1.15.6
      - 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
@@ -717,7 +703,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@a66119fbb1c952daba62640c2609111fe0803621 # v1.15.7
+      - uses: cargo-bins/cargo-binstall@38e8f5e4c386b611d51e8aa997b9a06a3c8eb67a # v1.15.6
      - run: cargo binstall --no-confirm cargo-shear
      - run: cargo shear

@@ -735,7 +721,7 @@ jobs:
      - 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
+        run: cargo run --release --package ty_completion_eval -- all --threshold 0.1 --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

@@ -967,7 +953,7 @@ jobs:
        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@6b43a0cd438f6ca5ad26f9ed03ed159ed2df7da9 # v4.1.1
+        uses: CodSpeedHQ/action@3959e9e296ef25296e93e32afcc97196f966e57f # v4.1.0
        with:
          mode: instrumentation
          run: cargo codspeed run
@@ -1002,23 +988,19 @@ jobs:
        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
+        uses: CodSpeedHQ/action@3959e9e296ef25296e93e32afcc97196f966e57f # v4.1.0
        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"
+    env:
+      TY_LOG: ruff_benchmark=debug
    steps:
      - name: "Checkout Branch"
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -1040,7 +1022,7 @@ jobs:
        run: cargo codspeed build --features "codspeed,walltime" --no-default-features -p ruff_benchmark

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@6b43a0cd438f6ca5ad26f9ed03ed159ed2df7da9 # v4.1.1
+        uses: CodSpeedHQ/action@3959e9e296ef25296e93e32afcc97196f966e57f # v4.1.0
        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
@@ -1048,5 +1030,5 @@ jobs:
          CODSPEED_PERF_ENABLED: false
        with:
          mode: walltime
-          run: cargo codspeed run --bench ty_walltime "${{ matrix.benchmarks }}"
+          run: cargo codspeed run
          token: ${{ secrets.CODSPEED_TOKEN }}
--- a/.github/workflows/ty-ecosystem-analyzer.yaml
+++ b/.github/workflows/ty-ecosystem-analyzer.yaml
@@ -64,12 +64,12 @@ jobs:

          cd ..

-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@908758da02a73ef3f3308e1dbb2248510029bbe4"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@279f8a15b0e7f77213bf9096dbc2335a19ef89c5"

          ecosystem-analyzer \
            --repository ruff \
            diff \
-            --profile=profiling \
+            --profile=release \
            --projects-old ruff/projects_old.txt \
            --projects-new ruff/projects_new.txt \
            --old old_commit \
--- a/.github/workflows/ty-ecosystem-report.yaml
+++ b/.github/workflows/ty-ecosystem-report.yaml
@@ -49,13 +49,13 @@ jobs:

          cd ..

-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@908758da02a73ef3f3308e1dbb2248510029bbe4"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@279f8a15b0e7f77213bf9096dbc2335a19ef89c5"

          ecosystem-analyzer \
            --verbose \
            --repository ruff \
            analyze \
-            --profile=profiling \
+            --profile=release \
            --projects ruff/crates/ty_python_semantic/resources/primer/good.txt \
            --output ecosystem-diagnostics.json

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -50,9 +50,9 @@ dependencies = [

 [[package]]
 name = "anstream"
-version = "0.6.21"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@@ -65,9 +65,9 @@ dependencies = [

 [[package]]
 name = "anstyle"
-version = "1.0.13"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"

 [[package]]
 name = "anstyle-lossy"
@@ -214,6 +214,15 @@ 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"
@@ -234,26 +243,6 @@ 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"
@@ -327,9 +316,9 @@ dependencies = [

 [[package]]
 name = "camino"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
+checksum = "e1de8bc0aa9e9385ceb3bf0c152e3a9b9544f6c4a912c8ae504e80c1f0368603"
 dependencies = [
 "serde_core",
 ]
@@ -361,15 +350,6 @@ dependencies = [
 "shlex",
 ]

-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
 [[package]]
 name = "cfg-if"
 version = "1.0.3"
@@ -420,17 +400,6 @@ dependencies = [
 "half",
 ]

-[[package]]
-name = "clang-sys"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-dependencies = [
- "glob",
- "libc",
- "libloading",
-]
-
 [[package]]
 name = "clap"
 version = "4.5.48"
@@ -517,17 +486,16 @@ dependencies = [

 [[package]]
 name = "codspeed"
-version = "4.0.4"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0f62ea8934802f8b374bf691eea524c3aa444d7014f604dd4182a3667b69510"
+checksum = "35584c5fcba8059780748866387fb97c5a203bcfc563fc3d0790af406727a117"
 dependencies = [
 "anyhow",
- "bindgen",
- "cc",
+ "bincode 1.3.3",
 "colored 2.2.0",
 "glob",
 "libc",
- "nix 0.30.1",
+ "nix 0.29.0",
 "serde",
 "serde_json",
 "statrs",
@@ -536,22 +504,20 @@ dependencies = [

 [[package]]
 name = "codspeed-criterion-compat"
-version = "4.0.4"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d87efbc015fc0ff1b2001cd87df01c442824de677e01a77230bf091534687abb"
+checksum = "78f6c1c6bed5fd84d319e8b0889da051daa361c79b7709c9394dfe1a882bba67"
 dependencies = [
- "clap",
 "codspeed",
 "codspeed-criterion-compat-walltime",
 "colored 2.2.0",
- "regex",
 ]

 [[package]]
 name = "codspeed-criterion-compat-walltime"
-version = "4.0.4"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae5713ace440123bb4f1f78dd068d46872cb8548bfe61f752e7b2ad2c06d7f00"
+checksum = "c989289ce6b1cbde72ed560496cb8fbf5aa14d5ef5666f168e7f87751038352e"
 dependencies = [
 "anes",
 "cast",
@@ -574,22 +540,20 @@ dependencies = [

 [[package]]
 name = "codspeed-divan-compat"
-version = "4.0.4"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b4214b974f8f5206497153e89db90274e623f06b00bf4b9143eeb7735d975d"
+checksum = "adf64eda57508448d59efd940bad62ede7c50b0d451a150b8d6a0eca642792a6"
 dependencies = [
- "clap",
 "codspeed",
 "codspeed-divan-compat-macros",
 "codspeed-divan-compat-walltime",
- "regex",
 ]

 [[package]]
 name = "codspeed-divan-compat-macros"
-version = "4.0.4"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a53f34a16cb70ce4fd9ad57e1db016f0718e434f34179ca652006443b9a39967"
+checksum = "058167258e819b16a4ba601fdfe270349ef191154758dbce122c62a698f70ba8"
 dependencies = [
 "divan-macros",
 "itertools 0.14.0",
@@ -601,9 +565,9 @@ dependencies = [

 [[package]]
 name = "codspeed-divan-compat-walltime"
-version = "4.0.4"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a5099050c8948dce488b8eaa2e68dc5cf571cb8f9fce99aaaecbdddb940bcd"
+checksum = "48f9866ee3a4ef9d2868823ea5811886763af244f2df584ca247f49281c43f1f"
 dependencies = [
 "cfg-if",
 "clap",
@@ -1563,7 +1527,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
 dependencies = [
 "equivalent",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.0",
 "serde",
 "serde_core",
 ]
@@ -1837,15 +1801,15 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

 [[package]]
 name = "libc"
-version = "0.2.177"
+version = "0.2.175"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"

 [[package]]
 name = "libcst"
-version = "1.8.5"
+version = "1.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d56bcd52d9b5e5f43e7fba20eb1f423ccb18c84cdf1cb506b8c1b95776b0b49"
+checksum = "052ef5d9fc958a51aeebdf3713573b36c6fd6eed0bf0e60e204d2c0f8cf19b9f"
 dependencies = [
 "annotate-snippets",
 "libcst_derive",
@@ -1858,24 +1822,14 @@ dependencies = [

 [[package]]
 name = "libcst_derive"
-version = "1.8.5"
+version = "1.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fcf5a725c4db703660124fe0edb98285f1605d0b87b7ee8684b699764a4f01a"
+checksum = "a91a751afee92cbdd59d4bc6754c7672712eec2d30a308f23de4e3287b2929cb"
 dependencies = [
 "quote",
 "syn",
 ]

-[[package]]
-name = "libloading"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
-dependencies = [
- "cfg-if",
- "windows-link 0.2.0",
-]
-
 [[package]]
 name = "libmimalloc-sys"
 version = "0.1.44"
@@ -2017,9 +1971,9 @@ checksum = "2f926ade0c4e170215ae43342bf13b9310a437609c81f29f86c5df6657582ef9"

 [[package]]
 name = "memchr"
-version = "2.7.6"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"

 [[package]]
 name = "memoffset"
@@ -2528,16 +2482,6 @@ dependencies = [
 "yansi",
 ]

-[[package]]
-name = "prettyplease"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
-dependencies = [
- "proc-macro2",
- "syn",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "3.4.0"
@@ -2569,9 +2513,9 @@ dependencies = [

 [[package]]
 name = "pyproject-toml"
-version = "0.13.7"
+version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6d755483ad14b49e76713b52285235461a5b4f73f17612353e11a5de36a5fd2"
+checksum = "ec768e063102b426e8962989758115e8659485124de9207bc365fab524125d65"
 dependencies = [
 "indexmap",
 "pep440_rs",
@@ -2769,9 +2713,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.11.3"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c"
+checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -2781,9 +2725,9 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.4.11"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad"
+checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -2820,7 +2764,7 @@ dependencies = [
 "anyhow",
 "argfile",
 "assert_fs",
- "bincode",
+ "bincode 2.0.1",
 "bitflags 2.9.4",
 "cachedir",
 "clap",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -71,8 +71,8 @@ clap = { version = "4.5.3", features = ["derive"] }
 clap_complete_command = { version = "0.6.0" }
 clearscreen = { version = "4.0.0" }
 csv = { version = "1.3.1" }
-divan = { package = "codspeed-divan-compat", version = "4.0.4" }
-codspeed-criterion-compat = { version = "4.0.4", default-features = false }
+divan = { package = "codspeed-divan-compat", version = "3.0.2" }
+codspeed-criterion-compat = { version = "3.0.2", default-features = false }
 colored = { version = "3.0.0" }
 console_error_panic_hook = { version = "0.1.7" }
 console_log = { version = "1.0.0" }
@@ -268,7 +268,12 @@ large_stack_arrays = "allow"


 [profile.release]
-lto = "fat"
+# 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"
 codegen-units = 16

 # Some crates don't change as much but benefit more from
@@ -278,8 +283,6 @@ 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
@@ -295,30 +298,11 @@ 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"
-strip = false
-debug = "full"
-lto = false
+debug = 1

 # The profile that 'cargo dist' will build with.
 [profile.dist]
--- 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.14 compatibility
+- 🤝 Python 3.13 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)
--- a/crates/ruff_benchmark/benches/ty.rs
+++ b/crates/ruff_benchmark/benches/ty.rs
@@ -599,7 +599,7 @@ impl<'a> ProjectBenchmark<'a> {
            self.project
                .check_paths()
                .iter()
-                .map(|path| SystemPathBuf::from(*path))
+                .map(|path| path.to_path_buf())
                .collect(),
        );

@@ -645,8 +645,8 @@ fn hydra(criterion: &mut Criterion) {
            name: "hydra-zen",
            repository: "https://github.com/mit-ll-responsible-ai/hydra-zen",
            commit: "dd2b50a9614c6f8c46c5866f283c8f7e7a960aa8",
-            paths: &["src"],
-            dependencies: &["pydantic", "beartype", "hydra-core"],
+            paths: vec![SystemPath::new("src")],
+            dependencies: vec!["pydantic", "beartype", "hydra-core"],
            max_dep_date: "2025-06-17",
            python_version: PythonVersion::PY313,
        },
@@ -662,8 +662,8 @@ fn attrs(criterion: &mut Criterion) {
            name: "attrs",
            repository: "https://github.com/python-attrs/attrs",
            commit: "a6ae894aad9bc09edc7cdad8c416898784ceec9b",
-            paths: &["src"],
-            dependencies: &[],
+            paths: vec![SystemPath::new("src")],
+            dependencies: vec![],
            max_dep_date: "2025-06-17",
            python_version: PythonVersion::PY313,
        },
@@ -679,8 +679,8 @@ fn anyio(criterion: &mut Criterion) {
            name: "anyio",
            repository: "https://github.com/agronholm/anyio",
            commit: "561d81270a12f7c6bbafb5bc5fad99a2a13f96be",
-            paths: &["src"],
-            dependencies: &[],
+            paths: vec![SystemPath::new("src")],
+            dependencies: vec![],
            max_dep_date: "2025-06-17",
            python_version: PythonVersion::PY313,
        },
@@ -696,8 +696,8 @@ fn datetype(criterion: &mut Criterion) {
            name: "DateType",
            repository: "https://github.com/glyph/DateType",
            commit: "57c9c93cf2468069f72945fc04bf27b64100dad8",
-            paths: &["src"],
-            dependencies: &[],
+            paths: vec![SystemPath::new("src")],
+            dependencies: vec![],
            max_dep_date: "2025-07-04",
            python_version: PythonVersion::PY313,
        },
--- a/crates/ruff_benchmark/benches/ty_walltime.rs
+++ b/crates/ruff_benchmark/benches/ty_walltime.rs
@@ -1,6 +1,7 @@
-use divan::{Bencher, bench};
 use std::fmt::{Display, Formatter};

+use divan::{Bencher, bench};
+
 use rayon::ThreadPoolBuilder;
 use ruff_benchmark::real_world_projects::{InstalledProject, RealWorldProject};
 use ruff_db::system::{OsSystem, SystemPath, SystemPathBuf};
@@ -12,39 +13,29 @@ use ty_project::metadata::value::{RangedValue, RelativePathBuf};
 use ty_project::{Db, ProjectDatabase, ProjectMetadata};

 struct Benchmark<'a> {
-    project: RealWorldProject<'a>,
-    installed_project: std::sync::OnceLock<InstalledProject<'a>>,
+    project: InstalledProject<'a>,
    max_diagnostics: usize,
 }

 impl<'a> Benchmark<'a> {
-    const fn new(project: RealWorldProject<'a>, max_diagnostics: usize) -> Self {
+    fn new(project: RealWorldProject<'a>, max_diagnostics: usize) -> Self {
+        let setup_project = project.setup().expect("Failed to setup project");
+
        Self {
-            project,
-            installed_project: std::sync::OnceLock::new(),
+            project: setup_project,
            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 installed_project = self.installed_project();
-        let root = SystemPathBuf::from_path_buf(installed_project.path.clone()).unwrap();
+        let root = SystemPathBuf::from_path_buf(self.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(installed_project.config.python_version)),
+                python_version: Some(RangedValue::cli(self.project.config.python_version)),
                python: Some(RelativePathBuf::cli(SystemPath::new(".venv"))),
                ..EnvironmentOptions::default()
            }),
@@ -55,7 +46,7 @@ impl<'a> Benchmark<'a> {

        db.project().set_included_paths(
            &mut db,
-            installed_project
+            self.project
                .check_paths()
                .iter()
                .map(|path| SystemPath::absolute(path, &root))
@@ -67,7 +58,7 @@ impl<'a> Benchmark<'a> {

 impl Display for Benchmark<'_> {
    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        self.project.name.fmt(f)
+        f.write_str(self.project.config.name)
    }
 }

@@ -84,150 +75,166 @@ fn check_project(db: &ProjectDatabase, max_diagnostics: usize) {
    );
 }

-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 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 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 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,
+        },
+        600,
+    )
+});

-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 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 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 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 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 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 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 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 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,
-    },
-    100,
-);
+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 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,
-    },
-    630,
-);
+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,
+        },
+        630,
+    )
+});

 #[track_caller]
 fn run_single_threaded(bencher: Bencher, benchmark: &Benchmark) {
@@ -238,22 +245,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();

--- 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: &'a [&'a str],
+    pub paths: Vec<&'a SystemPath>,
    /// Dependencies to install via uv
-    pub dependencies: &'a [&'a str],
+    pub dependencies: Vec<&'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
-    pub fn check_paths(&self) -> &[&str] {
-        self.config.paths
+    /// Get the benchmark paths as `SystemPathBuf`
+    pub fn check_paths(&self) -> &[&SystemPath] {
+        &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()
--- a/crates/ruff_db/src/diagnostic/mod.rs
+++ b/crates/ruff_db/src/diagnostic/mod.rs
@@ -7,8 +7,7 @@ use ruff_annotate_snippets::Level as AnnotateLevel;
 use ruff_text_size::{Ranged, TextRange, TextSize};

 pub use self::render::{
-    DisplayDiagnostic, DisplayDiagnostics, DummyFileResolver, FileResolver, Input,
-    ceil_char_boundary,
+    DisplayDiagnostic, DisplayDiagnostics, FileResolver, Input, ceil_char_boundary,
    github::{DisplayGithubDiagnostics, GithubRenderer},
 };
 use crate::{Db, files::File};
--- a/crates/ruff_db/src/diagnostic/render.rs
+++ b/crates/ruff_db/src/diagnostic/render.rs
@@ -1170,31 +1170,6 @@ 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 {

--- a/crates/ruff_dev/src/generate_ty_rules.rs
+++ b/crates/ruff_dev/src/generate_ty_rules.rs
@@ -93,39 +93,14 @@ 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: <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>
+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})
 </small>

-
 {documentation}
 "#,
            level = lint.default_level(),
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S602.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S602.py
@@ -33,10 +33,3 @@ class ShellConfig:

    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=}")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S604.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S604.py
@@ -6,19 +6,3 @@ 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=}")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S609.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S609.py
@@ -9,10 +9,3 @@ 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=}")
--- 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 emits a string token if it's unterminated
+# The lexer doesn't emit a string token if it's unterminated
 "a" "b
 "a" "b" "c
 "a" """b
 c""" "d

-# This is also true for
+# For f-strings, the `FStringRanges` won't contain the range for
 # unterminated f-strings.
 f"a" f"b
 f"a" f"b" f"c
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM222.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM222.py
@@ -197,10 +197,3 @@ 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
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP019.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP019.py
@@ -18,20 +18,3 @@ 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)
--- a/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
@@ -50,6 +50,15 @@ 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(
--- a/crates/ruff_linter/src/checkers/ast/mod.rs
+++ b/crates/ruff_linter/src/checkers/ast/mod.rs
@@ -697,7 +697,6 @@ impl SemanticSyntaxContext for Checker<'_> {
                }
            }
            SemanticSyntaxErrorKind::FutureFeatureNotDefined(name) => {
-                // F407
                if self.is_rule_enabled(Rule::FutureFeatureNotDefined) {
                    self.report_diagnostic(
                        pyflakes::rules::FutureFeatureNotDefined { name },
@@ -705,12 +704,6 @@ impl SemanticSyntaxContext for Checker<'_> {
                    );
                }
            }
-            SemanticSyntaxErrorKind::BreakOutsideLoop => {
-                // F701
-                if self.is_rule_enabled(Rule::BreakOutsideLoop) {
-                    self.report_diagnostic(pyflakes::rules::BreakOutsideLoop, error.range);
-                }
-            }
            SemanticSyntaxErrorKind::ReboundComprehensionVariable
            | SemanticSyntaxErrorKind::DuplicateTypeParameter
            | SemanticSyntaxErrorKind::MultipleCaseAssignment(_)
@@ -818,40 +811,19 @@ 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
-    }
 }

 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()
--- a/crates/ruff_linter/src/fs.rs
+++ b/crates/ruff_linter/src/fs.rs
@@ -11,7 +11,8 @@ use crate::settings::types::CompiledPerFileIgnoreList;
 pub fn get_cwd() -> &'static Path {
    #[cfg(target_arch = "wasm32")]
    {
-        Path::new(".")
+        static CWD: std::sync::LazyLock<PathBuf> = std::sync::LazyLock::new(|| PathBuf::from("."));
+        &CWD
    }
    #[cfg(not(target_arch = "wasm32"))]
    path_absolutize::path_dedot::CWD.as_path()
--- a/crates/ruff_linter/src/preview.rs
+++ b/crates/ruff_linter/src/preview.rs
@@ -265,7 +265,3 @@ pub(crate) const fn is_fix_read_whole_file_enabled(settings: &LinterSettings) ->
 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()
-}
--- 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
@@ -1091,12 +1091,9 @@ fn suspicious_function(
        ] => checker.report_diagnostic_if_enabled(SuspiciousInsecureCipherModeUsage, range),

        // Mktemp
-        ["tempfile", "mktemp"] => checker
-            .report_diagnostic_if_enabled(SuspiciousMktempUsage, range)
-            .map(|mut diagnostic| {
-                diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
-                diagnostic
-            }),
+        ["tempfile", "mktemp"] => {
+            checker.report_diagnostic_if_enabled(SuspiciousMktempUsage, range)
+        }

        // Eval
        ["" | "builtins", "eval"] => {
--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS602_S602.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS602_S602.py.snap
@@ -127,44 +127,3 @@ S602 `subprocess` call with `shell=True` identified, security issue
 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=}")
-   | ^^^^^
-   |
--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS604_S604.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS604_S604.py.snap
@@ -9,85 +9,3 @@ S604 Function call with `shell=True` parameter identified, security issue
 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=}")
-   | ^^^
-   |
--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS609_S609.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS609_S609.py.snap
@@ -43,44 +43,3 @@ S609 Possible wildcard injection in call due to `*` usage
 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=}")
-   |                  ^^^^^^^^^^^^^^^
-   |
--- 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
@@ -188,10 +188,16 @@ fn move_initialization(
    content.push_str(stylist.line_ending().as_str());
    content.push_str(stylist.indentation());
    if is_b006_unsafe_fix_preserve_assignment_expr_enabled(checker.settings()) {
+        let annotation = if let Some(ann) = parameter.annotation() {
+            format!(": {}", locator.slice(ann))
+        } else {
+            String::new()
+        };
        let _ = write!(
            &mut content,
-            "{} = {}",
+            "{}{} = {}",
            parameter.parameter.name(),
+            annotation,
            locator.slice(
                parenthesized_range(
                    default.into(),
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestspreview__B006_B006_5.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestspreview__B006_B006_5.py.snap
@@ -16,7 +16,7 @@ help: Replace with `None`; initialize within function
 5  + def import_module_wrong(value: dict[str, str] = None):
 6  |     import os
 7  +     if value is None:
-8  +         value = {}
+8  +         value: dict[str, str] = {}
 9  | 
 10 | 
 11 | def import_module_with_values_wrong(value: dict[str, str] = {}):
@@ -38,7 +38,7 @@ help: Replace with `None`; initialize within function
 10 |     import os
 11 | 
 12 +     if value is None:
-13 +         value = {}
+13 +         value: dict[str, str] = {}
 14 |     return 2
 15 | 
 16 | 
@@ -62,7 +62,7 @@ help: Replace with `None`; initialize within function
 17 |     import sys
 18 |     import itertools
 19 +     if value is None:
-20 +         value = {}
+20 +         value: dict[str, str] = {}
 21 | 
 22 | 
 23 | def from_import_module_wrong(value: dict[str, str] = {}):
@@ -83,7 +83,7 @@ help: Replace with `None`; initialize within function
 21 + def from_import_module_wrong(value: dict[str, str] = None):
 22 |     from os import path
 23 +     if value is None:
-24 +         value = {}
+24 +         value: dict[str, str] = {}
 25 | 
 26 | 
 27 | def from_imports_module_wrong(value: dict[str, str] = {}):
@@ -106,7 +106,7 @@ help: Replace with `None`; initialize within function
 26 |     from os import path
 27 |     from sys import version_info
 28 +     if value is None:
-29 +         value = {}
+29 +         value: dict[str, str] = {}
 30 | 
 31 | 
 32 | def import_and_from_imports_module_wrong(value: dict[str, str] = {}):
@@ -129,7 +129,7 @@ help: Replace with `None`; initialize within function
 31 |     import os
 32 |     from sys import version_info
 33 +     if value is None:
-34 +         value = {}
+34 +         value: dict[str, str] = {}
 35 | 
 36 | 
 37 | def import_docstring_module_wrong(value: dict[str, str] = {}):
@@ -152,7 +152,7 @@ help: Replace with `None`; initialize within function
 36 |     """Docstring"""
 37 |     import os
 38 +     if value is None:
-39 +         value = {}
+39 +         value: dict[str, str] = {}
 40 | 
 41 | 
 42 | def import_module_wrong(value: dict[str, str] = {}):
@@ -175,7 +175,7 @@ help: Replace with `None`; initialize within function
 41 |     """Docstring"""
 42 |     import os; import sys
 43 +     if value is None:
-44 +         value = {}
+44 +         value: dict[str, str] = {}
 45 | 
 46 | 
 47 | def import_module_wrong(value: dict[str, str] = {}):
@@ -197,7 +197,7 @@ help: Replace with `None`; initialize within function
 45 + def import_module_wrong(value: dict[str, str] = None):
 46 |     """Docstring"""
 47 +     if value is None:
-48 +         value = {}
+48 +         value: dict[str, str] = {}
 49 |     import os; import sys; x = 1
 50 | 
 51 | 
@@ -220,7 +220,7 @@ help: Replace with `None`; initialize within function
 51 |     """Docstring"""
 52 |     import os; import sys
 53 +     if value is None:
-54 +         value = {}
+54 +         value: dict[str, str] = {}
 55 | 
 56 | 
 57 | def import_module_wrong(value: dict[str, str] = {}):
@@ -241,7 +241,7 @@ help: Replace with `None`; initialize within function
 55 + def import_module_wrong(value: dict[str, str] = None):
 56 |     import os; import sys
 57 +     if value is None:
-58 +         value = {}
+58 +         value: dict[str, str] = {}
 59 | 
 60 | 
 61 | def import_module_wrong(value: dict[str, str] = {}):
@@ -261,7 +261,7 @@ help: Replace with `None`; initialize within function
   - 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 = {}
+61 +         value: dict[str, str] = {}
 62 |     import os; import sys; x = 1
 63 | 
 64 | 
@@ -282,7 +282,7 @@ help: Replace with `None`; initialize within function
 63 + def import_module_wrong(value: dict[str, str] = None):
 64 |     import os; import sys
 65 +     if value is None:
-66 +         value = {}
+66 +         value: dict[str, str] = {}
 67 | 
 68 | 
 69 | def import_module_wrong(value: dict[str, str] = {}): import os
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestspreview__B006_B006_8.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestspreview__B006_B006_8.py.snap
@@ -51,7 +51,7 @@ help: Replace with `None`; initialize within function
 10 + def baz(a: list = None):
 11 |     """This one raises a different exception"""
 12 +     if a is None:
-13 +         a = []
+13 +         a: list = []
 14 |     raise IndexError()
 15 | 
 16 | 
--- 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 date objects are naive, that is, not timezone-aware. While an aware
+/// Python datetime objects can be naive or 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 date object.
-/// Instead, use `datetime.datetime.fromtimestamp(ts, tz=...).date()` to
-/// create a timezone-aware datetime object and retrieve its date component.
+/// `datetime.date.fromtimestamp(ts)` returns a naive datetime object.
+/// Instead, use `datetime.datetime.fromtimestamp(ts, tz=...)` to create a
+/// timezone-aware object.
 ///
 /// ## Example
 /// ```python
@@ -32,14 +32,14 @@ use crate::checkers::ast::Checker;
 /// ```python
 /// import datetime
 ///
-/// datetime.datetime.fromtimestamp(946684800, tz=datetime.timezone.utc).date()
+/// datetime.datetime.fromtimestamp(946684800, tz=datetime.timezone.utc)
 /// ```
 ///
 /// Or, for Python 3.11 and later:
 /// ```python
 /// import datetime
 ///
-/// datetime.datetime.fromtimestamp(946684800, tz=datetime.UTC).date()
+/// datetime.datetime.fromtimestamp(946684800, tz=datetime.UTC)
 /// ```
 ///
 /// ## References
--- 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,15 +11,14 @@ use crate::checkers::ast::Checker;
 /// Checks for usage of `datetime.date.today()`.
 ///
 /// ## Why is this bad?
-/// Python date objects are naive, that is, not timezone-aware. While an aware
+/// Python datetime objects can be naive or 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 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.
+/// `datetime.date.today` returns a naive datetime object. Instead, use
+/// `datetime.datetime.now(tz=...).date()` to create a timezone-aware object.
 ///
 /// ## Example
 /// ```python
--- 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,9 +42,6 @@ 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)]
 pub(crate) struct CallDatetimeToday;

--- 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,9 +41,6 @@ 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)]
 pub(crate) struct CallDatetimeWithoutTzinfo(DatetimeModuleAntipattern);

--- 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,9 +38,6 @@ 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)]
 pub(crate) struct DatetimeMinMax {
    min_max: MinMax,
--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linterrulesflake8_implicit_str_concattestsISC001_ISC_syntax_error.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linterrulesflake8_implicit_str_concattestsISC001_ISC_syntax_error.py.snap
@@ -1,31 +1,30 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_implicit_str_concat/mod.rs
 ---
-ISC001 Implicitly concatenated string literals on one line
- --> ISC_syntax_error.py:2:1
-  |
-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: missing closing quote in string literal
 --> ISC_syntax_error.py:2:5
  |
-1 | # The lexer emits a string token if it's unterminated
+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: 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
+  |
+
 ISC001 Implicitly concatenated string literals on one line
 --> ISC_syntax_error.py:3:1
  |
-1 | # The lexer emits a string token if it's unterminated
+1 | # The lexer doesn't emit a string token if it's unterminated
 2 | "a" "b
 3 | "a" "b" "c
  | ^^^^^^^
@@ -34,22 +33,10 @@ ISC001 Implicitly concatenated string literals on one line
  |
 help: Combine string literals

-ISC001 Implicitly concatenated string literals on one line
- --> ISC_syntax_error.py:3:5
-  |
-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: missing closing quote in string literal
 --> ISC_syntax_error.py:3:9
  |
-1 | # The lexer emits a string token if it's unterminated
+1 | # The lexer doesn't emit a string token if it's unterminated
 2 | "a" "b
 3 | "a" "b" "c
  |         ^^
@@ -57,6 +44,17 @@ 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
+  |
+
 ISC001 Implicitly concatenated string literals on one line
 --> ISC_syntax_error.py:4:1
  |
@@ -66,21 +64,7 @@ ISC001 Implicitly concatenated string literals on one line
 5 | | c""" "d
  | |____^
 6 |
-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
+7 |   # For f-strings, the `FStringRanges` won't contain the range for
  |
 help: Combine string literals

@@ -92,13 +76,24 @@ invalid-syntax: missing closing quote in string literal
 5 | c""" "d
  |      ^^
 6 |
-7 | # This is also true for
+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
  |

 invalid-syntax: f-string: unterminated string
  --> ISC_syntax_error.py:9:8
   |
- 7 | # This is also true for
+ 7 | # For f-strings, the `FStringRanges` won't contain the range for
 8 | # unterminated f-strings.
 9 | f"a" f"b
   |        ^
@@ -109,7 +104,7 @@ invalid-syntax: f-string: unterminated string
 invalid-syntax: Expected FStringEnd, found newline
  --> ISC_syntax_error.py:9:9
   |
- 7 | # This is also true for
+ 7 | # For f-strings, the `FStringRanges` won't contain the range for
 8 | # unterminated f-strings.
 9 | f"a" f"b
   |         ^
@@ -188,6 +183,14 @@ 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
   |
--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linterrulesflake8_implicit_str_concattestsISC002_ISC_syntax_error.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linterrulesflake8_implicit_str_concattestsISC002_ISC_syntax_error.py.snap
@@ -4,17 +4,27 @@ 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 emits a string token if it's unterminated
+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: 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 emits a string token if it's unterminated
+1 | # The lexer doesn't emit a string token if it's unterminated
 2 | "a" "b
 3 | "a" "b" "c
  |         ^^
@@ -22,6 +32,17 @@ 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
  |
@@ -30,13 +51,24 @@ invalid-syntax: missing closing quote in string literal
 5 | c""" "d
  |      ^^
 6 |
-7 | # This is also true for
+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
  |

 invalid-syntax: f-string: unterminated string
  --> ISC_syntax_error.py:9:8
   |
- 7 | # This is also true for
+ 7 | # For f-strings, the `FStringRanges` won't contain the range for
 8 | # unterminated f-strings.
 9 | f"a" f"b
   |        ^
@@ -47,7 +79,7 @@ invalid-syntax: f-string: unterminated string
 invalid-syntax: Expected FStringEnd, found newline
  --> ISC_syntax_error.py:9:9
   |
- 7 | # This is also true for
+ 7 | # For f-strings, the `FStringRanges` won't contain the range for
 8 | # unterminated f-strings.
 9 | f"a" f"b
   |         ^
@@ -101,6 +133,14 @@ 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
   |
--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/bytestring_usage.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/bytestring_usage.rs
@@ -74,8 +74,7 @@ pub(crate) fn bytestring_attribute(checker: &Checker, attribute: &Expr) {
        ["collections", "abc", "ByteString"] => ByteStringOrigin::CollectionsAbc,
        _ => return,
    };
-    let mut diagnostic = checker.report_diagnostic(ByteStringUsage { origin }, attribute.range());
-    diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
+    checker.report_diagnostic(ByteStringUsage { origin }, attribute.range());
 }

 /// PYI057
@@ -95,9 +94,7 @@ pub(crate) fn bytestring_import(checker: &Checker, import_from: &ast::StmtImport

    for name in names {
        if name.name.as_str() == "ByteString" {
-            let mut diagnostic =
-                checker.report_diagnostic(ByteStringUsage { origin }, name.range());
-            diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
+            checker.report_diagnostic(ByteStringUsage { origin }, name.range());
        }
    }
 }
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/fixture.rs
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/fixture.rs
@@ -898,9 +898,7 @@ 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()) {
-        let mut diagnostic =
-            checker.report_diagnostic(PytestDeprecatedYieldFixture, decorator.range());
-        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
+        checker.report_diagnostic(PytestDeprecatedYieldFixture, decorator.range());
    }
 }

--- a/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linterrulesflake8_simplifytestsSIM222_SIM222.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_simplify/snapshots/ruff_linterrulesflake8_simplifytestsSIM222_SIM222.py.snap
@@ -1062,77 +1062,3 @@ help: Replace with `"bar"`
 170 | 
 171 | 
 note: This is an unsafe fix and may change runtime behavior
-
-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
--- 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
@@ -223,7 +223,7 @@ enum Argumentable {

 impl Argumentable {
    fn check_for(self, checker: &Checker, name: String, range: TextRange) {
-        let mut diagnostic = match self {
+        match self {
            Self::Function => checker.report_diagnostic(UnusedFunctionArgument { name }, range),
            Self::Method => checker.report_diagnostic(UnusedMethodArgument { name }, range),
            Self::ClassMethod => {
@@ -234,7 +234,6 @@ 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 {
--- a/crates/ruff_linter/src/rules/numpy/rules/deprecated_function.rs
+++ b/crates/ruff_linter/src/rules/numpy/rules/deprecated_function.rs
@@ -80,7 +80,6 @@ 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),
--- a/crates/ruff_linter/src/rules/numpy/rules/deprecated_type_alias.rs
+++ b/crates/ruff_linter/src/rules/numpy/rules/deprecated_type_alias.rs
@@ -80,7 +80,6 @@ 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,
--- 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,6 +1,9 @@
-use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_python_ast::{self as ast, Stmt};

-use crate::Violation;
+use ruff_macros::{ViolationMetadata, derive_message_formats};
+use ruff_text_size::Ranged;
+
+use crate::{Violation, checkers::ast::Checker};

 /// ## What it does
 /// Checks for `break` statements outside of loops.
@@ -26,3 +29,28 @@ 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());
+}
--- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linterrulespylinttestsPLE2510_invalid_characters_syntax_error.py.snap
+++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linterrulespylinttestsPLE2510_invalid_characters_syntax_error.py.snap
@@ -23,17 +23,16 @@ invalid-syntax: missing closing quote in string literal
 9 | # Unterminated f-string
  |

-PLE2510 Invalid unescaped character backspace, use "\b" instead
- --> invalid_characters_syntax_error.py:7:6
+invalid-syntax: Expected a statement
+ --> invalid_characters_syntax_error.py:7:7
  |
 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
@@ -47,18 +46,6 @@ 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
   |
@@ -122,12 +109,11 @@ invalid-syntax: missing closing quote in string literal
   |              ^^
   |

-PLE2510 Invalid unescaped character backspace, use "\b" instead
-  --> invalid_characters_syntax_error.py:13:15
+invalid-syntax: Expected a statement
+  --> invalid_characters_syntax_error.py:13:16
   |
 11 | b = f'␈'
 12 | # Implicitly concatenated
 13 | b = '␈' f'␈' '␈
-   |               ^
+   |                ^
   |
-help: Replace with escape sequence
--- a/crates/ruff_linter/src/rules/pyupgrade/mod.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/mod.rs
@@ -126,7 +126,6 @@ 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(
--- 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, StringFlags};
+use ruff_python_ast::{self as ast, Expr, Keyword};
 use ruff_python_literal::format::{
    FieldName, FieldNamePart, FieldType, FormatPart, FormatString, FromTemplate,
 };
@@ -430,7 +430,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 if !token.unwrap_string_flags().is_unclosed() => {
+            TokenKind::String => {
                match FStringConversion::try_convert(token.range(), &mut summary, checker.locator())
                {
                    // If the format string contains side effects that would need to be repeated,
--- 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,19 +1,15 @@
 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`
@@ -34,16 +30,14 @@ 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 {
-    module: TypingModule,
-}
+pub(crate) struct TypingTextStrAlias;

 impl Violation for TypingTextStrAlias {
    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;

    #[derive_message_formats]
    fn message(&self) -> String {
-        format!("`{}.Text` is deprecated, use `str`", self.module)
+        "`typing.Text` is deprecated, use `str`".to_string()
    }

    fn fix_title(&self) -> Option<String> {
@@ -53,26 +47,16 @@ impl Violation for TypingTextStrAlias {

 /// UP019
 pub(crate) fn typing_text_str_alias(checker: &Checker, expr: &Expr) {
-    if !checker
-        .semantic()
-        .seen_module(Modules::TYPING | Modules::TYPING_EXTENSIONS)
-    {
+    if !checker.semantic().seen_module(Modules::TYPING) {
        return;
    }

-    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());
+    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());
        diagnostic.add_primary_tag(ruff_db::diagnostic::DiagnosticTag::Deprecated);
        diagnostic.try_set_fix(|| {
            let (import_edit, binding) = checker.importer().get_or_import_builtin_symbol(
@@ -87,18 +71,3 @@ 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"),
-        }
-    }
-}
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linterrulespyupgradetestsUP019.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linterrulespyupgradetestsUP019.py.snap
@@ -66,5 +66,3 @@ help: Replace with `str`
   - def print_fourth_word(word: Goodbye) -> None:
 19 + def print_fourth_word(word: str) -> None:
 20 |     print(word)
-21 |     
-22 |
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linterrulespyupgradetestsUP019.py__preview.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linterrulespyupgradetestsUP019.py__preview.snap
@@ -1,119 +0,0 @@
---
-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)
--- 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,7 +48,7 @@ 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]` or the `pop()` function will raise `IndexError` if the collection
+///    `[0]` of the `pop()` function will raise `IndexError` if the collection
 ///    is empty, while `next(iter(...))` will raise `StopIteration`.
 ///
 /// ## References
--- 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, ExprNoneLiteral,
+    self as ast, Arguments, AtomicNodeIndex, CmpOp, DictItem, ExceptHandler, Expr,
    InterpolatedStringElement, MatchCase, Operator, Pattern, Stmt, TypeParam,
 };
 use crate::{AnyNodeRef, ExprContext};
@@ -1219,8 +1219,6 @@ 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
@@ -1390,9 +1388,7 @@ 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(),
-            // 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,
+            Expr::BytesLiteral(ast::ExprBytesLiteral { value, .. }) => !value.is_empty(),
        }
    }

@@ -1401,9 +1397,7 @@ 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) => {
-                    f_string.debug_text.is_some() || inner(&f_string.expression)
-                }
+                InterpolatedStringElement::Interpolation(f_string) => inner(&f_string.expression),
            })
        }
    })
@@ -1499,7 +1493,7 @@ pub fn pep_604_optional(expr: &Expr) -> Expr {
    ast::ExprBinOp {
        left: Box::new(expr.clone()),
        op: Operator::BitOr,
-        right: Box::new(Expr::NoneLiteral(ExprNoneLiteral::default())),
+        right: Box::new(Expr::NoneLiteral(ast::ExprNoneLiteral::default())),
        range: TextRange::default(),
        node_index: AtomicNodeIndex::NONE,
    }
--- a/crates/ruff_python_ast/src/nodes.rs
+++ b/crates/ruff_python_ast/src/nodes.rs
@@ -735,8 +735,6 @@ 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 {
@@ -781,7 +779,6 @@ 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<'_> {
@@ -832,10 +829,6 @@ 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;
    }
 }

@@ -894,12 +887,6 @@ 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 {
@@ -997,12 +984,6 @@ 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 {
@@ -1070,10 +1051,6 @@ 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 {
@@ -1082,7 +1059,6 @@ 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()
    }
 }
@@ -1114,10 +1090,6 @@ 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 {
@@ -1126,7 +1098,6 @@ 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()
    }
 }
@@ -1456,9 +1427,6 @@ 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;
    }
 }

@@ -1511,12 +1479,6 @@ 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;
@@ -1598,10 +1560,6 @@ 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 {
@@ -1610,7 +1568,6 @@ 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()
    }
 }
@@ -1889,9 +1846,6 @@ 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;
    }
 }

@@ -1943,12 +1897,6 @@ 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 {
@@ -2011,10 +1959,6 @@ 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 {
@@ -2023,7 +1967,6 @@ 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()
    }
 }
@@ -2085,7 +2028,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: u16 {
+    struct AnyStringFlagsInner: u8 {
        /// The string uses double quotes (`"`).
        /// If this flag is not set, the string uses single quotes (`'`).
        const DOUBLE = 1 << 0;
@@ -2128,9 +2071,6 @@ 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;
    }
 }

@@ -2226,12 +2166,6 @@ 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 {
@@ -2300,10 +2234,6 @@ impl StringFlags for AnyStringFlags {
        }
        AnyStringPrefix::Regular(StringLiteralPrefix::Empty)
    }
-
-    fn is_unclosed(self) -> bool {
-        self.0.intersects(AnyStringFlagsInner::UNCLOSED)
-    }
 }

 impl fmt::Debug for AnyStringFlags {
@@ -2312,7 +2242,6 @@ 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()
    }
 }
@@ -2329,7 +2258,6 @@ 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())
    }
 }

@@ -2351,7 +2279,6 @@ 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())
    }
 }

@@ -2373,7 +2300,6 @@ 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())
    }
 }

@@ -2395,7 +2321,6 @@ 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())
    }
 }

--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/annotations.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/annotations.py
@@ -1,7 +0,0 @@
-# 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)
--- 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
@@ -1,7 +0,0 @@
-# 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)
-            )
--- 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"}
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/cantfit.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/cantfit.py
@@ -1,35 +0,0 @@
-# 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 (),
--- 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
@@ -1,61 +0,0 @@
-# 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 ((),)
--- 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"}
--- 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,9 +82,3 @@ 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
--- 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,8 +83,3 @@ 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
--- 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
@@ -1,3 +0,0 @@
-"""
-87 characters ............................................................................
-"""
--- 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
@@ -1,3 +0,0 @@
-"""
-87 characters ............................................................................
-"""
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip10.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip10.py
@@ -1,8 +0,0 @@
-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
--- 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
@@ -1,8 +0,0 @@
-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
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip11.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip11.py
@@ -1,6 +0,0 @@
-def foo():
-    pass
-
-
-# comment 1  # fmt: skip
-# comment 2
--- 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
@@ -1,6 +0,0 @@
-def foo():
-    pass
-
-
-# comment 1  # fmt: skip
-# comment 2
--- a/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip10.options.json
+++ b/crates/ruff_python_formatter/resources/test/fixtures/black/cases/fmtskip10.options.json
--- 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
@@ -1,15 +0,0 @@
-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"
--- 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
@@ -1,15 +0,0 @@
-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"
--- 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
@@ -0,0 +1 @@
+{"target_version": "3.12"}
--- 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
@@ -1,34 +0,0 @@
-# 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"}\"'
-)
--- 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
@@ -1,29 +0,0 @@
-# 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"}\"'
--- 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 @@
-{"target_version": "3.10"}
+{"preview": "enabled", "target_version": "3.10"}
--- 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
@@ -1 +0,0 @@
-{"target_version": "3.12"}
--- 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
@@ -1,133 +0,0 @@
-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
--- 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
@@ -1,170 +0,0 @@
-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
--- 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/is_simple_lookup_for_doublestar_expression.options.json
--- 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 unformated code covering a wide range of syntaxes.
+# Adding some unformatted code covering a wide range of syntaxes.

 if True:
      # Incorrectly indented prefix comments.
--- 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 unformated code covering a wide range of syntaxes.
+# Adding some unformatted code covering a wide range of syntaxes.

 if True:
      # Incorrectly indented prefix comments.
--- 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
@@ -1,8 +0,0 @@
-# flags: --line-ranges=6-7
-class Foo:
-
-    @overload
-    def foo(): ...
-
-    def fox(self):
-        print()
--- 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
@@ -1,8 +0,0 @@
-# flags: --line-ranges=6-7
-class Foo:
-
-    @overload
-    def foo(): ...
-
-    def fox(self):
-        print()
--- 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
@@ -1,28 +0,0 @@
-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
--- 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
@@ -1,26 +0,0 @@
-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
--- 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/module_docstring_2.options.json
--- 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:      
+With trailing spaces (only removed with unify_docstring_detection on):      
 Lorem ipsum dolor sit amet, consectetur adipiscing elit,
 sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 Ut enim ad minim veniam,
--- 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:
+With trailing spaces (only removed with unify_docstring_detection on):
 Lorem ipsum dolor sit amet, consectetur adipiscing elit,
 sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 Ut enim ad minim veniam,
--- 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
@@ -1,9 +0,0 @@
-#!/python
-
-# regression test for #4762
-"""
-docstring
-"""
-from __future__ import annotations
-
-import os
--- 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
@@ -1,10 +0,0 @@
-#!/python
-
-# regression test for #4762
-"""
-docstring
-"""
-
-from __future__ import annotations
-
-import os
--- 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,4 +25,5 @@ class MultilineDocstringsAsWell:


 class SingleQuotedDocstring:
+
    "I'm a docstring but I don't even get triple quotes."
--- 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 @@
-{"target_version": "3.10"}
+{"preview": "enabled", "target_version": "3.10"}
--- 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 parantheses, this might get improved at the same time
+# In case I go for not enforcing parentheses, this might get improved at the same time
 x = (
    z
    == 9999999999999999999999999999999999999999
--- 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 parantheses, this might get improved at the same time
+# In case I go for not enforcing parentheses, this might get improved at the same time
 x = (
    z
    == 9999999999999999999999999999999999999999
--- 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
@@ -1 +0,0 @@
-{"target_version": "3.11"}
--- 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
@@ -1,5 +0,0 @@
-def fn(*args: *tuple[*A, B]) -> None:
-    pass
-
-
-fn.__annotations__
--- 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
@@ -1,5 +0,0 @@
-def fn(*args: *tuple[*A, B]) -> None:
-    pass
-
-
-fn.__annotations__
--- 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,8 +13,3 @@ 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
--- 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,8 +13,3 @@ 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
--- 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,9 +73,8 @@ 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=}"
--- 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=}"
--- 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,12 +10,3 @@ 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,
-    )
-)
--- a/Show More
+++ b/Show More