Change the Cargo.toml file

2023-12-06 22:13:44 -06:00
246 changed files with 3365 additions and 19084 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -215,7 +215,7 @@ jobs:
      }}
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}

@@ -338,7 +338,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
@@ -362,7 +362,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
      - name: "Install Rust toolchain"
@@ -392,7 +392,7 @@ jobs:
      MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
      - name: "Add SSH key"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
        uses: webfactory/ssh-agent@v0.8.0
@@ -455,7 +455,7 @@ jobs:
        with:
          repository: "astral-sh/ruff-lsp"

-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}

--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -20,7 +20,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          ref: ${{ inputs.ref }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
      - name: "Add SSH key"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
        uses: webfactory/ssh-agent@v0.8.0
--- a/.github/workflows/flake8-to-ruff.yaml
+++ b/.github/workflows/flake8-to-ruff.yaml
@@ -20,7 +20,7 @@ jobs:
    runs-on: macos-latest
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
@@ -43,7 +43,7 @@ jobs:
    runs-on: macos-latest
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
@@ -69,7 +69,7 @@ jobs:
        target: [x64, x86]
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: ${{ matrix.target }}
@@ -97,7 +97,7 @@ jobs:
        target: [x86_64, i686]
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
@@ -124,7 +124,7 @@ jobs:
        target: [aarch64, armv7, s390x, ppc64le, ppc64]
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
      - name: "Build wheels"
@@ -161,7 +161,7 @@ jobs:
          - i686-unknown-linux-musl
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
@@ -197,7 +197,7 @@ jobs:
            arch: armv7
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
      - name: "Build wheels"
@@ -237,7 +237,7 @@ jobs:
      - uses: actions/download-artifact@v3
        with:
          name: wheels
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
      - name: "Publish to PyPi"
        env:
          TWINE_USERNAME: __token__
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -36,7 +36,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
      - name: "Prep README.md"
@@ -63,7 +63,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
@@ -103,7 +103,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
@@ -151,7 +151,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: ${{ matrix.platform.arch }}
@@ -199,7 +199,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
@@ -258,7 +258,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
      - name: "Prep README.md"
@@ -313,7 +313,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
@@ -332,10 +332,10 @@ jobs:
          image: alpine:latest
          options: -v ${{ github.workspace }}:/io -w /io
          run: |
-            apk add python3
-            python -m venv .venv
-            .venv/bin/pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-            .venv/bin/ruff check --help
+            apk add py3-pip
+            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/dist/ --force-reinstall
+            ruff --help
+            python -m ruff --help
      - name: "Upload wheels"
        uses: actions/upload-artifact@v3
        with:
@@ -369,7 +369,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
        with:
          python-version: ${{ env.PYTHON_VERSION }}
      - name: "Prep README.md"
@@ -388,11 +388,10 @@ jobs:
          distro: alpine_latest
          githubToken: ${{ github.token }}
          install: |
-            apk add python3
+            apk add py3-pip
          run: |
-            python -m venv .venv
-            .venv/bin/pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-            .venv/bin/ruff check --help
+            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
+            ruff check --help
      - name: "Upload wheels"
        uses: actions/upload-artifact@v3
        with:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,62 +1,5 @@
 # Changelog

-## 0.1.8
-
-This release includes opt-in support for formatting Python snippets within
-docstrings via the `docstring-code-format` setting.
-[Check out the blog post](https://astral.sh/blog/v0.1.8) for more details!
-
-### Preview features
-
- Add `"preserve"` quote-style to mimic Black's skip-string-normalization ([#8822](https://github.com/astral-sh/ruff/pull/8822))
- Implement `prefer_splitting_right_hand_side_of_assignments` preview style ([#8943](https://github.com/astral-sh/ruff/pull/8943))
- \[`pycodestyle`\] Add fix for `unexpected-spaces-around-keyword-parameter-equals` ([#9072](https://github.com/astral-sh/ruff/pull/9072))
- \[`pycodestyle`\] Add fix for comment-related whitespace rules ([#9075](https://github.com/astral-sh/ruff/pull/9075))
- \[`pycodestyle`\] Allow `sys.path` modifications between imports ([#9047](https://github.com/astral-sh/ruff/pull/9047))
- \[`refurb`\] Implement `hashlib-digest-hex` (`FURB181`) ([#9077](https://github.com/astral-sh/ruff/pull/9077))
-
-### Rule changes
-
- Allow `flake8-type-checking` rules to automatically quote runtime-evaluated references ([#6001](https://github.com/astral-sh/ruff/pull/6001))
- Allow transparent cell magics in Jupyter Notebooks ([#8911](https://github.com/astral-sh/ruff/pull/8911))
- \[`flake8-annotations`\] Avoid `ANN2xx` fixes for abstract methods with empty bodies ([#9034](https://github.com/astral-sh/ruff/pull/9034))
- \[`flake8-self`\] Ignore underscore references in type annotations ([#9036](https://github.com/astral-sh/ruff/pull/9036))
- \[`pep8-naming`\] Allow class names when `apps.get_model` is a non-string ([#9065](https://github.com/astral-sh/ruff/pull/9065))
- \[`pycodestyle`\] Allow `matplotlib.use` calls to intersperse imports ([#9094](https://github.com/astral-sh/ruff/pull/9094))
- \[`pyflakes`\] Support fixing unused assignments in tuples by renaming variables (`F841`) ([#9107](https://github.com/astral-sh/ruff/pull/9107))
- \[`pylint`\] Add fix for `subprocess-run-without-check` (`PLW1510`) ([#6708](https://github.com/astral-sh/ruff/pull/6708))
-
-### Formatter
-
- Add `docstring-code-format` knob to enable docstring snippet formatting ([#8854](https://github.com/astral-sh/ruff/pull/8854))
- Use double quotes for all docstrings, including single-quoted docstrings ([#9020](https://github.com/astral-sh/ruff/pull/9020))
- Implement "dynamic" line width mode for docstring code formatting ([#9098](https://github.com/astral-sh/ruff/pull/9098))
- Support reformatting Markdown code blocks ([#9030](https://github.com/astral-sh/ruff/pull/9030))
- add support for formatting reStructuredText code snippets ([#9003](https://github.com/astral-sh/ruff/pull/9003))
- Avoid trailing comma for single-argument with positional separator ([#9076](https://github.com/astral-sh/ruff/pull/9076))
- Fix handling of trailing target comment ([#9051](https://github.com/astral-sh/ruff/pull/9051))
-
-### CLI
-
- Hide unsafe fix suggestions when explicitly disabled ([#9095](https://github.com/astral-sh/ruff/pull/9095))
- Add SARIF support to `--output-format` ([#9078](https://github.com/astral-sh/ruff/pull/9078))
-
-### Bug fixes
-
- Apply unnecessary index rule prior to enumerate rewrite ([#9012](https://github.com/astral-sh/ruff/pull/9012))
- \[`flake8-err-msg`\] Allow `EM` fixes even if `msg` variable is defined ([#9059](https://github.com/astral-sh/ruff/pull/9059))
- \[`flake8-pie`\] Prevent keyword arguments duplication ([#8450](https://github.com/astral-sh/ruff/pull/8450))
- \[`flake8-pie`\] Respect trailing comma in `unnecessary-dict-kwargs` (`PIE804`) ([#9015](https://github.com/astral-sh/ruff/pull/9015))
- \[`flake8-raise`\] Avoid removing parentheses on ctypes.WinError ([#9027](https://github.com/astral-sh/ruff/pull/9027))
- \[`isort`\] Avoid invalid combination of `force-sort-within-types` and `lines-between-types` ([#9041](https://github.com/astral-sh/ruff/pull/9041))
- \[`isort`\] Ensure that from-style imports are always ordered first in `__future__` ([#9039](https://github.com/astral-sh/ruff/pull/9039))
- \[`pycodestyle`\] Allow tab indentation before keyword ([#9099](https://github.com/astral-sh/ruff/pull/9099))
- \[`pylint`\] Ignore `@overrides` and `@overloads` for `too-many-positional` ([#9000](https://github.com/astral-sh/ruff/pull/9000))
- \[`pyupgrade`\] Enable `printf-string-formatting` fix with comments on right-hand side ([#9037](https://github.com/astral-sh/ruff/pull/9037))
- \[`refurb`\] Make `math-constant` (`FURB152`) rule more targeted ([#9054](https://github.com/astral-sh/ruff/pull/9054))
- \[`refurb`\] Support floating-point base in `redundant-log-base` (`FURB163`) ([#9100](https://github.com/astral-sh/ruff/pull/9100))
- \[`ruff`\] Detect `unused-asyncio-dangling-task` (`RUF006`) on unused assignments ([#9060](https://github.com/astral-sh/ruff/pull/9060))
-
 ## 0.1.7

 ### Preview features
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16,15 +16,14 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"

 [[package]]
 name = "ahash"
-version = "0.8.6"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
 dependencies = [
 "cfg-if",
 "getrandom",
 "once_cell",
 "version_check",
- "zerocopy",
 ]

 [[package]]
@@ -382,7 +381,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]

 [[package]]
@@ -607,7 +606,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "strsim",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]

 [[package]]
@@ -618,7 +617,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
 "darling_core",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]

 [[package]]
@@ -791,14 +790,14 @@ dependencies = [

 [[package]]
 name = "filetime"
-version = "0.2.23"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
 dependencies = [
 "cfg-if",
 "libc",
- "redox_syscall 0.4.1",
- "windows-sys 0.52.0",
+ "redox_syscall 0.3.5",
+ "windows-sys 0.48.0",
 ]

 [[package]]
@@ -809,7 +808,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"

 [[package]]
 name = "flake8-to-ruff"
-version = "0.1.8"
+version = "0.1.7"
 dependencies = [
 "anyhow",
 "clap",
@@ -1123,15 +1122,15 @@ dependencies = [

 [[package]]
 name = "is-macro"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc74b7abae208af9314a406bd7dcc65091230b6e749c09e07a645885fecf34f9"
+checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e"
 dependencies = [
 "Inflector",
 "pmutil 0.6.1",
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]

 [[package]]
@@ -1709,7 +1708,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]

 [[package]]
@@ -2063,7 +2062,7 @@ dependencies = [

 [[package]]
 name = "ruff_cli"
-version = "0.1.8"
+version = "0.1.7"
 dependencies = [
 "annotate-snippets 0.9.2",
 "anyhow",
@@ -2199,7 +2198,7 @@ dependencies = [

 [[package]]
 name = "ruff_linter"
-version = "0.1.8"
+version = "0.1.7"
 dependencies = [
 "aho-corasick",
 "annotate-snippets 0.9.2",
@@ -2259,7 +2258,6 @@ dependencies = [
 "typed-arena",
 "unicode-width",
 "unicode_names2",
- "url",
 "wsl",
 ]

@@ -2271,7 +2269,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "ruff_python_trivia",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]

 [[package]]
@@ -2452,7 +2450,7 @@ dependencies = [

 [[package]]
 name = "ruff_shrinking"
-version = "0.1.8"
+version = "0.1.7"
 dependencies = [
 "anyhow",
 "clap",
@@ -2678,18 +2676,18 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"

 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde-wasm-bindgen"
-version = "0.6.3"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b713f70513ae1f8d92665bbbbda5c295c2cf1da5542881ae5eefe20c9af132"
+checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d"
 dependencies = [
 "js-sys",
 "serde",
@@ -2698,13 +2696,13 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]

 [[package]]
@@ -2766,7 +2764,7 @@ dependencies = [
 "darling",
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]

 [[package]]
@@ -2870,7 +2868,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustversion",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]

 [[package]]
@@ -2886,9 +2884,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.40"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2975,7 +2973,7 @@ dependencies = [
 "proc-macro-error",
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]

 [[package]]
@@ -2987,7 +2985,7 @@ dependencies = [
 "proc-macro-error",
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 "test-case-core",
 ]

@@ -3008,7 +3006,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]

 [[package]]
@@ -3170,7 +3168,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]

 [[package]]
@@ -3388,7 +3386,7 @@ checksum = "f49e7f3f3db8040a100710a11932239fd30697115e2ba4107080d8252939845e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]

 [[package]]
@@ -3482,7 +3480,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 "wasm-bindgen-shared",
 ]

@@ -3516,7 +3514,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -3549,7 +3547,7 @@ checksum = "493fcbab756bb764fa37e6bee8cec2dd709eb4273d06d0c282a5e74275ded735"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]

 [[package]]
@@ -3646,15 +3644,6 @@ dependencies = [
 "windows-targets 0.48.5",
 ]

-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.0",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -3685,21 +3674,6 @@ dependencies = [
 "windows_x86_64_msvc 0.48.5",
 ]

-[[package]]
-name = "windows-targets"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
-]
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -3712,12 +3686,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"

-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -3730,12 +3698,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"

-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -3748,12 +3710,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"

-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -3766,12 +3722,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"

-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -3784,12 +3734,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"

-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -3802,12 +3746,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"

-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -3820,12 +3758,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"

-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
-
 [[package]]
 name = "winnow"
 version = "0.5.15"
@@ -3864,23 +3796,3 @@ checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
 dependencies = [
 "winapi",
 ]
-
-[[package]]
-name = "zerocopy"
-version = "0.7.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.40",
-]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://docs.astral.sh/ruff"
 documentation = "https://docs.astral.sh/ruff"
 repository = "https://github.com/astral-sh/ruff"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
-license = "MIT"
+license = "MIT2"

 [workspace.dependencies]
 anyhow = { version = "1.0.69" }
@@ -17,12 +17,12 @@ bitflags = { version = "2.4.1" }
 chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
 clap = { version = "4.4.7", features = ["derive"] }
 colored = { version = "2.0.0" }
-filetime = { version = "0.2.23" }
+filetime = { version = "0.2.20" }
 glob = { version = "0.3.1" }
 globset = { version = "0.4.14" }
 ignore = { version = "0.4.20" }
 insta = { version = "1.34.0", feature = ["filters", "glob"] }
-is-macro = { version = "0.3.1" }
+is-macro = { version = "0.3.0" }
 itertools = { version = "0.11.0" }
 libcst = { version = "1.1.0", default-features = false }
 log = { version = "0.4.17" }
@@ -34,7 +34,7 @@ quote = { version = "1.0.23" }
 regex = { version = "1.10.2" }
 rustc-hash = { version = "1.1.0" }
 schemars = { version = "0.8.16" }
-serde = { version = "1.0.193", features = ["derive"] }
+serde = { version = "1.0.190", features = ["derive"] }
 serde_json = { version = "1.0.108" }
 shellexpand = { version = "3.0.0" }
 similar = { version = "2.3.0", features = ["inline"] }
@@ -42,7 +42,7 @@ smallvec = { version = "1.11.2" }
 static_assertions = "1.1.0"
 strum = { version = "0.25.0", features = ["strum_macros"] }
 strum_macros = { version = "0.25.3" }
-syn = { version = "2.0.40" }
+syn = { version = "2.0.39" }
 test-case = { version = "3.2.1" }
 thiserror = { version = "1.0.50" }
 toml = { version = "0.7.8" }
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
  # Ruff version.
-  rev: v0.1.8
+  rev: v0.1.7
  hooks:
    # Run the linter.
    - id: ruff
--- a/crates/flake8_to_ruff/Cargo.toml
+++ b/crates/flake8_to_ruff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.1.8"
+version = "0.1.7"
 description = """
 Convert Flake8 configuration files to Ruff configuration files.
 """
--- a/crates/ruff_cli/Cargo.toml
+++ b/crates/ruff_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_cli"
-version = "0.1.8"
+version = "0.1.7"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
--- a/crates/ruff_cli/src/printer.rs
+++ b/crates/ruff_cli/src/printer.rs
@@ -13,7 +13,7 @@ use ruff_linter::fs::relativize_path;
 use ruff_linter::logging::LogLevel;
 use ruff_linter::message::{
    AzureEmitter, Emitter, EmitterContext, GithubEmitter, GitlabEmitter, GroupedEmitter,
-    JsonEmitter, JsonLinesEmitter, JunitEmitter, PylintEmitter, SarifEmitter, TextEmitter,
+    JsonEmitter, JsonLinesEmitter, JunitEmitter, PylintEmitter, TextEmitter,
 };
 use ruff_linter::notify_user;
 use ruff_linter::registry::{AsRule, Rule};
@@ -125,7 +125,15 @@ impl Printer {
                if let Some(fixables) = fixables {
                    let fix_prefix = format!("[{}]", "*".cyan());

-                    if self.unsafe_fixes.is_hint() {
+                    if self.unsafe_fixes.is_enabled() {
+                        if fixables.applicable > 0 {
+                            writeln!(
+                                writer,
+                                "{fix_prefix} {} fixable with the --fix option.",
+                                fixables.applicable
+                            )?;
+                        }
+                    } else {
                        if fixables.applicable > 0 && fixables.unapplicable_unsafe > 0 {
                            let es = if fixables.unapplicable_unsafe == 1 {
                                ""
@@ -155,14 +163,6 @@ impl Printer {
                                fixables.unapplicable_unsafe
                            )?;
                        }
-                    } else {
-                        if fixables.applicable > 0 {
-                            writeln!(
-                                writer,
-                                "{fix_prefix} {} fixable with the --fix option.",
-                                fixables.applicable
-                            )?;
-                        }
                    }
                }
            } else {
@@ -291,9 +291,6 @@ impl Printer {
            SerializationFormat::Azure => {
                AzureEmitter.emit(writer, &diagnostics.messages, &context)?;
            }
-            SerializationFormat::Sarif => {
-                SarifEmitter.emit(writer, &diagnostics.messages, &context)?;
-            }
        }

        writer.flush()?;
--- a/crates/ruff_cli/tests/format.rs
+++ b/crates/ruff_cli/tests/format.rs
@@ -139,99 +139,6 @@ if condition:
    Ok(())
 }

-#[test]
-fn docstring_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[format]
-docstring-code-format = true
-docstring-code-line-length = 20
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config"])
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"
-def f(x):
-    '''
-    Something about `f`. And an example:
-
-    .. code-block:: python
-
-        foo, bar, quux = this_is_a_long_line(lion, hippo, lemur, bear)
-
-    Another example:
-
-    ```py
-    foo, bar, quux = this_is_a_long_line(lion, hippo, lemur, bear)
-    ```
-
-    And another:
-
-    >>> foo, bar, quux = this_is_a_long_line(lion, hippo, lemur, bear)
-    '''
-    pass
-"#), @r###"
-success: true
-exit_code: 0
----- stdout -----
-def f(x):
-    """
-    Something about `f`. And an example:
-
-    .. code-block:: python
-
-        (
-            foo,
-            bar,
-            quux,
-        ) = this_is_a_long_line(
-            lion,
-            hippo,
-            lemur,
-            bear,
-        )
-
-    Another example:
-
-    ```py
-    (
-        foo,
-        bar,
-        quux,
-    ) = this_is_a_long_line(
-        lion,
-        hippo,
-        lemur,
-        bear,
-    )
-    ```
-
-    And another:
-
-    >>> (
-    ...     foo,
-    ...     bar,
-    ...     quux,
-    ... ) = this_is_a_long_line(
-    ...     lion,
-    ...     hippo,
-    ...     lemur,
-    ...     bear,
-    ... )
-    """
-    pass
-
----- stderr -----
-"###);
-    Ok(())
-}
-
 #[test]
 fn mixed_line_endings() -> Result<()> {
    let tempdir = TempDir::new()?;
--- a/crates/ruff_cli/tests/integration_test.rs
+++ b/crates/ruff_cli/tests/integration_test.rs
@@ -1158,44 +1158,6 @@ fn check_hints_hidden_unsafe_fixes_with_no_safe_fixes() {
    "###);
 }

-#[test]
-fn check_no_hint_for_hidden_unsafe_fixes_when_disabled() {
-    let mut cmd = RuffCheck::default()
-        .args(["--select", "F601,UP034", "--no-unsafe-fixes"])
-        .build();
-    assert_cmd_snapshot!(cmd
-        .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
-        @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:14: F601 Dictionary key literal `'a'` repeated
-    -:2:7: UP034 [*] Avoid extraneous parentheses
-    Found 2 errors.
-    [*] 1 fixable with the --fix option.
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn check_no_hint_for_hidden_unsafe_fixes_with_no_safe_fixes_when_disabled() {
-    let mut cmd = RuffCheck::default()
-        .args(["--select", "F601", "--no-unsafe-fixes"])
-        .build();
-    assert_cmd_snapshot!(cmd
-        .pass_stdin("x = {'a': 1, 'a': 1}\n"),
-        @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:14: F601 Dictionary key literal `'a'` repeated
-    Found 1 error.
-
-    ----- stderr -----
-    "###);
-}
-
 #[test]
 fn check_shows_unsafe_fixes_with_opt_in() {
    let mut cmd = RuffCheck::default()
--- a/crates/ruff_linter/Cargo.toml
+++ b/crates/ruff_linter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.1.8"
+version = "0.1.7"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -71,7 +71,6 @@ toml = { workspace = true }
 typed-arena = { version = "2.0.2" }
 unicode-width = { workspace = true }
 unicode_names2 = { workspace = true }
-url = { version = "2.2.2" }
 wsl = { version = "0.1.0" }

 [dev-dependencies]
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S104.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S104.py
@@ -8,7 +8,6 @@ def func(address):
 # Error
 "0.0.0.0"
 '0.0.0.0'
-f"0.0.0.0"


 # Error
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S108.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S108.py
@@ -5,9 +5,6 @@ with open("/abc/tmp", "w") as f:
 with open("/tmp/abc", "w") as f:
    f.write("def")

-with open(f"/tmp/abc", "w") as f:
-    f.write("def")
-
 with open("/var/tmp/123", "w") as f:
    f.write("def")

--- a/crates/ruff_linter/resources/test/fixtures/flake8_errmsg/EM.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_errmsg/EM.py
@@ -27,7 +27,7 @@ def f_ok():
    raise RuntimeError(msg)


-def f_msg_defined():
+def f_unfixable():
    msg = "hello"
    raise RuntimeError("This is an example exception")

--- a/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE804.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE804.py
@@ -19,8 +19,5 @@ foo(**{buzz: True})
 foo(**{"": True})
 foo(**{f"buzz__{bar}": True})
 abc(**{"for": 3})
-foo(**{},)

-# Duplicated key names won't be fixed, to avoid syntax errors.
-abc(**{'a': b}, **{'a': c})  # PIE804
-abc(a=1, **{'a': c}, **{'b': c})  # PIE804
+foo(**{},)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI053.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI053.py
@@ -32,7 +32,6 @@ def f8(x: bytes = b"50 character byte stringgggggggggggggggggggggggggg\xff") ->

 foo: str = "50 character stringggggggggggggggggggggggggggggggg"
 bar: str = "51 character stringgggggggggggggggggggggggggggggggg"
-baz: str = f"51 character stringgggggggggggggggggggggggggggggggg"

 baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"

--- a/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI053.pyi
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI053.pyi
@@ -29,10 +29,6 @@ baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"  # OK

 qux: bytes = b"51 character byte stringggggggggggggggggggggggggggg\xff"  # Error: PYI053

-ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg"  # OK
-
-fbar: str = f"51 character stringgggggggggggggggggggggggggggggggg"  # Error: PYI053
-
 class Demo:
    """Docstrings are excluded from this rule. Some padding."""  # OK

--- a/crates/ruff_linter/resources/test/fixtures/flake8_trio/TRIO115.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_trio/TRIO115.py
@@ -19,32 +19,8 @@ async def func():
    bar = "bar"
    trio.sleep(bar)

-    x, y = 0, 2000
-    trio.sleep(x)  # TRIO115
-    trio.sleep(y)  # OK
-
-    (a, b, [c, (d, e)]) = (1, 2, (0, [4, 0]))
-    trio.sleep(c)  # TRIO115
-    trio.sleep(d)  # OK
-    trio.sleep(e)  # TRIO115
-
-    m_x, m_y = 0
-    trio.sleep(m_y)  # OK
-    trio.sleep(m_x)  # OK
-
-    m_a = m_b = 0
-    trio.sleep(m_a)  # TRIO115
-    trio.sleep(m_b)  # TRIO115
-
-    m_c = (m_d, m_e) = (0, 0)
-    trio.sleep(m_c)  # OK
-    trio.sleep(m_d)  # TRIO115
-    trio.sleep(m_e)  # TRIO115
-

 def func():
-    import trio
-
    trio.run(trio.sleep(0))  # TRIO115


@@ -57,10 +33,3 @@ def func():

 async def func():
    await sleep(seconds=0)  # TRIO115
-
-
-def func():
-    import trio
-
-    if (walrus := 0) == 0:
-        trio.sleep(walrus)  # TRIO115
--- a/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/quote.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/quote.py
@@ -1,67 +0,0 @@
-def f():
-    from pandas import DataFrame
-
-    def baz() -> DataFrame:
-        ...
-
-
-def f():
-    from pandas import DataFrame
-
-    def baz() -> DataFrame[int]:
-        ...
-
-
-def f():
-    from pandas import DataFrame
-
-    def baz() -> DataFrame["int"]:
-        ...
-
-
-def f():
-    import pandas as pd
-
-    def baz() -> pd.DataFrame:
-        ...
-
-
-def f():
-    import pandas as pd
-
-    def baz() -> pd.DataFrame.Extra:
-        ...
-
-
-def f():
-    import pandas as pd
-
-    def baz() -> pd.DataFrame | int:
-        ...
-
-
-
-def f():
-    from pandas import DataFrame
-
-    def baz() -> DataFrame():
-        ...
-
-
-def f():
-    from typing import Literal
-
-    from pandas import DataFrame
-
-    def baz() -> DataFrame[Literal["int"]]:
-        ...
-
-
-def f():
-    from typing import TYPE_CHECKING
-
-    if TYPE_CHECKING:
-        from pandas import DataFrame
-
-    def func(value: DataFrame):
-        ...
--- a/crates/ruff_linter/resources/test/fixtures/isort/force_sort_within_sections_lines_between.py
+++ b/crates/ruff_linter/resources/test/fixtures/isort/force_sort_within_sections_lines_between.py
@@ -1,4 +0,0 @@
-from a import x
-import b
-from c import y
-import d
--- a/crates/ruff_linter/resources/test/fixtures/pep8_naming/N806.py
+++ b/crates/ruff_linter/resources/test/fixtures/pep8_naming/N806.py
@@ -55,6 +55,3 @@ def model_assign() -> None:

    Bad = apps.get_model()  # N806
    Bad = apps.get_model(model_name="Stream")  # N806
-
-    Address: Type = apps.get_model("zerver", variable)  # OK
-    ValidationError = import_string(variable)  # N806
--- a/crates/ruff_linter/resources/test/fixtures/perflint/PERF101.py
+++ b/crates/ruff_linter/resources/test/fixtures/perflint/PERF101.py
@@ -63,8 +63,3 @@ for i in list(foo_tuple):  # Ok

 for i in list(foo_set):  # Ok
    foo_set.append(i + 1)
-
-x, y, nested_tuple = (1, 2, (3, 4, 5))
-
-for i in list(nested_tuple):  # PERF101
-    pass
--- a/crates/ruff_linter/resources/test/fixtures/pycodestyle/E26.py
+++ b/crates/ruff_linter/resources/test/fixtures/pycodestyle/E26.py
@@ -72,15 +72,3 @@ a = 42  #  (Two spaces)
 # EF  Means test is giving error and Failing
 #!   Means test is segfaulting
 # 8   Means test runs forever
-
-#: Colon prefix is okay
-
-###This is a variable ###
-
-# We should strip the space, but preserve the hashes.
-#: E266:1:3
-##  Foo
-
-a = 1  ## Foo
-
-a = 1  #:Foo
--- a/crates/ruff_linter/resources/test/fixtures/pycodestyle/E27.py
+++ b/crates/ruff_linter/resources/test/fixtures/pycodestyle/E27.py
@@ -60,6 +60,3 @@ def f():
 if (a and
    b):
    pass
-#: Okay
-def f():
-	return 1
--- a/crates/ruff_linter/resources/test/fixtures/pycodestyle/E402.py
+++ b/crates/ruff_linter/resources/test/fixtures/pycodestyle/E402.py
@@ -19,32 +19,21 @@ if x > 0:
 else:
    import e

-import sys
-sys.path.insert(0, "some/path")
+__some__magic = 1

 import f

-import matplotlib
-
-matplotlib.use("Agg")
-
-import g
-
-__some__magic = 1
-
-import h
-

 def foo() -> None:
-    import i
+    import e


 if __name__ == "__main__":
-    import j
+    import g

-import k; import l
+import h; import i


 if __name__ == "__main__":
-    import m; \
-import n
+    import j; \
+import k
--- a/crates/ruff_linter/resources/test/fixtures/pylint/subprocess_run_without_check.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/subprocess_run_without_check.py
@@ -3,11 +3,6 @@ import subprocess
 # Errors.
 subprocess.run("ls")
 subprocess.run("ls", shell=True)
-subprocess.run(
-    ["ls"],
-    shell=False,
-)
-subprocess.run(["ls"], **kwargs)

 # Non-errors.
 subprocess.run("ls", check=True)
--- a/crates/ruff_linter/resources/test/fixtures/refurb/FURB152.py
+++ b/crates/ruff_linter/resources/test/fixtures/refurb/FURB152.py
@@ -5,11 +5,3 @@ A = 3.14 * r ** 2  # FURB152
 C = 6.28 * r  # FURB152

 e = 2.71  # FURB152
-
-r = 3.15  # OK
-
-r = 3.141  # FURB152
-
-r = 3.1415  # FURB152
-
-e = 2.7 # OK
--- a/crates/ruff_linter/resources/test/fixtures/refurb/FURB163.py
+++ b/crates/ruff_linter/resources/test/fixtures/refurb/FURB163.py
@@ -16,8 +16,6 @@ special_log(1, 2)
 special_log(1, 10)
 special_log(1, math.e)
 special_log(1, special_e)
-math.log(1, 2.0)
-math.log(1, 10.0)

 # Ok.
 math.log2(1)
@@ -47,6 +45,3 @@ def log(*args):
 log(1, 2)
 log(1, 10)
 log(1, math.e)
-
-math.log(1, 2.0001)
-math.log(1, 10.0001)
--- a/crates/ruff_linter/resources/test/fixtures/refurb/FURB181.py
+++ b/crates/ruff_linter/resources/test/fixtures/refurb/FURB181.py
@@ -1,57 +0,0 @@
-import hashlib
-from hashlib import (
-    blake2b,
-    blake2s,
-    md5,
-    sha1,
-    sha3_224,
-    sha3_256,
-    sha3_384,
-    sha3_512,
-    sha224,
-)
-from hashlib import sha256
-from hashlib import sha256 as hash_algo
-from hashlib import sha384, sha512, shake_128, shake_256
-
-# these will match
-
-blake2b().digest().hex()
-blake2s().digest().hex()
-md5().digest().hex()
-sha1().digest().hex()
-sha224().digest().hex()
-sha256().digest().hex()
-sha384().digest().hex()
-sha3_224().digest().hex()
-sha3_256().digest().hex()
-sha3_384().digest().hex()
-sha3_512().digest().hex()
-sha512().digest().hex()
-shake_128().digest(10).hex()
-shake_256().digest(10).hex()
-
-hashlib.sha256().digest().hex()
-
-sha256(b"text").digest().hex()
-
-hash_algo().digest().hex()
-
-# not yet supported
-h = sha256()
-h.digest().hex()
-
-
-# these will not
-
-sha256().digest()
-sha256().digest().hex("_")
-sha256().digest().hex(bytes_per_sep=4)
-sha256().hexdigest()
-
-class Hash:
-    def digest(self) -> bytes:
-        return b""
-
-
-Hash().digest().hex()
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF006.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF006.py
@@ -63,29 +63,11 @@ def f():
    tasks = [asyncio.create_task(task) for task in tasks]


-# Error
+# OK (false negative)
 def f():
    task = asyncio.create_task(coordinator.ws_connect())


-# Error
-def f():
-    loop = asyncio.get_running_loop()
-    task: asyncio.Task = loop.create_task(coordinator.ws_connect())
-
-
-# OK (potential false negative)
-def f():
-    task = asyncio.create_task(coordinator.ws_connect())
-    background_tasks.add(task)
-
-
-# OK
-async def f():
-    task = asyncio.create_task(coordinator.ws_connect())
-    await task
-
-
 # OK (potential false negative)
 def f():
    do_nothing_with_the_task(asyncio.create_task(coordinator.ws_connect()))
@@ -106,19 +88,3 @@ def f():
 def f():
    loop = asyncio.get_running_loop()
    loop.do_thing(coordinator.ws_connect())
-
-
-# OK
-async def f():
-    task = unused = asyncio.create_task(coordinator.ws_connect())
-    await task
-
-
-# OK (false negative)
-async def f():
-    task = unused = asyncio.create_task(coordinator.ws_connect())
-
-
-# OK
-async def f():
-    task[i] = asyncio.create_task(coordinator.ws_connect())
--- a/crates/ruff_linter/src/checkers/ast/analyze/bindings.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/bindings.rs
@@ -3,12 +3,11 @@ use ruff_text_size::Ranged;

 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
-use crate::rules::{flake8_import_conventions, flake8_pyi, pyflakes, pylint, ruff};
+use crate::rules::{flake8_import_conventions, flake8_pyi, pyflakes, pylint};

 /// Run lint rules over the [`Binding`]s.
 pub(crate) fn bindings(checker: &mut Checker) {
    if !checker.any_enabled(&[
-        Rule::AsyncioDanglingTask,
        Rule::InvalidAllFormat,
        Rule::InvalidAllObject,
        Rule::NonAsciiName,
@@ -72,12 +71,5 @@ pub(crate) fn bindings(checker: &mut Checker) {
                checker.diagnostics.push(diagnostic);
            }
        }
-        if checker.enabled(Rule::AsyncioDanglingTask) {
-            if let Some(diagnostic) =
-                ruff::rules::asyncio_dangling_binding(binding, &checker.semantic)
-            {
-                checker.diagnostics.push(diagnostic);
-            }
-        }
    }
 }
--- a/crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs
@@ -59,7 +59,6 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
                        flake8_type_checking::helpers::is_valid_runtime_import(
                            binding,
                            &checker.semantic,
-                            &checker.settings.flake8_type_checking,
                        )
                    })
                    .collect()
--- a/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
@@ -356,8 +356,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                Rule::FString,
                // flynt
                Rule::StaticJoinToFString,
-                // refurb
-                Rule::HashlibDigestHex,
            ]) {
                if let Expr::Attribute(ast::ExprAttribute { value, attr, .. }) = func.as_ref() {
                    let attr = attr.as_str();
@@ -583,9 +581,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
            if checker.enabled(Rule::HashlibInsecureHashFunction) {
                flake8_bandit::rules::hashlib_insecure_hash_functions(checker, call);
            }
-            if checker.enabled(Rule::HashlibDigestHex) {
-                refurb::rules::hashlib_digest_hex(checker, call);
-            }
            if checker.enabled(Rule::RequestWithoutTimeout) {
                flake8_bandit::rules::request_without_timeout(checker, call);
            }
@@ -1275,12 +1270,32 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                refurb::rules::math_constant(checker, number_literal);
            }
        }
-        Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => {
+        Expr::BytesLiteral(_) => {
+            if checker.source_type.is_stub() && checker.enabled(Rule::StringOrBytesTooLong) {
+                flake8_pyi::rules::string_or_bytes_too_long(checker, expr);
+            }
+        }
+        Expr::StringLiteral(string) => {
+            if checker.enabled(Rule::HardcodedBindAllInterfaces) {
+                if let Some(diagnostic) =
+                    flake8_bandit::rules::hardcoded_bind_all_interfaces(string)
+                {
+                    checker.diagnostics.push(diagnostic);
+                }
+            }
+            if checker.enabled(Rule::HardcodedTempFile) {
+                flake8_bandit::rules::hardcoded_tmp_directory(checker, string);
+            }
            if checker.enabled(Rule::UnicodeKindPrefix) {
-                for string_part in value {
+                for string_part in string.value.parts() {
                    pyupgrade::rules::unicode_kind_prefix(checker, string_part);
                }
            }
+            if checker.source_type.is_stub() {
+                if checker.enabled(Rule::StringOrBytesTooLong) {
+                    flake8_pyi::rules::string_or_bytes_too_long(checker, expr);
+                }
+            }
        }
        Expr::IfExp(
            if_exp @ ast::ExprIfExp {
--- a/crates/ruff_linter/src/checkers/ast/analyze/mod.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/mod.rs
@@ -10,7 +10,6 @@ pub(super) use module::module;
 pub(super) use parameter::parameter;
 pub(super) use parameters::parameters;
 pub(super) use statement::statement;
-pub(super) use string_like::string_like;
 pub(super) use suite::suite;
 pub(super) use unresolved_references::unresolved_references;

@@ -26,6 +25,5 @@ mod module;
 mod parameter;
 mod parameters;
 mod statement;
-mod string_like;
 mod suite;
 mod unresolved_references;
--- a/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
@@ -1571,11 +1571,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                pylint::rules::named_expr_without_context(checker, value);
            }
            if checker.enabled(Rule::AsyncioDanglingTask) {
-                if let Some(diagnostic) =
-                    ruff::rules::asyncio_dangling_task(value, checker.semantic())
-                {
-                    checker.diagnostics.push(diagnostic);
-                }
+                ruff::rules::asyncio_dangling_task(checker, value);
            }
            if checker.enabled(Rule::RepeatedAppend) {
                refurb::rules::repeated_append(checker, stmt);
--- a/crates/ruff_linter/src/checkers/ast/analyze/string_like.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/string_like.rs
@@ -1,20 +0,0 @@
-use ruff_python_ast::StringLike;
-
-use crate::checkers::ast::Checker;
-use crate::codes::Rule;
-use crate::rules::{flake8_bandit, flake8_pyi};
-
-/// Run lint rules over a [`StringLike`] syntax nodes.
-pub(crate) fn string_like(string_like: StringLike, checker: &mut Checker) {
-    if checker.enabled(Rule::HardcodedBindAllInterfaces) {
-        flake8_bandit::rules::hardcoded_bind_all_interfaces(checker, string_like);
-    }
-    if checker.enabled(Rule::HardcodedTempFile) {
-        flake8_bandit::rules::hardcoded_tmp_directory(checker, string_like);
-    }
-    if checker.source_type.is_stub() {
-        if checker.enabled(Rule::StringOrBytesTooLong) {
-            flake8_pyi::rules::string_or_bytes_too_long(checker, string_like);
-        }
-    }
-}
--- a/crates/ruff_linter/src/checkers/ast/annotation.rs
+++ b/crates/ruff_linter/src/checkers/ast/annotation.rs
@@ -1,66 +0,0 @@
-use ruff_python_semantic::{ScopeKind, SemanticModel};
-
-use crate::rules::flake8_type_checking;
-use crate::settings::LinterSettings;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(super) enum AnnotationContext {
-    /// Python will evaluate the annotation at runtime, but it's not _required_ and, as such, could
-    /// be quoted to convert it into a typing-only annotation.
-    ///
-    /// For example:
-    /// ```python
-    /// from pandas import DataFrame
-    ///
-    /// def foo() -> DataFrame:
-    ///    ...
-    /// ```
-    ///
-    /// Above, Python will evaluate `DataFrame` at runtime in order to add it to `__annotations__`.
-    RuntimeEvaluated,
-    /// Python will evaluate the annotation at runtime, and it's required to be available at
-    /// runtime, as a library (like Pydantic) needs access to it.
-    RuntimeRequired,
-    /// The annotation is only evaluated at type-checking time.
-    TypingOnly,
-}
-
-impl AnnotationContext {
-    pub(super) fn from_model(semantic: &SemanticModel, settings: &LinterSettings) -> Self {
-        // If the annotation is in a class scope (e.g., an annotated assignment for a
-        // class field), and that class is marked as annotation as runtime-required.
-        if semantic
-            .current_scope()
-            .kind
-            .as_class()
-            .is_some_and(|class_def| {
-                flake8_type_checking::helpers::runtime_required_class(
-                    class_def,
-                    &settings.flake8_type_checking.runtime_required_base_classes,
-                    &settings.flake8_type_checking.runtime_required_decorators,
-                    semantic,
-                )
-            })
-        {
-            return Self::RuntimeRequired;
-        }
-
-        // If `__future__` annotations are enabled, then annotations are never evaluated
-        // at runtime, so we can treat them as typing-only.
-        if semantic.future_annotations() {
-            return Self::TypingOnly;
-        }
-
-        // Otherwise, if we're in a class or module scope, then the annotation needs to
-        // be available at runtime.
-        // See: https://docs.python.org/3/reference/simple_stmts.html#annotated-assignment-statements
-        if matches!(
-            semantic.current_scope().kind,
-            ScopeKind::Class(_) | ScopeKind::Module
-        ) {
-            return Self::RuntimeEvaluated;
-        }
-
-        Self::TypingOnly
-    }
-}
--- a/crates/ruff_linter/src/checkers/ast/mod.rs
+++ b/crates/ruff_linter/src/checkers/ast/mod.rs
@@ -44,12 +44,12 @@ use ruff_python_ast::helpers::{
 };
 use ruff_python_ast::identifier::Identifier;
 use ruff_python_ast::str::trailing_quote;
-use ruff_python_ast::visitor::{walk_except_handler, walk_f_string_element, walk_pattern, Visitor};
+use ruff_python_ast::visitor::{walk_except_handler, walk_pattern, Visitor};
 use ruff_python_ast::{helpers, str, visitor, PySourceType};
 use ruff_python_codegen::{Generator, Quote, Stylist};
 use ruff_python_index::Indexer;
 use ruff_python_parser::typing::{parse_type_annotation, AnnotationKind};
-use ruff_python_semantic::analyze::{imports, typing, visibility};
+use ruff_python_semantic::analyze::{typing, visibility};
 use ruff_python_semantic::{
    BindingFlags, BindingId, BindingKind, Exceptions, Export, FromImport, Globals, Import, Module,
    ModuleKind, NodeId, ScopeId, ScopeKind, SemanticModel, SemanticModelFlags, Snapshot,
@@ -58,7 +58,6 @@ use ruff_python_semantic::{
 use ruff_python_stdlib::builtins::{IPYTHON_BUILTINS, MAGIC_GLOBALS, PYTHON_BUILTINS};
 use ruff_source_file::Locator;

-use crate::checkers::ast::annotation::AnnotationContext;
 use crate::checkers::ast::deferred::Deferred;
 use crate::docstrings::extraction::ExtractionTarget;
 use crate::importer::Importer;
@@ -69,7 +68,6 @@ use crate::settings::{flags, LinterSettings};
 use crate::{docstrings, noqa};

 mod analyze;
-mod annotation;
 mod deferred;

 pub(crate) struct Checker<'a> {
@@ -305,12 +303,9 @@ where
            }
            _ => {
                self.semantic.flags |= SemanticModelFlags::FUTURES_BOUNDARY;
-                if !(self.semantic.seen_import_boundary()
-                    || helpers::is_assignment_to_a_dunder(stmt)
-                    || helpers::in_nested_block(self.semantic.current_statements())
-                    || imports::is_matplotlib_activation(stmt, self.semantic())
-                    || self.settings.preview.is_enabled()
-                        && imports::is_sys_path_modification(stmt, self.semantic()))
+                if !self.semantic.seen_import_boundary()
+                    && !helpers::is_assignment_to_a_dunder(stmt)
+                    && !helpers::in_nested_block(self.semantic.current_statements())
                {
                    self.semantic.flags |= SemanticModelFlags::IMPORT_BOUNDARY;
                }
@@ -517,10 +512,8 @@ where
                    .chain(&parameters.kwonlyargs)
                {
                    if let Some(expr) = &parameter_with_default.parameter.annotation {
-                        if singledispatch {
-                            self.visit_runtime_required_annotation(expr);
-                        } else if runtime_annotation {
-                            self.visit_runtime_evaluated_annotation(expr);
+                        if runtime_annotation || singledispatch {
+                            self.visit_runtime_annotation(expr);
                        } else {
                            self.visit_annotation(expr);
                        };
@@ -533,7 +526,7 @@ where
                if let Some(arg) = &parameters.vararg {
                    if let Some(expr) = &arg.annotation {
                        if runtime_annotation {
-                            self.visit_runtime_evaluated_annotation(expr);
+                            self.visit_runtime_annotation(expr);
                        } else {
                            self.visit_annotation(expr);
                        };
@@ -542,7 +535,7 @@ where
                if let Some(arg) = &parameters.kwarg {
                    if let Some(expr) = &arg.annotation {
                        if runtime_annotation {
-                            self.visit_runtime_evaluated_annotation(expr);
+                            self.visit_runtime_annotation(expr);
                        } else {
                            self.visit_annotation(expr);
                        };
@@ -550,7 +543,7 @@ where
                }
                for expr in returns {
                    if runtime_annotation {
-                        self.visit_runtime_evaluated_annotation(expr);
+                        self.visit_runtime_annotation(expr);
                    } else {
                        self.visit_annotation(expr);
                    };
@@ -681,16 +674,40 @@ where
                value,
                ..
            }) => {
-                match AnnotationContext::from_model(&self.semantic, self.settings) {
-                    AnnotationContext::RuntimeRequired => {
-                        self.visit_runtime_required_annotation(annotation);
-                    }
-                    AnnotationContext::RuntimeEvaluated => {
-                        self.visit_runtime_evaluated_annotation(annotation);
-                    }
-                    AnnotationContext::TypingOnly => self.visit_annotation(annotation),
-                }
+                // If we're in a class or module scope, then the annotation needs to be
+                // available at runtime.
+                // See: https://docs.python.org/3/reference/simple_stmts.html#annotated-assignment-statements
+                let runtime_annotation = if self.semantic.future_annotations() {
+                    self.semantic
+                        .current_scope()
+                        .kind
+                        .as_class()
+                        .is_some_and(|class_def| {
+                            flake8_type_checking::helpers::runtime_evaluated_class(
+                                class_def,
+                                &self
+                                    .settings
+                                    .flake8_type_checking
+                                    .runtime_evaluated_base_classes,
+                                &self
+                                    .settings
+                                    .flake8_type_checking
+                                    .runtime_evaluated_decorators,
+                                &self.semantic,
+                            )
+                        })
+                } else {
+                    matches!(
+                        self.semantic.current_scope().kind,
+                        ScopeKind::Class(_) | ScopeKind::Module
+                    )
+                };

+                if runtime_annotation {
+                    self.visit_runtime_annotation(annotation);
+                } else {
+                    self.visit_annotation(annotation);
+                }
                if let Some(expr) = value {
                    if self.semantic.match_typing_expr(annotation, "TypeAlias") {
                        self.visit_type_definition(expr);
@@ -798,7 +815,8 @@ where

    fn visit_expr(&mut self, expr: &'b Expr) {
        // Step 0: Pre-processing
-        if !self.semantic.in_typing_literal()
+        if !self.semantic.in_f_string()
+            && !self.semantic.in_typing_literal()
            && !self.semantic.in_deferred_type_definition()
            && self.semantic.in_type_definition()
            && self.semantic.future_annotations()
@@ -1220,7 +1238,10 @@ where
                }
            }
            Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => {
-                if self.semantic.in_type_definition() && !self.semantic.in_typing_literal() {
+                if self.semantic.in_type_definition()
+                    && !self.semantic.in_typing_literal()
+                    && !self.semantic.in_f_string()
+                {
                    self.deferred.string_type_definitions.push((
                        expr.range(),
                        value.to_str(),
@@ -1250,13 +1271,6 @@ where

        // Step 4: Analysis
        analyze::expression(expr, self);
-        match expr {
-            Expr::StringLiteral(string_literal) => {
-                analyze::string_like(string_literal.into(), self);
-            }
-            Expr::BytesLiteral(bytes_literal) => analyze::string_like(bytes_literal.into(), self),
-            _ => {}
-        }

        self.semantic.flags = flags_snapshot;
        self.semantic.pop_node();
@@ -1312,6 +1326,17 @@ where
        self.semantic.flags = flags_snapshot;
    }

+    fn visit_format_spec(&mut self, format_spec: &'b Expr) {
+        match format_spec {
+            Expr::FString(ast::ExprFString { value, .. }) => {
+                for expr in value.elements() {
+                    self.visit_expr(expr);
+                }
+            }
+            _ => unreachable!("Unexpected expression for format_spec"),
+        }
+    }
+
    fn visit_parameters(&mut self, parameters: &'b Parameters) {
        // Step 1: Binding.
        // Bind, but intentionally avoid walking default expressions, as we handle them
@@ -1421,16 +1446,6 @@ where
                .push((bound, self.semantic.snapshot()));
        }
    }
-
-    fn visit_f_string_element(&mut self, f_string_element: &'b ast::FStringElement) {
-        // Step 2: Traversal
-        walk_f_string_element(self, f_string_element);
-
-        // Step 4: Analysis
-        if let Some(literal) = f_string_element.as_literal() {
-            analyze::string_like(literal.into(), self);
-        }
-    }
 }

 impl<'a> Checker<'a> {
@@ -1507,18 +1522,10 @@ impl<'a> Checker<'a> {
        self.semantic.flags = snapshot;
    }

-    /// Visit an [`Expr`], and treat it as a runtime-evaluated type annotation.
-    fn visit_runtime_evaluated_annotation(&mut self, expr: &'a Expr) {
-        let snapshot = self.semantic.flags;
-        self.semantic.flags |= SemanticModelFlags::RUNTIME_EVALUATED_ANNOTATION;
-        self.visit_type_definition(expr);
-        self.semantic.flags = snapshot;
-    }
-
    /// Visit an [`Expr`], and treat it as a runtime-required type annotation.
-    fn visit_runtime_required_annotation(&mut self, expr: &'a Expr) {
+    fn visit_runtime_annotation(&mut self, expr: &'a Expr) {
        let snapshot = self.semantic.flags;
-        self.semantic.flags |= SemanticModelFlags::RUNTIME_REQUIRED_ANNOTATION;
+        self.semantic.flags |= SemanticModelFlags::RUNTIME_ANNOTATION;
        self.visit_type_definition(expr);
        self.semantic.flags = snapshot;
    }
--- a/crates/ruff_linter/src/codes.rs
+++ b/crates/ruff_linter/src/codes.rs
@@ -965,7 +965,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
        (Refurb, "169") => (RuleGroup::Preview, rules::refurb::rules::TypeNoneComparison),
        (Refurb, "171") => (RuleGroup::Preview, rules::refurb::rules::SingleItemMembershipTest),
        (Refurb, "177") => (RuleGroup::Preview, rules::refurb::rules::ImplicitCwd),
-        (Refurb, "181") => (RuleGroup::Preview, rules::refurb::rules::HashlibDigestHex),

        // flake8-logging
        (Flake8Logging, "001") => (RuleGroup::Preview, rules::flake8_logging::rules::DirectLoggerInstantiation),
--- a/crates/ruff_linter/src/message/mod.rs
+++ b/crates/ruff_linter/src/message/mod.rs
@@ -17,7 +17,6 @@ use ruff_diagnostics::{Diagnostic, DiagnosticKind, Fix};
 use ruff_notebook::NotebookIndex;
 use ruff_source_file::{SourceFile, SourceLocation};
 use ruff_text_size::{Ranged, TextRange, TextSize};
-pub use sarif::SarifEmitter;
 pub use text::TextEmitter;

 mod azure;
@@ -29,7 +28,6 @@ mod json;
 mod json_lines;
 mod junit;
 mod pylint;
-mod sarif;
 mod text;

 #[derive(Debug, PartialEq, Eq)]
--- a/crates/ruff_linter/src/message/sarif.rs
+++ b/crates/ruff_linter/src/message/sarif.rs
@@ -1,212 +0,0 @@
-use std::io::Write;
-
-use anyhow::Result;
-use serde::{Serialize, Serializer};
-use serde_json::json;
-
-use ruff_source_file::OneIndexed;
-
-use crate::codes::Rule;
-use crate::fs::normalize_path;
-use crate::message::{Emitter, EmitterContext, Message};
-use crate::registry::{AsRule, Linter, RuleNamespace};
-use crate::VERSION;
-
-use strum::IntoEnumIterator;
-
-pub struct SarifEmitter;
-
-impl Emitter for SarifEmitter {
-    fn emit(
-        &mut self,
-        writer: &mut dyn Write,
-        messages: &[Message],
-        _context: &EmitterContext,
-    ) -> Result<()> {
-        let results = messages
-            .iter()
-            .map(SarifResult::from_message)
-            .collect::<Result<Vec<_>>>()?;
-
-        let output = json!({
-            "$schema": "https://json.schemastore.org/sarif-2.1.0.json",
-            "version": "2.1.0",
-            "runs": [{
-                "tool": {
-                    "driver": {
-                        "name": "ruff",
-                        "informationUri": "https://github.com/astral-sh/ruff",
-                        "rules": Rule::iter().map(SarifRule::from).collect::<Vec<_>>(),
-                        "version": VERSION.to_string(),
-                    }
-                },
-                "results": results,
-            }],
-        });
-        serde_json::to_writer_pretty(writer, &output)?;
-        Ok(())
-    }
-}
-
-#[derive(Debug, Clone)]
-struct SarifRule<'a> {
-    name: &'a str,
-    code: String,
-    linter: &'a str,
-    summary: &'a str,
-    explanation: Option<&'a str>,
-    url: Option<String>,
-}
-
-impl From<Rule> for SarifRule<'_> {
-    fn from(rule: Rule) -> Self {
-        let code = rule.noqa_code().to_string();
-        let (linter, _) = Linter::parse_code(&code).unwrap();
-        Self {
-            name: rule.into(),
-            code,
-            linter: linter.name(),
-            summary: rule.message_formats()[0],
-            explanation: rule.explanation(),
-            url: rule.url(),
-        }
-    }
-}
-
-impl Serialize for SarifRule<'_> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        json!({
-            "id": self.code,
-            "shortDescription": {
-                "text": self.summary,
-            },
-            "fullDescription": {
-                "text": self.explanation,
-            },
-            "help": {
-                "text": self.summary,
-            },
-            "helpUri": self.url,
-            "properties": {
-                "id": self.code,
-                "kind": self.linter,
-                "name": self.name,
-                "problem.severity": "error".to_string(),
-            },
-        })
-        .serialize(serializer)
-    }
-}
-
-#[derive(Debug)]
-struct SarifResult {
-    rule: Rule,
-    level: String,
-    message: String,
-    uri: String,
-    start_line: OneIndexed,
-    start_column: OneIndexed,
-    end_line: OneIndexed,
-    end_column: OneIndexed,
-}
-
-impl SarifResult {
-    #[cfg(not(target_arch = "wasm32"))]
-    fn from_message(message: &Message) -> Result<Self> {
-        let start_location = message.compute_start_location();
-        let end_location = message.compute_end_location();
-        let path = normalize_path(message.filename());
-        Ok(Self {
-            rule: message.kind.rule(),
-            level: "error".to_string(),
-            message: message.kind.name.clone(),
-            uri: url::Url::from_file_path(&path)
-                .map_err(|()| anyhow::anyhow!("Failed to convert path to URL: {}", path.display()))?
-                .to_string(),
-            start_line: start_location.row,
-            start_column: start_location.column,
-            end_line: end_location.row,
-            end_column: end_location.column,
-        })
-    }
-
-    #[cfg(target_arch = "wasm32")]
-    #[allow(clippy::unnecessary_wraps)]
-    fn from_message(message: &Message) -> Result<Self> {
-        let start_location = message.compute_start_location();
-        let end_location = message.compute_end_location();
-        let path = normalize_path(message.filename());
-        Ok(Self {
-            rule: message.kind.rule(),
-            level: "error".to_string(),
-            message: message.kind.name.clone(),
-            uri: path.display().to_string(),
-            start_line: start_location.row,
-            start_column: start_location.column,
-            end_line: end_location.row,
-            end_column: end_location.column,
-        })
-    }
-}
-
-impl Serialize for SarifResult {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        json!({
-            "level": self.level,
-            "message": {
-                "text": self.message,
-            },
-            "locations": [{
-                "physicalLocation": {
-                    "artifactLocation": {
-                        "uri": self.uri,
-                    },
-                    "region": {
-                        "startLine": self.start_line,
-                        "startColumn": self.start_column,
-                        "endLine": self.end_line,
-                        "endColumn": self.end_column,
-                    }
-                }
-            }],
-            "ruleId": self.rule.noqa_code().to_string(),
-        })
-        .serialize(serializer)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::message::tests::{capture_emitter_output, create_messages};
-    use crate::message::SarifEmitter;
-
-    fn get_output() -> String {
-        let mut emitter = SarifEmitter {};
-        capture_emitter_output(&mut emitter, &create_messages())
-    }
-
-    #[test]
-    fn valid_json() {
-        let content = get_output();
-        serde_json::from_str::<serde_json::Value>(&content).unwrap();
-    }
-
-    #[test]
-    fn test_results() {
-        let content = get_output();
-        let sarif = serde_json::from_str::<serde_json::Value>(content.as_str()).unwrap();
-        let rules = sarif["runs"][0]["tool"]["driver"]["rules"]
-            .as_array()
-            .unwrap();
-        let results = sarif["runs"][0]["results"].as_array().unwrap();
-        assert_eq!(results.len(), 3);
-        assert!(rules.len() > 3);
-    }
-}
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_bind_all_interfaces.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_bind_all_interfaces.rs
@@ -1,9 +1,6 @@
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::{self as ast, StringLike};
-use ruff_text_size::Ranged;
-
-use crate::checkers::ast::Checker;
+use ruff_python_ast::ExprStringLiteral;

 /// ## What it does
 /// Checks for hardcoded bindings to all network interfaces (`0.0.0.0`).
@@ -37,16 +34,10 @@ impl Violation for HardcodedBindAllInterfaces {
 }

 /// S104
-pub(crate) fn hardcoded_bind_all_interfaces(checker: &mut Checker, string: StringLike) {
-    let is_bind_all_interface = match string {
-        StringLike::StringLiteral(ast::ExprStringLiteral { value, .. }) => value == "0.0.0.0",
-        StringLike::FStringLiteral(ast::FStringLiteralElement { value, .. }) => value == "0.0.0.0",
-        StringLike::BytesLiteral(_) => return,
-    };
-
-    if is_bind_all_interface {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(HardcodedBindAllInterfaces, string.range()));
+pub(crate) fn hardcoded_bind_all_interfaces(string: &ExprStringLiteral) -> Option<Diagnostic> {
+    if string.value.to_str() == "0.0.0.0" {
+        Some(Diagnostic::new(HardcodedBindAllInterfaces, string.range))
+    } else {
+        None
    }
 }
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_sql_expression.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_sql_expression.rs
@@ -57,7 +57,7 @@ impl Violation for HardcodedSQLExpression {
 /// becomes `foobar {x}baz`.
 fn concatenated_f_string(expr: &ast::ExprFString, locator: &Locator) -> String {
    expr.value
-        .iter()
+        .parts()
        .filter_map(|part| {
            raw_contents(locator.slice(part)).map(|s| s.escape_default().to_string())
        })
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_tmp_directory.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/hardcoded_tmp_directory.rs
@@ -1,5 +1,4 @@
-use ruff_python_ast::{self as ast, Expr, StringLike};
-use ruff_text_size::Ranged;
+use ruff_python_ast::{self as ast, Expr};

 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -52,19 +51,13 @@ impl Violation for HardcodedTempFile {
 }

 /// S108
-pub(crate) fn hardcoded_tmp_directory(checker: &mut Checker, string: StringLike) {
-    let value = match string {
-        StringLike::StringLiteral(ast::ExprStringLiteral { value, .. }) => value.to_str(),
-        StringLike::FStringLiteral(ast::FStringLiteralElement { value, .. }) => value,
-        StringLike::BytesLiteral(_) => return,
-    };
-
+pub(crate) fn hardcoded_tmp_directory(checker: &mut Checker, string: &ast::ExprStringLiteral) {
    if !checker
        .settings
        .flake8_bandit
        .hardcoded_tmp_directory
        .iter()
-        .any(|prefix| value.starts_with(prefix))
+        .any(|prefix| string.value.to_str().starts_with(prefix))
    {
        return;
    }
@@ -83,8 +76,8 @@ pub(crate) fn hardcoded_tmp_directory(checker: &mut Checker, string: StringLike)

    checker.diagnostics.push(Diagnostic::new(
        HardcodedTempFile {
-            string: value.to_string(),
+            string: string.value.to_string(),
        },
-        string.range(),
+        string.range,
    ));
 }
--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS104_S104.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS104_S104.py.snap
@@ -7,7 +7,6 @@ S104.py:9:1: S104 Possible binding to all interfaces
 9 | "0.0.0.0"
   | ^^^^^^^^^ S104
 10 | '0.0.0.0'
-11 | f"0.0.0.0"
   |

 S104.py:10:1: S104 Possible binding to all interfaces
@@ -16,30 +15,21 @@ S104.py:10:1: S104 Possible binding to all interfaces
 9 | "0.0.0.0"
 10 | '0.0.0.0'
   | ^^^^^^^^^ S104
-11 | f"0.0.0.0"
   |

-S104.py:11:3: S104 Possible binding to all interfaces
+S104.py:14:6: S104 Possible binding to all interfaces
   |
- 9 | "0.0.0.0"
-10 | '0.0.0.0'
-11 | f"0.0.0.0"
-   |   ^^^^^^^ S104
-   |
-
-S104.py:15:6: S104 Possible binding to all interfaces
-   |
-14 | # Error
-15 | func("0.0.0.0")
+13 | # Error
+14 | func("0.0.0.0")
   |      ^^^^^^^^^ S104
   |

-S104.py:19:9: S104 Possible binding to all interfaces
+S104.py:18:9: S104 Possible binding to all interfaces
   |
-18 | def my_func():
-19 |     x = "0.0.0.0"
+17 | def my_func():
+18 |     x = "0.0.0.0"
   |         ^^^^^^^^^ S104
-20 |     print(x)
+19 |     print(x)
   |


--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS108_S108.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS108_S108.py.snap
@@ -10,31 +10,22 @@ S108.py:5:11: S108 Probable insecure usage of temporary file or directory: "/tmp
 6 |     f.write("def")
  |

-S108.py:8:13: S108 Probable insecure usage of temporary file or directory: "/tmp/abc"
+S108.py:8:11: S108 Probable insecure usage of temporary file or directory: "/var/tmp/123"
  |
 6 |     f.write("def")
 7 | 
-8 | with open(f"/tmp/abc", "w") as f:
-  |             ^^^^^^^^ S108
+8 | with open("/var/tmp/123", "w") as f:
+  |           ^^^^^^^^^^^^^^ S108
 9 |     f.write("def")
  |

-S108.py:11:11: S108 Probable insecure usage of temporary file or directory: "/var/tmp/123"
+S108.py:11:11: S108 Probable insecure usage of temporary file or directory: "/dev/shm/unit/test"
   |
 9 |     f.write("def")
 10 | 
-11 | with open("/var/tmp/123", "w") as f:
-   |           ^^^^^^^^^^^^^^ S108
-12 |     f.write("def")
-   |
-
-S108.py:14:11: S108 Probable insecure usage of temporary file or directory: "/dev/shm/unit/test"
-   |
-12 |     f.write("def")
-13 | 
-14 | with open("/dev/shm/unit/test", "w") as f:
+11 | with open("/dev/shm/unit/test", "w") as f:
   |           ^^^^^^^^^^^^^^^^^^^^ S108
-15 |     f.write("def")
+12 |     f.write("def")
   |


--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS108_extend.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS108_extend.snap
@@ -10,39 +10,30 @@ S108.py:5:11: S108 Probable insecure usage of temporary file or directory: "/tmp
 6 |     f.write("def")
  |

-S108.py:8:13: S108 Probable insecure usage of temporary file or directory: "/tmp/abc"
+S108.py:8:11: S108 Probable insecure usage of temporary file or directory: "/var/tmp/123"
  |
 6 |     f.write("def")
 7 | 
-8 | with open(f"/tmp/abc", "w") as f:
-  |             ^^^^^^^^ S108
+8 | with open("/var/tmp/123", "w") as f:
+  |           ^^^^^^^^^^^^^^ S108
 9 |     f.write("def")
  |

-S108.py:11:11: S108 Probable insecure usage of temporary file or directory: "/var/tmp/123"
+S108.py:11:11: S108 Probable insecure usage of temporary file or directory: "/dev/shm/unit/test"
   |
 9 |     f.write("def")
 10 | 
-11 | with open("/var/tmp/123", "w") as f:
-   |           ^^^^^^^^^^^^^^ S108
-12 |     f.write("def")
-   |
-
-S108.py:14:11: S108 Probable insecure usage of temporary file or directory: "/dev/shm/unit/test"
-   |
-12 |     f.write("def")
-13 | 
-14 | with open("/dev/shm/unit/test", "w") as f:
+11 | with open("/dev/shm/unit/test", "w") as f:
   |           ^^^^^^^^^^^^^^^^^^^^ S108
-15 |     f.write("def")
+12 |     f.write("def")
   |

-S108.py:18:11: S108 Probable insecure usage of temporary file or directory: "/foo/bar"
+S108.py:15:11: S108 Probable insecure usage of temporary file or directory: "/foo/bar"
   |
-17 | # not ok by config
-18 | with open("/foo/bar", "w") as f:
+14 | # not ok by config
+15 | with open("/foo/bar", "w") as f:
   |           ^^^^^^^^^^ S108
-19 |     f.write("def")
+16 |     f.write("def")
   |


--- a/crates/ruff_linter/src/rules/flake8_comprehensions/fixes.rs
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/fixes.rs
@@ -1083,7 +1083,7 @@ pub(crate) fn fix_unnecessary_map(
    // If the expression is embedded in an f-string, surround it with spaces to avoid
    // syntax errors.
    if matches!(object_type, ObjectType::Set | ObjectType::Dict) {
-        if parent.is_some_and(Expr::is_f_string_expr) {
+        if parent.is_some_and(Expr::is_formatted_value_expr) {
            content = format!(" {content} ");
        }
    }
--- a/crates/ruff_linter/src/rules/flake8_errmsg/rules/string_in_exception.rs
+++ b/crates/ruff_linter/src/rules/flake8_errmsg/rules/string_in_exception.rs
@@ -191,13 +191,15 @@ pub(crate) fn string_in_exception(checker: &mut Checker, stmt: &Stmt, exc: &Expr
                            if let Some(indentation) =
                                whitespace::indentation(checker.locator(), stmt)
                            {
-                                diagnostic.set_fix(generate_fix(
-                                    stmt,
-                                    first,
-                                    indentation,
-                                    checker.stylist(),
-                                    checker.locator(),
-                                ));
+                                if checker.semantic().is_available("msg") {
+                                    diagnostic.set_fix(generate_fix(
+                                        stmt,
+                                        first,
+                                        indentation,
+                                        checker.stylist(),
+                                        checker.locator(),
+                                    ));
+                                }
                            }
                            checker.diagnostics.push(diagnostic);
                        }
@@ -209,13 +211,15 @@ pub(crate) fn string_in_exception(checker: &mut Checker, stmt: &Stmt, exc: &Expr
                        let mut diagnostic = Diagnostic::new(FStringInException, first.range());
                        if let Some(indentation) = whitespace::indentation(checker.locator(), stmt)
                        {
-                            diagnostic.set_fix(generate_fix(
-                                stmt,
-                                first,
-                                indentation,
-                                checker.stylist(),
-                                checker.locator(),
-                            ));
+                            if checker.semantic().is_available("msg") {
+                                diagnostic.set_fix(generate_fix(
+                                    stmt,
+                                    first,
+                                    indentation,
+                                    checker.stylist(),
+                                    checker.locator(),
+                                ));
+                            }
                        }
                        checker.diagnostics.push(diagnostic);
                    }
@@ -232,13 +236,15 @@ pub(crate) fn string_in_exception(checker: &mut Checker, stmt: &Stmt, exc: &Expr
                                if let Some(indentation) =
                                    whitespace::indentation(checker.locator(), stmt)
                                {
-                                    diagnostic.set_fix(generate_fix(
-                                        stmt,
-                                        first,
-                                        indentation,
-                                        checker.stylist(),
-                                        checker.locator(),
-                                    ));
+                                    if checker.semantic().is_available("msg") {
+                                        diagnostic.set_fix(generate_fix(
+                                            stmt,
+                                            first,
+                                            indentation,
+                                            checker.stylist(),
+                                            checker.locator(),
+                                        ));
+                                    }
                                }
                                checker.diagnostics.push(diagnostic);
                            }
--- a/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linterrulesflake8_errmsgtestscustom.snap
+++ b/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linterrulesflake8_errmsgtestscustom.snap
@@ -59,26 +59,15 @@ EM.py:22:24: EM103 [*] Exception must not use a `.format()` string directly, ass
 24 25 | 
 25 26 | def f_ok():

-EM.py:32:24: EM101 [*] Exception must not use a string literal, assign to variable first
+EM.py:32:24: EM101 Exception must not use a string literal, assign to variable first
   |
-30 | def f_msg_defined():
+30 | def f_unfixable():
 31 |     msg = "hello"
 32 |     raise RuntimeError("This is an example exception")
   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM101
   |
   = help: Assign to variable; remove string literal

-ℹ Unsafe fix
-29 29 | 
-30 30 | def f_msg_defined():
-31 31 |     msg = "hello"
-32    |-    raise RuntimeError("This is an example exception")
-   32 |+    msg = "This is an example exception"
-   33 |+    raise RuntimeError(msg)
-33 34 | 
-34 35 | 
-35 36 | def f_msg_in_nested_scope():
-
 EM.py:39:24: EM101 [*] Exception must not use a string literal, assign to variable first
   |
 37 |         msg = "hello"
@@ -99,7 +88,7 @@ EM.py:39:24: EM101 [*] Exception must not use a string literal, assign to variab
 41 42 | 
 42 43 | def f_msg_in_parent_scope():

-EM.py:46:28: EM101 [*] Exception must not use a string literal, assign to variable first
+EM.py:46:28: EM101 Exception must not use a string literal, assign to variable first
   |
 45 |     def nested():
 46 |         raise RuntimeError("This is an example exception")
@@ -107,17 +96,6 @@ EM.py:46:28: EM101 [*] Exception must not use a string literal, assign to variab
   |
   = help: Assign to variable; remove string literal

-ℹ Unsafe fix
-43 43 |     msg = "hello"
-44 44 | 
-45 45 |     def nested():
-46    |-        raise RuntimeError("This is an example exception")
-   46 |+        msg = "This is an example exception"
-   47 |+        raise RuntimeError(msg)
-47 48 | 
-48 49 | 
-49 50 | def f_fix_indentation_check(foo):
-
 EM.py:51:28: EM101 [*] Exception must not use a string literal, assign to variable first
   |
 49 | def f_fix_indentation_check(foo):
--- a/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linterrulesflake8_errmsgtestsdefaults.snap
+++ b/crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linterrulesflake8_errmsgtestsdefaults.snap
@@ -97,26 +97,15 @@ EM.py:22:24: EM103 [*] Exception must not use a `.format()` string directly, ass
 24 25 | 
 25 26 | def f_ok():

-EM.py:32:24: EM101 [*] Exception must not use a string literal, assign to variable first
+EM.py:32:24: EM101 Exception must not use a string literal, assign to variable first
   |
-30 | def f_msg_defined():
+30 | def f_unfixable():
 31 |     msg = "hello"
 32 |     raise RuntimeError("This is an example exception")
   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM101
   |
   = help: Assign to variable; remove string literal

-ℹ Unsafe fix
-29 29 | 
-30 30 | def f_msg_defined():
-31 31 |     msg = "hello"
-32    |-    raise RuntimeError("This is an example exception")
-   32 |+    msg = "This is an example exception"
-   33 |+    raise RuntimeError(msg)
-33 34 | 
-34 35 | 
-35 36 | def f_msg_in_nested_scope():
-
 EM.py:39:24: EM101 [*] Exception must not use a string literal, assign to variable first
   |
 37 |         msg = "hello"
@@ -137,7 +126,7 @@ EM.py:39:24: EM101 [*] Exception must not use a string literal, assign to variab
 41 42 | 
 42 43 | def f_msg_in_parent_scope():

-EM.py:46:28: EM101 [*] Exception must not use a string literal, assign to variable first
+EM.py:46:28: EM101 Exception must not use a string literal, assign to variable first
   |
 45 |     def nested():
 46 |         raise RuntimeError("This is an example exception")
@@ -145,17 +134,6 @@ EM.py:46:28: EM101 [*] Exception must not use a string literal, assign to variab
   |
   = help: Assign to variable; remove string literal

-ℹ Unsafe fix
-43 43 |     msg = "hello"
-44 44 | 
-45 45 |     def nested():
-46    |-        raise RuntimeError("This is an example exception")
-   46 |+        msg = "This is an example exception"
-   47 |+        raise RuntimeError(msg)
-47 48 | 
-48 49 | 
-49 50 | def f_fix_indentation_check(foo):
-
 EM.py:51:28: EM101 [*] Exception must not use a string literal, assign to variable first
   |
 49 | def f_fix_indentation_check(foo):
--- a/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_dict_kwargs.rs
+++ b/crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_dict_kwargs.rs
@@ -1,14 +1,12 @@
-use std::hash::BuildHasherDefault;
-
 use itertools::Itertools;
-use rustc_hash::FxHashSet;
-
-use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation};
-use ruff_macros::{derive_message_formats, violation};
+use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix};
 use ruff_python_ast::{self as ast, Expr};
-use ruff_python_stdlib::identifiers::is_identifier;
+
+use ruff_macros::{derive_message_formats, violation};
 use ruff_text_size::Ranged;

+use ruff_python_stdlib::identifiers::is_identifier;
+
 use crate::checkers::ast::Checker;
 use crate::fix::edits::{remove_argument, Parentheses};

@@ -43,39 +41,36 @@ use crate::fix::edits::{remove_argument, Parentheses};
 #[violation]
 pub struct UnnecessaryDictKwargs;

-impl Violation for UnnecessaryDictKwargs {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
-
+impl AlwaysFixableViolation for UnnecessaryDictKwargs {
    #[derive_message_formats]
    fn message(&self) -> String {
        format!("Unnecessary `dict` kwargs")
    }

-    fn fix_title(&self) -> Option<String> {
-        Some(format!("Remove unnecessary kwargs"))
+    fn fix_title(&self) -> String {
+        format!("Remove unnecessary kwargs")
    }
 }

 /// PIE804
 pub(crate) fn unnecessary_dict_kwargs(checker: &mut Checker, call: &ast::ExprCall) {
-    let mut duplicate_keywords = None;
-    for keyword in &call.arguments.keywords {
-        // keyword is a spread operator (indicated by None).
-        if keyword.arg.is_some() {
+    for kw in &call.arguments.keywords {
+        // keyword is a spread operator (indicated by None)
+        if kw.arg.is_some() {
            continue;
        }

-        let Expr::Dict(ast::ExprDict { keys, values, .. }) = &keyword.value else {
+        let Expr::Dict(ast::ExprDict { keys, values, .. }) = &kw.value else {
            continue;
        };

        // Ex) `foo(**{**bar})`
        if matches!(keys.as_slice(), [None]) {
-            let mut diagnostic = Diagnostic::new(UnnecessaryDictKwargs, keyword.range());
+            let mut diagnostic = Diagnostic::new(UnnecessaryDictKwargs, call.range());

            diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
                format!("**{}", checker.locator().slice(values[0].range())),
-                keyword.range(),
+                kw.range(),
            )));

            checker.diagnostics.push(diagnostic);
@@ -92,12 +87,12 @@ pub(crate) fn unnecessary_dict_kwargs(checker: &mut Checker, call: &ast::ExprCal
            continue;
        }

-        let mut diagnostic = Diagnostic::new(UnnecessaryDictKwargs, keyword.range());
+        let mut diagnostic = Diagnostic::new(UnnecessaryDictKwargs, call.range());

        if values.is_empty() {
            diagnostic.try_set_fix(|| {
                remove_argument(
-                    keyword,
+                    kw,
                    &call.arguments,
                    Parentheses::Preserve,
                    checker.locator().contents(),
@@ -105,64 +100,22 @@ pub(crate) fn unnecessary_dict_kwargs(checker: &mut Checker, call: &ast::ExprCal
                .map(Fix::safe_edit)
            });
        } else {
-            // Compute the set of duplicate keywords (lazily).
-            if duplicate_keywords.is_none() {
-                duplicate_keywords = Some(duplicates(call));
-            }
-
-            // Avoid fixing if doing so could introduce a duplicate keyword argument.
-            if let Some(duplicate_keywords) = duplicate_keywords.as_ref() {
-                if kwargs
+            diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
+                kwargs
                    .iter()
-                    .all(|kwarg| !duplicate_keywords.contains(kwarg))
-                {
-                    diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
-                        kwargs
-                            .iter()
-                            .zip(values.iter())
-                            .map(|(kwarg, value)| {
-                                format!("{}={}", kwarg, checker.locator().slice(value.range()))
-                            })
-                            .join(", "),
-                        keyword.range(),
-                    )));
-                }
-            }
+                    .zip(values.iter())
+                    .map(|(kwarg, value)| {
+                        format!("{}={}", kwarg, checker.locator().slice(value.range()))
+                    })
+                    .join(", "),
+                kw.range(),
+            )));
        }

        checker.diagnostics.push(diagnostic);
    }
 }

-/// Determine the set of keywords that appear in multiple positions (either directly, as in
-/// `func(x=1)`, or indirectly, as in `func(**{"x": 1})`).
-fn duplicates(call: &ast::ExprCall) -> FxHashSet<&str> {
-    let mut seen = FxHashSet::with_capacity_and_hasher(
-        call.arguments.keywords.len(),
-        BuildHasherDefault::default(),
-    );
-    let mut duplicates = FxHashSet::with_capacity_and_hasher(
-        call.arguments.keywords.len(),
-        BuildHasherDefault::default(),
-    );
-    for keyword in &call.arguments.keywords {
-        if let Some(name) = &keyword.arg {
-            if !seen.insert(name.as_str()) {
-                duplicates.insert(name.as_str());
-            }
-        } else if let Expr::Dict(ast::ExprDict { keys, .. }) = &keyword.value {
-            for key in keys {
-                if let Some(name) = key.as_ref().and_then(as_kwarg) {
-                    if !seen.insert(name) {
-                        duplicates.insert(name);
-                    }
-                }
-            }
-        }
-    }
-    duplicates
-}
-
 /// Return `Some` if a key is a valid keyword argument name, or `None` otherwise.
 fn as_kwarg(key: &Expr) -> Option<&str> {
    if let Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) = key {
--- a/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linterrulesflake8_pietestsPIE804_PIE804.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linterrulesflake8_pietestsPIE804_PIE804.py.snap
@@ -1,10 +1,10 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_pie/mod.rs
 ---
-PIE804.py:1:5: PIE804 [*] Unnecessary `dict` kwargs
+PIE804.py:1:1: PIE804 [*] Unnecessary `dict` kwargs
  |
 1 | foo(**{"bar": True})  # PIE804
-  |     ^^^^^^^^^^^^^^^ PIE804
+  | ^^^^^^^^^^^^^^^^^^^^ PIE804
 2 | 
 3 | foo(**{"r2d2": True})  # PIE804
  |
@@ -17,12 +17,12 @@ PIE804.py:1:5: PIE804 [*] Unnecessary `dict` kwargs
 3 3 | foo(**{"r2d2": True})  # PIE804
 4 4 | 

-PIE804.py:3:5: PIE804 [*] Unnecessary `dict` kwargs
+PIE804.py:3:1: PIE804 [*] Unnecessary `dict` kwargs
  |
 1 | foo(**{"bar": True})  # PIE804
 2 | 
 3 | foo(**{"r2d2": True})  # PIE804
-  |     ^^^^^^^^^^^^^^^^ PIE804
+  | ^^^^^^^^^^^^^^^^^^^^^ PIE804
 4 | 
 5 | Foo.objects.create(**{"bar": True})  # PIE804
  |
@@ -37,12 +37,12 @@ PIE804.py:3:5: PIE804 [*] Unnecessary `dict` kwargs
 5 5 | Foo.objects.create(**{"bar": True})  # PIE804
 6 6 | 

-PIE804.py:5:20: PIE804 [*] Unnecessary `dict` kwargs
+PIE804.py:5:1: PIE804 [*] Unnecessary `dict` kwargs
  |
 3 | foo(**{"r2d2": True})  # PIE804
 4 | 
 5 | Foo.objects.create(**{"bar": True})  # PIE804
-  |                    ^^^^^^^^^^^^^^^ PIE804
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PIE804
 6 | 
 7 | Foo.objects.create(**{"_id": some_id})  # PIE804
  |
@@ -58,12 +58,12 @@ PIE804.py:5:20: PIE804 [*] Unnecessary `dict` kwargs
 7 7 | Foo.objects.create(**{"_id": some_id})  # PIE804
 8 8 | 

-PIE804.py:7:20: PIE804 [*] Unnecessary `dict` kwargs
+PIE804.py:7:1: PIE804 [*] Unnecessary `dict` kwargs
  |
 5 | Foo.objects.create(**{"bar": True})  # PIE804
 6 | 
 7 | Foo.objects.create(**{"_id": some_id})  # PIE804
-  |                    ^^^^^^^^^^^^^^^^^^ PIE804
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PIE804
 8 | 
 9 | Foo.objects.create(**{**bar})  # PIE804
  |
@@ -79,12 +79,12 @@ PIE804.py:7:20: PIE804 [*] Unnecessary `dict` kwargs
 9 9 | Foo.objects.create(**{**bar})  # PIE804
 10 10 | 

-PIE804.py:9:20: PIE804 [*] Unnecessary `dict` kwargs
+PIE804.py:9:1: PIE804 [*] Unnecessary `dict` kwargs
   |
 7 | Foo.objects.create(**{"_id": some_id})  # PIE804
 8 | 
 9 | Foo.objects.create(**{**bar})  # PIE804
-   |                    ^^^^^^^^^ PIE804
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PIE804
 10 | 
 11 | foo(**{})
   |
@@ -100,12 +100,12 @@ PIE804.py:9:20: PIE804 [*] Unnecessary `dict` kwargs
 11 11 | foo(**{})
 12 12 | 

-PIE804.py:11:5: PIE804 [*] Unnecessary `dict` kwargs
+PIE804.py:11:1: PIE804 [*] Unnecessary `dict` kwargs
   |
 9 | Foo.objects.create(**{**bar})  # PIE804
 10 | 
 11 | foo(**{})
-   |     ^^^^ PIE804
+   | ^^^^^^^^^ PIE804
 12 | 
 13 | foo(**{**data, "foo": "buzz"})
   |
@@ -121,68 +121,20 @@ PIE804.py:11:5: PIE804 [*] Unnecessary `dict` kwargs
 13 13 | foo(**{**data, "foo": "buzz"})
 14 14 | foo(**buzz)

-PIE804.py:22:5: PIE804 [*] Unnecessary `dict` kwargs
+PIE804.py:23:1: PIE804 [*] Unnecessary `dict` kwargs
   |
-20 | foo(**{f"buzz__{bar}": True})
 21 | abc(**{"for": 3})
-22 | foo(**{},)
-   |     ^^^^ PIE804
-23 | 
-24 | # Duplicated key names won't be fixed, to avoid syntax errors.
+22 | 
+23 | foo(**{},)
+   | ^^^^^^^^^^ PIE804
   |
   = help: Remove unnecessary kwargs

 ℹ Safe fix
-19 19 | foo(**{"": True})
 20 20 | foo(**{f"buzz__{bar}": True})
 21 21 | abc(**{"for": 3})
-22    |-foo(**{},)
-   22 |+foo()
-23 23 | 
-24 24 | # Duplicated key names won't be fixed, to avoid syntax errors.
-25 25 | abc(**{'a': b}, **{'a': c})  # PIE804
-
-PIE804.py:25:5: PIE804 Unnecessary `dict` kwargs
-   |
-24 | # Duplicated key names won't be fixed, to avoid syntax errors.
-25 | abc(**{'a': b}, **{'a': c})  # PIE804
-   |     ^^^^^^^^^^ PIE804
-26 | abc(a=1, **{'a': c}, **{'b': c})  # PIE804
-   |
-   = help: Remove unnecessary kwargs
-
-PIE804.py:25:17: PIE804 Unnecessary `dict` kwargs
-   |
-24 | # Duplicated key names won't be fixed, to avoid syntax errors.
-25 | abc(**{'a': b}, **{'a': c})  # PIE804
-   |                 ^^^^^^^^^^ PIE804
-26 | abc(a=1, **{'a': c}, **{'b': c})  # PIE804
-   |
-   = help: Remove unnecessary kwargs
-
-PIE804.py:26:10: PIE804 Unnecessary `dict` kwargs
-   |
-24 | # Duplicated key names won't be fixed, to avoid syntax errors.
-25 | abc(**{'a': b}, **{'a': c})  # PIE804
-26 | abc(a=1, **{'a': c}, **{'b': c})  # PIE804
-   |          ^^^^^^^^^^ PIE804
-   |
-   = help: Remove unnecessary kwargs
-
-PIE804.py:26:22: PIE804 [*] Unnecessary `dict` kwargs
-   |
-24 | # Duplicated key names won't be fixed, to avoid syntax errors.
-25 | abc(**{'a': b}, **{'a': c})  # PIE804
-26 | abc(a=1, **{'a': c}, **{'b': c})  # PIE804
-   |                      ^^^^^^^^^^ PIE804
-   |
-   = help: Remove unnecessary kwargs
-
-ℹ Safe fix
-23 23 | 
-24 24 | # Duplicated key names won't be fixed, to avoid syntax errors.
-25 25 | abc(**{'a': b}, **{'a': c})  # PIE804
-26    |-abc(a=1, **{'a': c}, **{'b': c})  # PIE804
-   26 |+abc(a=1, **{'a': c}, b=c)  # PIE804
+22 22 | 
+23    |-foo(**{},)
+   23 |+foo()


--- a/crates/ruff_linter/src/rules/flake8_pyi/rules/string_or_bytes_too_long.rs
+++ b/crates/ruff_linter/src/rules/flake8_pyi/rules/string_or_bytes_too_long.rs
@@ -1,7 +1,8 @@
+use ruff_python_ast::{self as ast, Expr};
+
 use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::is_docstring_stmt;
-use ruff_python_ast::{self as ast, StringLike};
 use ruff_text_size::Ranged;

 use crate::checkers::ast::Checker;
@@ -43,27 +44,25 @@ impl AlwaysFixableViolation for StringOrBytesTooLong {
 }

 /// PYI053
-pub(crate) fn string_or_bytes_too_long(checker: &mut Checker, string: StringLike) {
+pub(crate) fn string_or_bytes_too_long(checker: &mut Checker, expr: &Expr) {
    // Ignore docstrings.
    if is_docstring_stmt(checker.semantic().current_statement()) {
        return;
    }

-    let length = match string {
-        StringLike::StringLiteral(ast::ExprStringLiteral { value, .. }) => value.chars().count(),
-        StringLike::BytesLiteral(ast::ExprBytesLiteral { value, .. }) => value.len(),
-        StringLike::FStringLiteral(ast::FStringLiteralElement { value, .. }) => {
-            value.chars().count()
-        }
+    let length = match expr {
+        Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => value.chars().count(),
+        Expr::BytesLiteral(ast::ExprBytesLiteral { value, .. }) => value.len(),
+        _ => return,
    };
    if length <= 50 {
        return;
    }

-    let mut diagnostic = Diagnostic::new(StringOrBytesTooLong, string.range());
+    let mut diagnostic = Diagnostic::new(StringOrBytesTooLong, expr.range());
    diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
        "...".to_string(),
-        string.range(),
+        expr.range(),
    )));
    checker.diagnostics.push(diagnostic);
 }
--- a/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linterrulesflake8_pyitestsPYI053_PYI053.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linterrulesflake8_pyitestsPYI053_PYI053.pyi.snap
@@ -90,7 +90,7 @@ PYI053.pyi:30:14: PYI053 [*] String and bytes literals longer than 50 characters
 30 | qux: bytes = b"51 character byte stringggggggggggggggggggggggggggg\xff"  # Error: PYI053
   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI053
 31 | 
-32 | ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg"  # OK
+32 | class Demo:
   |
   = help: Replace with `...`

@@ -101,28 +101,7 @@ PYI053.pyi:30:14: PYI053 [*] String and bytes literals longer than 50 characters
 30    |-qux: bytes = b"51 character byte stringggggggggggggggggggggggggggg\xff"  # Error: PYI053
   30 |+qux: bytes = ...  # Error: PYI053
 31 31 | 
-32 32 | ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg"  # OK
-33 33 | 
-
-PYI053.pyi:34:15: PYI053 [*] String and bytes literals longer than 50 characters are not permitted
-   |
-32 | ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg"  # OK
-33 | 
-34 | fbar: str = f"51 character stringgggggggggggggggggggggggggggggggg"  # Error: PYI053
-   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI053
-35 | 
-36 | class Demo:
-   |
-   = help: Replace with `...`
-
-ℹ Safe fix
-31 31 | 
-32 32 | ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg"  # OK
-33 33 | 
-34    |-fbar: str = f"51 character stringgggggggggggggggggggggggggggggggg"  # Error: PYI053
-   34 |+fbar: str = f"..."  # Error: PYI053
-35 35 | 
-36 36 | class Demo:
-37 37 |     """Docstrings are excluded from this rule. Some padding."""  # OK
+32 32 | class Demo:
+33 33 |     """Docstrings are excluded from this rule. Some padding."""  # OK


--- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/assertion.rs
@@ -33,7 +33,7 @@ use super::unittest_assert::UnittestAssert;
 /// Checks for assertions that combine multiple independent conditions.
 ///
 /// ## Why is this bad?
-/// Composite assertion statements are harder to debug upon failure, as the
+/// Composite assertion statements are harder debug upon failure, as the
 /// failure message will not indicate which condition failed.
 ///
 /// ## Example
--- a/crates/ruff_linter/src/rules/flake8_pytest_style/rules/helpers.rs
+++ b/crates/ruff_linter/src/rules/flake8_pytest_style/rules/helpers.rs
@@ -56,27 +56,17 @@ pub(super) fn is_empty_or_null_string(expr: &Expr) -> bool {
        Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => value.is_empty(),
        Expr::NoneLiteral(_) => true,
        Expr::FString(ast::ExprFString { value, .. }) => {
-            value.iter().all(|f_string_part| match f_string_part {
+            value.parts().all(|f_string_part| match f_string_part {
                ast::FStringPart::Literal(literal) => literal.is_empty(),
-                ast::FStringPart::FString(f_string) => f_string
-                    .elements
-                    .iter()
-                    .all(is_empty_or_null_fstring_element),
+                ast::FStringPart::FString(f_string) => {
+                    f_string.values.iter().all(is_empty_or_null_string)
+                }
            })
        }
        _ => false,
    }
 }

-fn is_empty_or_null_fstring_element(element: &ast::FStringElement) -> bool {
-    match element {
-        ast::FStringElement::Literal(ast::FStringLiteralElement { value, .. }) => value.is_empty(),
-        ast::FStringElement::Expression(ast::FStringExpressionElement { expression, .. }) => {
-            is_empty_or_null_string(expression)
-        }
-    }
-}
-
 pub(super) fn split_names(names: &str) -> Vec<&str> {
    // Match the following pytest code:
    //    [x.strip() for x in argnames.split(",") if x.strip()]
--- a/crates/ruff_linter/src/rules/flake8_trio/rules/zero_sleep_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_trio/rules/zero_sleep_call.rs
@@ -1,7 +1,7 @@
 use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
+use ruff_python_ast::Stmt;
 use ruff_python_ast::{self as ast, Expr, ExprCall, Int};
-use ruff_python_semantic::analyze::typing::find_assigned_value;
 use ruff_text_size::Ranged;

 use crate::checkers::ast::Checker;
@@ -71,15 +71,30 @@ pub(crate) fn zero_sleep_call(checker: &mut Checker, call: &ExprCall) {
            }
        }
        Expr::Name(ast::ExprName { id, .. }) => {
-            let Some(value) = find_assigned_value(id, checker.semantic()) else {
-                return;
-            };
-            let Expr::NumberLiteral(ast::ExprNumberLiteral { value: num, .. }) = value else {
-                return;
-            };
-            let Some(int) = num.as_int() else { return };
-            if *int != Int::ZERO {
-                return;
+            let scope = checker.semantic().current_scope();
+            if let Some(binding_id) = scope.get(id) {
+                let binding = checker.semantic().binding(binding_id);
+                if binding.kind.is_assignment() || binding.kind.is_named_expr_assignment() {
+                    if let Some(parent_id) = binding.source {
+                        let parent = checker.semantic().statement(parent_id);
+                        if let Stmt::Assign(ast::StmtAssign { value, .. })
+                        | Stmt::AnnAssign(ast::StmtAnnAssign {
+                            value: Some(value), ..
+                        })
+                        | Stmt::AugAssign(ast::StmtAugAssign { value, .. }) = parent
+                        {
+                            let Expr::NumberLiteral(ast::ExprNumberLiteral { value: num, .. }) =
+                                value.as_ref()
+                            else {
+                                return;
+                            };
+                            let Some(int) = num.as_int() else { return };
+                            if *int != Int::ZERO {
+                                return;
+                            }
+                        }
+                    }
+                }
            }
        }
        _ => return,
--- a/crates/ruff_linter/src/rules/flake8_trio/snapshots/ruff_linterrulesflake8_triotestsTRIO115_TRIO115.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_trio/snapshots/ruff_linterrulesflake8_triotestsTRIO115_TRIO115.py.snap
@@ -85,227 +85,51 @@ TRIO115.py:17:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.s
 19 19 |     bar = "bar"
 20 20 |     trio.sleep(bar)

-TRIO115.py:23:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+TRIO115.py:31:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
   |
-22 |     x, y = 0, 2000
-23 |     trio.sleep(x)  # TRIO115
-   |     ^^^^^^^^^^^^^ TRIO115
-24 |     trio.sleep(y)  # OK
-   |
-   = help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-20 20 |     trio.sleep(bar)
-21 21 | 
-22 22 |     x, y = 0, 2000
-23    |-    trio.sleep(x)  # TRIO115
-   23 |+    trio.lowlevel.checkpoint()  # TRIO115
-24 24 |     trio.sleep(y)  # OK
-25 25 | 
-26 26 |     (a, b, [c, (d, e)]) = (1, 2, (0, [4, 0]))
-
-TRIO115.py:27:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
-   |
-26 |     (a, b, [c, (d, e)]) = (1, 2, (0, [4, 0]))
-27 |     trio.sleep(c)  # TRIO115
-   |     ^^^^^^^^^^^^^ TRIO115
-28 |     trio.sleep(d)  # OK
-29 |     trio.sleep(e)  # TRIO115
-   |
-   = help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-24 24 |     trio.sleep(y)  # OK
-25 25 | 
-26 26 |     (a, b, [c, (d, e)]) = (1, 2, (0, [4, 0]))
-27    |-    trio.sleep(c)  # TRIO115
-   27 |+    trio.lowlevel.checkpoint()  # TRIO115
-28 28 |     trio.sleep(d)  # OK
-29 29 |     trio.sleep(e)  # TRIO115
-30 30 | 
-
-TRIO115.py:29:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
-   |
-27 |     trio.sleep(c)  # TRIO115
-28 |     trio.sleep(d)  # OK
-29 |     trio.sleep(e)  # TRIO115
-   |     ^^^^^^^^^^^^^ TRIO115
-30 | 
-31 |     m_x, m_y = 0
-   |
-   = help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-26 26 |     (a, b, [c, (d, e)]) = (1, 2, (0, [4, 0]))
-27 27 |     trio.sleep(c)  # TRIO115
-28 28 |     trio.sleep(d)  # OK
-29    |-    trio.sleep(e)  # TRIO115
-   29 |+    trio.lowlevel.checkpoint()  # TRIO115
-30 30 | 
-31 31 |     m_x, m_y = 0
-32 32 |     trio.sleep(m_y)  # OK
-
-TRIO115.py:36:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
-   |
-35 |     m_a = m_b = 0
-36 |     trio.sleep(m_a)  # TRIO115
-   |     ^^^^^^^^^^^^^^^ TRIO115
-37 |     trio.sleep(m_b)  # TRIO115
-   |
-   = help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-33 33 |     trio.sleep(m_x)  # OK
-34 34 | 
-35 35 |     m_a = m_b = 0
-36    |-    trio.sleep(m_a)  # TRIO115
-   36 |+    trio.lowlevel.checkpoint()  # TRIO115
-37 37 |     trio.sleep(m_b)  # TRIO115
-38 38 | 
-39 39 |     m_c = (m_d, m_e) = (0, 0)
-
-TRIO115.py:37:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
-   |
-35 |     m_a = m_b = 0
-36 |     trio.sleep(m_a)  # TRIO115
-37 |     trio.sleep(m_b)  # TRIO115
-   |     ^^^^^^^^^^^^^^^ TRIO115
-38 | 
-39 |     m_c = (m_d, m_e) = (0, 0)
-   |
-   = help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-34 34 | 
-35 35 |     m_a = m_b = 0
-36 36 |     trio.sleep(m_a)  # TRIO115
-37    |-    trio.sleep(m_b)  # TRIO115
-   37 |+    trio.lowlevel.checkpoint()  # TRIO115
-38 38 | 
-39 39 |     m_c = (m_d, m_e) = (0, 0)
-40 40 |     trio.sleep(m_c)  # OK
-
-TRIO115.py:41:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
-   |
-39 |     m_c = (m_d, m_e) = (0, 0)
-40 |     trio.sleep(m_c)  # OK
-41 |     trio.sleep(m_d)  # TRIO115
-   |     ^^^^^^^^^^^^^^^ TRIO115
-42 |     trio.sleep(m_e)  # TRIO115
-   |
-   = help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-38 38 | 
-39 39 |     m_c = (m_d, m_e) = (0, 0)
-40 40 |     trio.sleep(m_c)  # OK
-41    |-    trio.sleep(m_d)  # TRIO115
-   41 |+    trio.lowlevel.checkpoint()  # TRIO115
-42 42 |     trio.sleep(m_e)  # TRIO115
-43 43 | 
-44 44 | 
-
-TRIO115.py:42:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
-   |
-40 |     trio.sleep(m_c)  # OK
-41 |     trio.sleep(m_d)  # TRIO115
-42 |     trio.sleep(m_e)  # TRIO115
-   |     ^^^^^^^^^^^^^^^ TRIO115
-   |
-   = help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-39 39 |     m_c = (m_d, m_e) = (0, 0)
-40 40 |     trio.sleep(m_c)  # OK
-41 41 |     trio.sleep(m_d)  # TRIO115
-42    |-    trio.sleep(m_e)  # TRIO115
-   42 |+    trio.lowlevel.checkpoint()  # TRIO115
-43 43 | 
-44 44 | 
-45 45 | def func():
-
-TRIO115.py:48:14: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
-   |
-46 |     import trio
-47 | 
-48 |     trio.run(trio.sleep(0))  # TRIO115
-   |              ^^^^^^^^^^^^^ TRIO115
-   |
-   = help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-45 45 | def func():
-46 46 |     import trio
-47 47 | 
-48    |-    trio.run(trio.sleep(0))  # TRIO115
-   48 |+    trio.run(trio.lowlevel.checkpoint())  # TRIO115
-49 49 | 
-50 50 | 
-51 51 | from trio import Event, sleep
-
-TRIO115.py:55:5: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
-   |
-54 | def func():
-55 |     sleep(0)  # TRIO115
+30 | def func():
+31 |     sleep(0)  # TRIO115
   |     ^^^^^^^^ TRIO115
   |
   = help: Replace with `trio.lowlevel.checkpoint()`

 ℹ Safe fix
-48 48 |     trio.run(trio.sleep(0))  # TRIO115
-49 49 | 
-50 50 | 
-51    |-from trio import Event, sleep
-   51 |+from trio import Event, sleep, lowlevel
-52 52 | 
-53 53 | 
-54 54 | def func():
-55    |-    sleep(0)  # TRIO115
-   55 |+    lowlevel.checkpoint()  # TRIO115
-56 56 | 
-57 57 | 
-58 58 | async def func():
+24 24 |     trio.run(trio.sleep(0))  # TRIO115
+25 25 | 
+26 26 | 
+27    |-from trio import Event, sleep
+   27 |+from trio import Event, sleep, lowlevel
+28 28 | 
+29 29 | 
+30 30 | def func():
+31    |-    sleep(0)  # TRIO115
+   31 |+    lowlevel.checkpoint()  # TRIO115
+32 32 | 
+33 33 | 
+34 34 | async def func():

-TRIO115.py:59:11: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
+TRIO115.py:35:11: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
   |
-58 | async def func():
-59 |     await sleep(seconds=0)  # TRIO115
+34 | async def func():
+35 |     await sleep(seconds=0)  # TRIO115
   |           ^^^^^^^^^^^^^^^^ TRIO115
   |
   = help: Replace with `trio.lowlevel.checkpoint()`

 ℹ Safe fix
-48 48 |     trio.run(trio.sleep(0))  # TRIO115
-49 49 | 
-50 50 | 
-51    |-from trio import Event, sleep
-   51 |+from trio import Event, sleep, lowlevel
-52 52 | 
-53 53 | 
-54 54 | def func():
+24 24 |     trio.run(trio.sleep(0))  # TRIO115
+25 25 | 
+26 26 | 
+27    |-from trio import Event, sleep
+   27 |+from trio import Event, sleep, lowlevel
+28 28 | 
+29 29 | 
+30 30 | def func():
 --------------------------------------------------------------------------------
-56 56 | 
-57 57 | 
-58 58 | async def func():
-59    |-    await sleep(seconds=0)  # TRIO115
-   59 |+    await lowlevel.checkpoint()  # TRIO115
-60 60 | 
-61 61 | 
-62 62 | def func():
-
-TRIO115.py:66:9: TRIO115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
-   |
-65 |     if (walrus := 0) == 0:
-66 |         trio.sleep(walrus)  # TRIO115
-   |         ^^^^^^^^^^^^^^^^^^ TRIO115
-   |
-   = help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-63 63 |     import trio
-64 64 | 
-65 65 |     if (walrus := 0) == 0:
-66    |-        trio.sleep(walrus)  # TRIO115
-   66 |+        trio.lowlevel.checkpoint()  # TRIO115
+32 32 | 
+33 33 | 
+34 34 | async def func():
+35    |-    await sleep(seconds=0)  # TRIO115
+   35 |+    await lowlevel.checkpoint()  # TRIO115


--- a/crates/ruff_linter/src/rules/flake8_type_checking/helpers.rs
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/helpers.rs
@@ -1,35 +1,10 @@
-use anyhow::Result;
-use rustc_hash::FxHashSet;
-
-use ruff_diagnostics::Edit;
 use ruff_python_ast::call_path::from_qualified_name;
 use ruff_python_ast::helpers::{map_callable, map_subscript};
 use ruff_python_ast::{self as ast, Expr};
-use ruff_python_codegen::Stylist;
-use ruff_python_semantic::{
-    Binding, BindingId, BindingKind, NodeId, ResolvedReference, SemanticModel,
-};
-use ruff_source_file::Locator;
-use ruff_text_size::Ranged;
+use ruff_python_semantic::{Binding, BindingId, BindingKind, SemanticModel};
+use rustc_hash::FxHashSet;

-use crate::rules::flake8_type_checking::settings::Settings;
-
-/// Returns `true` if the [`ResolvedReference`] is in a typing-only context _or_ a runtime-evaluated
-/// context (with quoting enabled).
-pub(crate) fn is_typing_reference(reference: &ResolvedReference, settings: &Settings) -> bool {
-    reference.in_type_checking_block()
-        || reference.in_typing_only_annotation()
-        || reference.in_complex_string_type_definition()
-        || reference.in_simple_string_type_definition()
-        || (settings.quote_annotations && reference.in_runtime_evaluated_annotation())
-}
-
-/// Returns `true` if the [`Binding`] represents a runtime-required import.
-pub(crate) fn is_valid_runtime_import(
-    binding: &Binding,
-    semantic: &SemanticModel,
-    settings: &Settings,
-) -> bool {
+pub(crate) fn is_valid_runtime_import(binding: &Binding, semantic: &SemanticModel) -> bool {
    if matches!(
        binding.kind,
        BindingKind::Import(..) | BindingKind::FromImport(..) | BindingKind::SubmoduleImport(..)
@@ -37,29 +12,28 @@ pub(crate) fn is_valid_runtime_import(
        binding.context.is_runtime()
            && binding
                .references()
-                .map(|reference_id| semantic.reference(reference_id))
-                .any(|reference| !is_typing_reference(reference, settings))
+                .any(|reference_id| semantic.reference(reference_id).context().is_runtime())
    } else {
        false
    }
 }

-pub(crate) fn runtime_required_class(
+pub(crate) fn runtime_evaluated_class(
    class_def: &ast::StmtClassDef,
    base_classes: &[String],
    decorators: &[String],
    semantic: &SemanticModel,
 ) -> bool {
-    if runtime_required_base_class(class_def, base_classes, semantic) {
+    if runtime_evaluated_base_class(class_def, base_classes, semantic) {
        return true;
    }
-    if runtime_required_decorators(class_def, decorators, semantic) {
+    if runtime_evaluated_decorators(class_def, decorators, semantic) {
        return true;
    }
    false
 }

-fn runtime_required_base_class(
+fn runtime_evaluated_base_class(
    class_def: &ast::StmtClassDef,
    base_classes: &[String],
    semantic: &SemanticModel,
@@ -71,7 +45,7 @@ fn runtime_required_base_class(
        seen: &mut FxHashSet<BindingId>,
    ) -> bool {
        class_def.bases().iter().any(|expr| {
-            // If the base class is itself runtime-required, then this is too.
+            // If the base class is itself runtime-evaluated, then this is too.
            // Ex) `class Foo(BaseModel): ...`
            if semantic
                .resolve_call_path(map_subscript(expr))
@@ -84,7 +58,7 @@ fn runtime_required_base_class(
                return true;
            }

-            // If the base class extends a runtime-required class, then this does too.
+            // If the base class extends a runtime-evaluated class, then this does too.
            // Ex) `class Bar(BaseModel): ...; class Foo(Bar): ...`
            if let Some(id) = semantic.lookup_attribute(map_subscript(expr)) {
                if seen.insert(id) {
@@ -112,7 +86,7 @@ fn runtime_required_base_class(
    inner(class_def, base_classes, semantic, &mut FxHashSet::default())
 }

-fn runtime_required_decorators(
+fn runtime_evaluated_decorators(
    class_def: &ast::StmtClassDef,
    decorators: &[String],
    semantic: &SemanticModel,
@@ -200,75 +174,3 @@ pub(crate) fn is_singledispatch_implementation(
        is_singledispatch_interface(function_def, semantic)
    })
 }
-
-/// Wrap a type annotation in quotes.
-///
-/// This requires more than just wrapping the reference itself in quotes. For example:
-/// - When quoting `Series` in `Series[pd.Timestamp]`, we want `"Series[pd.Timestamp]"`.
-/// - When quoting `kubernetes` in `kubernetes.SecurityContext`, we want `"kubernetes.SecurityContext"`.
-/// - When quoting `Series` in `Series["pd.Timestamp"]`, we want `"Series[pd.Timestamp]"`. (This is currently unsupported.)
-/// - When quoting `Series` in `Series[Literal["pd.Timestamp"]]`, we want `"Series[Literal['pd.Timestamp']]"`. (This is currently unsupported.)
-///
-/// In general, when expanding a component of a call chain, we want to quote the entire call chain.
-pub(crate) fn quote_annotation(
-    node_id: NodeId,
-    semantic: &SemanticModel,
-    locator: &Locator,
-    stylist: &Stylist,
-) -> Result<Edit> {
-    let expr = semantic.expression(node_id).expect("Expression not found");
-    if let Some(parent_id) = semantic.parent_expression_id(node_id) {
-        match semantic.expression(parent_id) {
-            Some(Expr::Subscript(parent)) => {
-                if expr == parent.value.as_ref() {
-                    // If we're quoting the value of a subscript, we need to quote the entire
-                    // expression. For example, when quoting `DataFrame` in `DataFrame[int]`, we
-                    // should generate `"DataFrame[int]"`.
-                    return quote_annotation(parent_id, semantic, locator, stylist);
-                }
-            }
-            Some(Expr::Attribute(parent)) => {
-                if expr == parent.value.as_ref() {
-                    // If we're quoting the value of an attribute, we need to quote the entire
-                    // expression. For example, when quoting `DataFrame` in `pd.DataFrame`, we
-                    // should generate `"pd.DataFrame"`.
-                    return quote_annotation(parent_id, semantic, locator, stylist);
-                }
-            }
-            Some(Expr::Call(parent)) => {
-                if expr == parent.func.as_ref() {
-                    // If we're quoting the function of a call, we need to quote the entire
-                    // expression. For example, when quoting `DataFrame` in `DataFrame()`, we
-                    // should generate `"DataFrame()"`.
-                    return quote_annotation(parent_id, semantic, locator, stylist);
-                }
-            }
-            Some(Expr::BinOp(parent)) => {
-                if parent.op.is_bit_or() {
-                    // If we're quoting the left or right side of a binary operation, we need to
-                    // quote the entire expression. For example, when quoting `DataFrame` in
-                    // `DataFrame | Series`, we should generate `"DataFrame | Series"`.
-                    return quote_annotation(parent_id, semantic, locator, stylist);
-                }
-            }
-            _ => {}
-        }
-    }
-
-    let annotation = locator.slice(expr);
-
-    // If the annotation already contains a quote, avoid attempting to re-quote it. For example:
-    // ```python
-    // from typing import Literal
-    //
-    // Set[Literal["Foo"]]
-    // ```
-    if annotation.contains('\'') || annotation.contains('"') {
-        return Err(anyhow::anyhow!("Annotation already contains a quote"));
-    }
-
-    // If we're quoting a name, we need to quote the entire expression.
-    let quote = stylist.quote();
-    let annotation = format!("{quote}{annotation}{quote}");
-    Ok(Edit::range_replacement(annotation, expr.range()))
-}
--- a/crates/ruff_linter/src/rules/flake8_type_checking/imports.rs
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/imports.rs
@@ -1,22 +0,0 @@
-use ruff_python_semantic::{AnyImport, Binding, ResolvedReferenceId};
-use ruff_text_size::{Ranged, TextRange};
-
-/// An import with its surrounding context.
-pub(crate) struct ImportBinding<'a> {
-    /// The qualified name of the import (e.g., `typing.List` for `from typing import List`).
-    pub(crate) import: AnyImport<'a>,
-    /// The binding for the imported symbol.
-    pub(crate) binding: &'a Binding<'a>,
-    /// The first reference to the imported symbol.
-    pub(crate) reference_id: ResolvedReferenceId,
-    /// The trimmed range of the import (e.g., `List` in `from typing import List`).
-    pub(crate) range: TextRange,
-    /// The range of the import's parent statement.
-    pub(crate) parent_range: Option<TextRange>,
-}
-
-impl Ranged for ImportBinding<'_> {
-    fn range(&self) -> TextRange {
-        self.range
-    }
-}
--- a/crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
@@ -1,6 +1,5 @@
 //! Rules from [flake8-type-checking](https://pypi.org/project/flake8-type-checking/).
 pub(crate) mod helpers;
-mod imports;
 pub(crate) mod rules;
 pub mod settings;

@@ -34,12 +33,10 @@ mod tests {
    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_7.py"))]
    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_8.py"))]
    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("TCH004_9.py"))]
-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("quote.py"))]
    #[test_case(Rule::TypingOnlyFirstPartyImport, Path::new("TCH001.py"))]
    #[test_case(Rule::TypingOnlyStandardLibraryImport, Path::new("TCH003.py"))]
    #[test_case(Rule::TypingOnlyStandardLibraryImport, Path::new("snapshot.py"))]
    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("TCH002.py"))]
-    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("quote.py"))]
    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("singledispatch.py"))]
    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("strict.py"))]
    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("typing_modules_1.py"))]
@@ -54,24 +51,6 @@ mod tests {
        Ok(())
    }

-    #[test_case(Rule::RuntimeImportInTypeCheckingBlock, Path::new("quote.py"))]
-    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("quote.py"))]
-    fn quote(rule_code: Rule, path: &Path) -> Result<()> {
-        let snapshot = format!("quote_{}_{}", rule_code.as_ref(), path.to_string_lossy());
-        let diagnostics = test_path(
-            Path::new("flake8_type_checking").join(path).as_path(),
-            &settings::LinterSettings {
-                flake8_type_checking: super::settings::Settings {
-                    quote_annotations: true,
-                    ..Default::default()
-                },
-                ..settings::LinterSettings::for_rule(rule_code)
-            },
-        )?;
-        assert_messages!(snapshot, diagnostics);
-        Ok(())
-    }
-
    #[test_case(Rule::TypingOnlyThirdPartyImport, Path::new("strict.py"))]
    fn strict(rule_code: Rule, path: &Path) -> Result<()> {
        let diagnostics = test_path(
@@ -130,7 +109,7 @@ mod tests {
            Path::new("flake8_type_checking").join(path).as_path(),
            &settings::LinterSettings {
                flake8_type_checking: super::settings::Settings {
-                    runtime_required_base_classes: vec![
+                    runtime_evaluated_base_classes: vec![
                        "pydantic.BaseModel".to_string(),
                        "sqlalchemy.orm.DeclarativeBase".to_string(),
                    ],
@@ -161,7 +140,7 @@ mod tests {
            Path::new("flake8_type_checking").join(path).as_path(),
            &settings::LinterSettings {
                flake8_type_checking: super::settings::Settings {
-                    runtime_required_decorators: vec![
+                    runtime_evaluated_decorators: vec![
                        "attrs.define".to_string(),
                        "attrs.frozen".to_string(),
                    ],
@@ -186,7 +165,7 @@ mod tests {
            Path::new("flake8_type_checking").join(path).as_path(),
            &settings::LinterSettings {
                flake8_type_checking: super::settings::Settings {
-                    runtime_required_base_classes: vec!["module.direct.MyBaseClass".to_string()],
+                    runtime_evaluated_base_classes: vec!["module.direct.MyBaseClass".to_string()],
                    ..Default::default()
                },
                ..settings::LinterSettings::for_rule(rule_code)
--- a/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_import_in_type_checking_block.rs
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/rules/runtime_import_in_type_checking_block.rs
@@ -5,15 +5,13 @@ use rustc_hash::FxHashMap;

 use ruff_diagnostics::{Diagnostic, Fix, FixAvailability, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_semantic::{Imported, NodeId, Scope};
-use ruff_text_size::Ranged;
+use ruff_python_semantic::{AnyImport, Imported, NodeId, ResolvedReferenceId, Scope};
+use ruff_text_size::{Ranged, TextRange};

 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
 use crate::fix;
 use crate::importer::ImportedMembers;
-use crate::rules::flake8_type_checking::helpers::quote_annotation;
-use crate::rules::flake8_type_checking::imports::ImportBinding;

 /// ## What it does
 /// Checks for runtime imports defined in a type-checking block.
@@ -22,10 +20,6 @@ use crate::rules::flake8_type_checking::imports::ImportBinding;
 /// The type-checking block is not executed at runtime, so the import will not
 /// be available at runtime.
 ///
-/// If [`flake8-type-checking.quote-annotations`] is set to `true`,
-/// annotations will be wrapped in quotes if doing so would enable the
-/// corresponding import to remain in the type-checking block.
-///
 /// ## Example
 /// ```python
 /// from typing import TYPE_CHECKING
@@ -47,15 +41,11 @@ use crate::rules::flake8_type_checking::imports::ImportBinding;
 ///     foo.bar()
 /// ```
 ///
-/// ## Options
-/// - `flake8-type-checking.quote-annotations`
-///
 /// ## References
 /// - [PEP 535](https://peps.python.org/pep-0563/#runtime-annotation-resolution-and-type-checking)
 #[violation]
 pub struct RuntimeImportInTypeCheckingBlock {
    qualified_name: String,
-    strategy: Strategy,
 }

 impl Violation for RuntimeImportInTypeCheckingBlock {
@@ -63,39 +53,17 @@ impl Violation for RuntimeImportInTypeCheckingBlock {

    #[derive_message_formats]
    fn message(&self) -> String {
-        let Self {
-            qualified_name,
-            strategy,
-        } = self;
-        match strategy {
-            Strategy::MoveImport => format!(
-                "Move import `{qualified_name}` out of type-checking block. Import is used for more than type hinting."
-            ),
-            Strategy::QuoteUsages => format!(
-                "Quote references to `{qualified_name}`. Import is in a type-checking block."
-            ),
-        }
+        let RuntimeImportInTypeCheckingBlock { qualified_name } = self;
+        format!(
+            "Move import `{qualified_name}` out of type-checking block. Import is used for more than type hinting."
+        )
    }

    fn fix_title(&self) -> Option<String> {
-        let Self { strategy, .. } = self;
-        match strategy {
-            Strategy::MoveImport => Some("Move out of type-checking block".to_string()),
-            Strategy::QuoteUsages => Some("Quote references".to_string()),
-        }
+        Some("Move out of type-checking block".to_string())
    }
 }

-#[derive(Debug, Clone, Copy, Hash, PartialEq, Eq)]
-enum Action {
-    /// The import should be moved out of the type-checking block.
-    Move,
-    /// All usages of the import should be wrapped in quotes.
-    Quote,
-    /// The import should be ignored.
-    Ignore,
-}
-
 /// TCH004
 pub(crate) fn runtime_import_in_type_checking_block(
    checker: &Checker,
@@ -103,7 +71,8 @@ pub(crate) fn runtime_import_in_type_checking_block(
    diagnostics: &mut Vec<Diagnostic>,
 ) {
    // Collect all runtime imports by statement.
-    let mut actions: FxHashMap<(NodeId, Action), Vec<ImportBinding>> = FxHashMap::default();
+    let mut errors_by_statement: FxHashMap<NodeId, Vec<ImportBinding>> = FxHashMap::default();
+    let mut ignores_by_statement: FxHashMap<NodeId, Vec<ImportBinding>> = FxHashMap::default();

    for binding_id in scope.binding_ids() {
        let binding = checker.semantic().binding(binding_id);
@@ -132,7 +101,6 @@ pub(crate) fn runtime_import_in_type_checking_block(
            let import = ImportBinding {
                import,
                reference_id,
-                binding,
                range: binding.range(),
                parent_range: binding.parent_range(checker.semantic()),
            };
@@ -145,153 +113,86 @@ pub(crate) fn runtime_import_in_type_checking_block(
                    )
                })
            {
-                actions
-                    .entry((node_id, Action::Ignore))
+                ignores_by_statement
+                    .entry(node_id)
                    .or_default()
                    .push(import);
            } else {
-                // Determine whether the member should be fixed by moving the import out of the
-                // type-checking block, or by quoting its references.
-                if checker.settings.flake8_type_checking.quote_annotations
-                    && binding.references().all(|reference_id| {
-                        let reference = checker.semantic().reference(reference_id);
-                        reference.context().is_typing()
-                            || reference.in_runtime_evaluated_annotation()
-                    })
-                {
-                    actions
-                        .entry((node_id, Action::Quote))
-                        .or_default()
-                        .push(import);
-                } else {
-                    actions
-                        .entry((node_id, Action::Move))
-                        .or_default()
-                        .push(import);
-                }
+                errors_by_statement.entry(node_id).or_default().push(import);
            }
        }
    }

-    for ((node_id, action), imports) in actions {
-        match action {
-            // Generate a diagnostic for every import, but share a fix across all imports within the same
-            // statement (excluding those that are ignored).
-            Action::Move => {
-                let fix = move_imports(checker, node_id, &imports).ok();
+    // Generate a diagnostic for every import, but share a fix across all imports within the same
+    // statement (excluding those that are ignored).
+    for (node_id, imports) in errors_by_statement {
+        let fix = fix_imports(checker, node_id, &imports).ok();

-                for ImportBinding {
-                    import,
-                    range,
-                    parent_range,
-                    ..
-                } in imports
-                {
-                    let mut diagnostic = Diagnostic::new(
-                        RuntimeImportInTypeCheckingBlock {
-                            qualified_name: import.qualified_name(),
-                            strategy: Strategy::MoveImport,
-                        },
-                        range,
-                    );
-                    if let Some(range) = parent_range {
-                        diagnostic.set_parent(range.start());
-                    }
-                    if let Some(fix) = fix.as_ref() {
-                        diagnostic.set_fix(fix.clone());
-                    }
-                    diagnostics.push(diagnostic);
-                }
+        for ImportBinding {
+            import,
+            range,
+            parent_range,
+            ..
+        } in imports
+        {
+            let mut diagnostic = Diagnostic::new(
+                RuntimeImportInTypeCheckingBlock {
+                    qualified_name: import.qualified_name(),
+                },
+                range,
+            );
+            if let Some(range) = parent_range {
+                diagnostic.set_parent(range.start());
            }
-
-            // Generate a diagnostic for every import, but share a fix across all imports within the same
-            // statement (excluding those that are ignored).
-            Action::Quote => {
-                let fix = quote_imports(checker, node_id, &imports).ok();
-
-                for ImportBinding {
-                    import,
-                    range,
-                    parent_range,
-                    ..
-                } in imports
-                {
-                    let mut diagnostic = Diagnostic::new(
-                        RuntimeImportInTypeCheckingBlock {
-                            qualified_name: import.qualified_name(),
-                            strategy: Strategy::QuoteUsages,
-                        },
-                        range,
-                    );
-                    if let Some(range) = parent_range {
-                        diagnostic.set_parent(range.start());
-                    }
-                    if let Some(fix) = fix.as_ref() {
-                        diagnostic.set_fix(fix.clone());
-                    }
-                    diagnostics.push(diagnostic);
-                }
-            }
-
-            // Separately, generate a diagnostic for every _ignored_ import, to ensure that the
-            // suppression comments aren't marked as unused.
-            Action::Ignore => {
-                for ImportBinding {
-                    import,
-                    range,
-                    parent_range,
-                    ..
-                } in imports
-                {
-                    let mut diagnostic = Diagnostic::new(
-                        RuntimeImportInTypeCheckingBlock {
-                            qualified_name: import.qualified_name(),
-                            strategy: Strategy::MoveImport,
-                        },
-                        range,
-                    );
-                    if let Some(range) = parent_range {
-                        diagnostic.set_parent(range.start());
-                    }
-                    diagnostics.push(diagnostic);
-                }
+            if let Some(fix) = fix.as_ref() {
+                diagnostic.set_fix(fix.clone());
            }
+            diagnostics.push(diagnostic);
        }
    }
+
+    // Separately, generate a diagnostic for every _ignored_ import, to ensure that the
+    // suppression comments aren't marked as unused.
+    for ImportBinding {
+        import,
+        range,
+        parent_range,
+        ..
+    } in ignores_by_statement.into_values().flatten()
+    {
+        let mut diagnostic = Diagnostic::new(
+            RuntimeImportInTypeCheckingBlock {
+                qualified_name: import.qualified_name(),
+            },
+            range,
+        );
+        if let Some(range) = parent_range {
+            diagnostic.set_parent(range.start());
+        }
+        diagnostics.push(diagnostic);
+    }
 }

-/// Generate a [`Fix`] to quote runtime usages for imports in a type-checking block.
-fn quote_imports(checker: &Checker, node_id: NodeId, imports: &[ImportBinding]) -> Result<Fix> {
-    let mut quote_reference_edits = imports
-        .iter()
-        .flat_map(|ImportBinding { binding, .. }| {
-            binding.references.iter().filter_map(|reference_id| {
-                let reference = checker.semantic().reference(*reference_id);
-                if reference.context().is_runtime() {
-                    Some(quote_annotation(
-                        reference.expression_id()?,
-                        checker.semantic(),
-                        checker.locator(),
-                        checker.stylist(),
-                    ))
-                } else {
-                    None
-                }
-            })
-        })
-        .collect::<Result<Vec<_>>>()?;
-    let quote_reference_edit = quote_reference_edits
-        .pop()
-        .expect("Expected at least one reference");
-    Ok(
-        Fix::unsafe_edits(quote_reference_edit, quote_reference_edits).isolate(Checker::isolation(
-            checker.semantic().parent_statement_id(node_id),
-        )),
-    )
+/// A runtime-required import with its surrounding context.
+struct ImportBinding<'a> {
+    /// The qualified name of the import (e.g., `typing.List` for `from typing import List`).
+    import: AnyImport<'a>,
+    /// The first reference to the imported symbol.
+    reference_id: ResolvedReferenceId,
+    /// The trimmed range of the import (e.g., `List` in `from typing import List`).
+    range: TextRange,
+    /// The range of the import's parent statement.
+    parent_range: Option<TextRange>,
+}
+
+impl Ranged for ImportBinding<'_> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
 }

 /// Generate a [`Fix`] to remove runtime imports from a type-checking block.
-fn move_imports(checker: &Checker, node_id: NodeId, imports: &[ImportBinding]) -> Result<Fix> {
+fn fix_imports(checker: &Checker, node_id: NodeId, imports: &[ImportBinding]) -> Result<Fix> {
    let statement = checker.semantic().statement(node_id);
    let parent = checker.semantic().parent_statement(node_id);

@@ -335,18 +236,3 @@ fn move_imports(checker: &Checker, node_id: NodeId, imports: &[ImportBinding]) -
        ),
    )
 }
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum Strategy {
-    /// The import should be moved out of the type-checking block.
-    ///
-    /// This is required when at least one reference to the symbol is in a runtime-required context.
-    /// For example, given `from foo import Bar`, `x = Bar()` would be runtime-required.
-    MoveImport,
-    /// All usages of the import should be wrapped in quotes.
-    ///
-    /// This is acceptable when all references to the symbol are in a runtime-evaluated, but not
-    /// runtime-required context. For example, given `from foo import Bar`, `x: Bar` would be
-    /// runtime-evaluated, but not runtime-required.
-    QuoteUsages,
-}
--- a/crates/ruff_linter/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/rules/typing_only_runtime_import.rs
@@ -5,15 +5,13 @@ use rustc_hash::FxHashMap;

 use ruff_diagnostics::{Diagnostic, DiagnosticKind, Fix, FixAvailability, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_semantic::{Binding, Imported, NodeId, Scope};
-use ruff_text_size::Ranged;
+use ruff_python_semantic::{AnyImport, Binding, Imported, NodeId, ResolvedReferenceId, Scope};
+use ruff_text_size::{Ranged, TextRange};

 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
 use crate::fix;
 use crate::importer::ImportedMembers;
-use crate::rules::flake8_type_checking::helpers::{is_typing_reference, quote_annotation};
-use crate::rules::flake8_type_checking::imports::ImportBinding;
 use crate::rules::isort::{categorize, ImportSection, ImportType};

 /// ## What it does
@@ -26,10 +24,6 @@ use crate::rules::isort::{categorize, ImportSection, ImportType};
 /// instead be imported conditionally under an `if TYPE_CHECKING:` block to
 /// minimize runtime overhead.
 ///
-/// If [`flake8-type-checking.quote-annotations`] is set to `true`,
-/// annotations will be wrapped in quotes if doing so would enable the
-/// corresponding import to be moved into an `if TYPE_CHECKING:` block.
-///
 /// If a class _requires_ that type annotations be available at runtime (as is
 /// the case for Pydantic, SQLAlchemy, and other libraries), consider using
 /// the [`flake8-type-checking.runtime-evaluated-base-classes`] and
@@ -62,7 +56,6 @@ use crate::rules::isort::{categorize, ImportSection, ImportType};
 /// ```
 ///
 /// ## Options
-/// - `flake8-type-checking.quote-annotations`
 /// - `flake8-type-checking.runtime-evaluated-base-classes`
 /// - `flake8-type-checking.runtime-evaluated-decorators`
 ///
@@ -99,10 +92,6 @@ impl Violation for TypingOnlyFirstPartyImport {
 /// instead be imported conditionally under an `if TYPE_CHECKING:` block to
 /// minimize runtime overhead.
 ///
-/// If [`flake8-type-checking.quote-annotations`] is set to `true`,
-/// annotations will be wrapped in quotes if doing so would enable the
-/// corresponding import to be moved into an `if TYPE_CHECKING:` block.
-///
 /// If a class _requires_ that type annotations be available at runtime (as is
 /// the case for Pydantic, SQLAlchemy, and other libraries), consider using
 /// the [`flake8-type-checking.runtime-evaluated-base-classes`] and
@@ -135,7 +124,6 @@ impl Violation for TypingOnlyFirstPartyImport {
 /// ```
 ///
 /// ## Options
-/// - `flake8-type-checking.quote-annotations`
 /// - `flake8-type-checking.runtime-evaluated-base-classes`
 /// - `flake8-type-checking.runtime-evaluated-decorators`
 ///
@@ -172,10 +160,6 @@ impl Violation for TypingOnlyThirdPartyImport {
 /// instead be imported conditionally under an `if TYPE_CHECKING:` block to
 /// minimize runtime overhead.
 ///
-/// If [`flake8-type-checking.quote-annotations`] is set to `true`,
-/// annotations will be wrapped in quotes if doing so would enable the
-/// corresponding import to be moved into an `if TYPE_CHECKING:` block.
-///
 /// If a class _requires_ that type annotations be available at runtime (as is
 /// the case for Pydantic, SQLAlchemy, and other libraries), consider using
 /// the [`flake8-type-checking.runtime-evaluated-base-classes`] and
@@ -208,7 +192,6 @@ impl Violation for TypingOnlyThirdPartyImport {
 /// ```
 ///
 /// ## Options
-/// - `flake8-type-checking.quote-annotations`
 /// - `flake8-type-checking.runtime-evaluated-base-classes`
 /// - `flake8-type-checking.runtime-evaluated-decorators`
 ///
@@ -270,12 +253,13 @@ pub(crate) fn typing_only_runtime_import(
        };

        if binding.context.is_runtime()
-            && binding
-                .references()
-                .map(|reference_id| checker.semantic().reference(reference_id))
-                .all(|reference| {
-                    is_typing_reference(reference, &checker.settings.flake8_type_checking)
-                })
+            && binding.references().all(|reference_id| {
+                checker
+                    .semantic()
+                    .reference(reference_id)
+                    .context()
+                    .is_typing()
+            })
        {
            let qualified_name = import.qualified_name();

@@ -326,7 +310,6 @@ pub(crate) fn typing_only_runtime_import(
            let import = ImportBinding {
                import,
                reference_id,
-                binding,
                range: binding.range(),
                parent_range: binding.parent_range(checker.semantic()),
            };
@@ -393,6 +376,24 @@ pub(crate) fn typing_only_runtime_import(
    }
 }

+/// A runtime-required import with its surrounding context.
+struct ImportBinding<'a> {
+    /// The qualified name of the import (e.g., `typing.List` for `from typing import List`).
+    import: AnyImport<'a>,
+    /// The first reference to the imported symbol.
+    reference_id: ResolvedReferenceId,
+    /// The trimmed range of the import (e.g., `List` in `from typing import List`).
+    range: TextRange,
+    /// The range of the import's parent statement.
+    parent_range: Option<TextRange>,
+}
+
+impl Ranged for ImportBinding<'_> {
+    fn range(&self) -> TextRange {
+        self.range
+    }
+}
+
 /// Return the [`Rule`] for the given import type.
 fn rule_for(import_type: ImportType) -> Rule {
    match import_type {
@@ -481,34 +482,9 @@ fn fix_imports(checker: &Checker, node_id: NodeId, imports: &[ImportBinding]) ->
        checker.source_type,
    )?;

-    // Step 3) Quote any runtime usages of the referenced symbol.
-    let quote_reference_edits = imports
-        .iter()
-        .flat_map(|ImportBinding { binding, .. }| {
-            binding.references.iter().filter_map(|reference_id| {
-                let reference = checker.semantic().reference(*reference_id);
-                if reference.context().is_runtime() {
-                    Some(quote_annotation(
-                        reference.expression_id()?,
-                        checker.semantic(),
-                        checker.locator(),
-                        checker.stylist(),
-                    ))
-                } else {
-                    None
-                }
-            })
-        })
-        .collect::<Result<Vec<_>>>()?;
-
-    Ok(Fix::unsafe_edits(
-        remove_import_edit,
-        add_import_edit
-            .into_edits()
-            .into_iter()
-            .chain(quote_reference_edits),
+    Ok(
+        Fix::unsafe_edits(remove_import_edit, add_import_edit.into_edits()).isolate(
+            Checker::isolation(checker.semantic().parent_statement_id(node_id)),
+        ),
    )
-    .isolate(Checker::isolation(
-        checker.semantic().parent_statement_id(node_id),
-    )))
 }
--- a/crates/ruff_linter/src/rules/flake8_type_checking/settings.rs
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/settings.rs
@@ -6,19 +6,17 @@ use ruff_macros::CacheKey;
 pub struct Settings {
    pub strict: bool,
    pub exempt_modules: Vec<String>,
-    pub runtime_required_base_classes: Vec<String>,
-    pub runtime_required_decorators: Vec<String>,
-    pub quote_annotations: bool,
+    pub runtime_evaluated_base_classes: Vec<String>,
+    pub runtime_evaluated_decorators: Vec<String>,
 }

 impl Default for Settings {
    fn default() -> Self {
        Self {
            strict: false,
-            exempt_modules: vec!["typing".to_string(), "typing_extensions".to_string()],
-            runtime_required_base_classes: vec![],
-            runtime_required_decorators: vec![],
-            quote_annotations: false,
+            exempt_modules: vec!["typing".to_string()],
+            runtime_evaluated_base_classes: vec![],
+            runtime_evaluated_decorators: vec![],
        }
    }
 }
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linterrulesflake8_type_checkingtestsquote_runtime-import-in-type-checking-block_quote.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linterrulesflake8_type_checkingtestsquote_runtime-import-in-type-checking-block_quote.py.snap
@@ -1,22 +0,0 @@
---
-source: crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
---
-quote.py:64:28: TCH004 [*] Quote references to `pandas.DataFrame`. Import is in a type-checking block.
-   |
-63 |     if TYPE_CHECKING:
-64 |         from pandas import DataFrame
-   |                            ^^^^^^^^^ TCH004
-65 | 
-66 |     def func(value: DataFrame):
-   |
-   = help: Quote references
-
-ℹ Unsafe fix
-63 63 |     if TYPE_CHECKING:
-64 64 |         from pandas import DataFrame
-65 65 | 
-66    |-    def func(value: DataFrame):
-   66 |+    def func(value: "DataFrame"):
-67 67 |         ...
-
-
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linterrulesflake8_type_checkingtestsquote_typing-only-third-party-import_quote.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linterrulesflake8_type_checkingtestsquote_typing-only-third-party-import_quote.py.snap
@@ -1,199 +0,0 @@
---
-source: crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
---
-quote.py:2:24: TCH002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
-  |
-1 | def f():
-2 |     from pandas import DataFrame
-  |                        ^^^^^^^^^ TCH002
-3 | 
-4 |     def baz() -> DataFrame:
-  |
-  = help: Move into type-checking block
-
-ℹ Unsafe fix
-1   |-def f():
-  1 |+from typing import TYPE_CHECKING
-  2 |+
-  3 |+if TYPE_CHECKING:
-2 4 |     from pandas import DataFrame
-  5 |+def f():
-3 6 | 
-4   |-    def baz() -> DataFrame:
-  7 |+    def baz() -> "DataFrame":
-5 8 |         ...
-6 9 | 
-7 10 | 
-
-quote.py:9:24: TCH002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
-   |
- 8 | def f():
- 9 |     from pandas import DataFrame
-   |                        ^^^^^^^^^ TCH002
-10 | 
-11 |     def baz() -> DataFrame[int]:
-   |
-   = help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from pandas import DataFrame
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
--------------------------------------------------------------------------------
-6  10 | 
-7  11 | 
-8  12 | def f():
-9     |-    from pandas import DataFrame
-10 13 | 
-11    |-    def baz() -> DataFrame[int]:
-   14 |+    def baz() -> "DataFrame[int]":
-12 15 |         ...
-13 16 | 
-14 17 | 
-
-quote.py:16:24: TCH002 Move third-party import `pandas.DataFrame` into a type-checking block
-   |
-15 | def f():
-16 |     from pandas import DataFrame
-   |                        ^^^^^^^^^ TCH002
-17 | 
-18 |     def baz() -> DataFrame["int"]:
-   |
-   = help: Move into type-checking block
-
-quote.py:23:22: TCH002 [*] Move third-party import `pandas` into a type-checking block
-   |
-22 | def f():
-23 |     import pandas as pd
-   |                      ^^ TCH002
-24 | 
-25 |     def baz() -> pd.DataFrame:
-   |
-   = help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    import pandas as pd
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
--------------------------------------------------------------------------------
-20 24 | 
-21 25 | 
-22 26 | def f():
-23    |-    import pandas as pd
-24 27 | 
-25    |-    def baz() -> pd.DataFrame:
-   28 |+    def baz() -> "pd.DataFrame":
-26 29 |         ...
-27 30 | 
-28 31 | 
-
-quote.py:30:22: TCH002 [*] Move third-party import `pandas` into a type-checking block
-   |
-29 | def f():
-30 |     import pandas as pd
-   |                      ^^ TCH002
-31 | 
-32 |     def baz() -> pd.DataFrame.Extra:
-   |
-   = help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    import pandas as pd
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
--------------------------------------------------------------------------------
-27 31 | 
-28 32 | 
-29 33 | def f():
-30    |-    import pandas as pd
-31 34 | 
-32    |-    def baz() -> pd.DataFrame.Extra:
-   35 |+    def baz() -> "pd.DataFrame.Extra":
-33 36 |         ...
-34 37 | 
-35 38 | 
-
-quote.py:37:22: TCH002 [*] Move third-party import `pandas` into a type-checking block
-   |
-36 | def f():
-37 |     import pandas as pd
-   |                      ^^ TCH002
-38 | 
-39 |     def baz() -> pd.DataFrame | int:
-   |
-   = help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    import pandas as pd
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
--------------------------------------------------------------------------------
-34 38 | 
-35 39 | 
-36 40 | def f():
-37    |-    import pandas as pd
-38 41 | 
-39    |-    def baz() -> pd.DataFrame | int:
-   42 |+    def baz() -> "pd.DataFrame | int":
-40 43 |         ...
-41 44 | 
-42 45 | 
-
-quote.py:45:24: TCH002 [*] Move third-party import `pandas.DataFrame` into a type-checking block
-   |
-44 | def f():
-45 |     from pandas import DataFrame
-   |                        ^^^^^^^^^ TCH002
-46 | 
-47 |     def baz() -> DataFrame():
-   |
-   = help: Move into type-checking block
-
-ℹ Unsafe fix
-   1  |+from typing import TYPE_CHECKING
-   2  |+
-   3  |+if TYPE_CHECKING:
-   4  |+    from pandas import DataFrame
-1  5  | def f():
-2  6  |     from pandas import DataFrame
-3  7  | 
--------------------------------------------------------------------------------
-42 46 | 
-43 47 | 
-44 48 | def f():
-45    |-    from pandas import DataFrame
-46 49 | 
-47    |-    def baz() -> DataFrame():
-   50 |+    def baz() -> "DataFrame()":
-48 51 |         ...
-49 52 | 
-50 53 | 
-
-quote.py:54:24: TCH002 Move third-party import `pandas.DataFrame` into a type-checking block
-   |
-52 |     from typing import Literal
-53 | 
-54 |     from pandas import DataFrame
-   |                        ^^^^^^^^^ TCH002
-55 | 
-56 |     def baz() -> DataFrame[Literal["int"]]:
-   |
-   = help: Move into type-checking block
-
-
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linterrulesflake8_type_checkingtestsruntime-import-in-type-checking-block_quote.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linterrulesflake8_type_checkingtestsruntime-import-in-type-checking-block_quote.py.snap
@@ -1,29 +0,0 @@
---
-source: crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
---
-quote.py:64:28: TCH004 [*] Move import `pandas.DataFrame` out of type-checking block. Import is used for more than type hinting.
-   |
-63 |     if TYPE_CHECKING:
-64 |         from pandas import DataFrame
-   |                            ^^^^^^^^^ TCH004
-65 | 
-66 |     def func(value: DataFrame):
-   |
-   = help: Move out of type-checking block
-
-ℹ Unsafe fix
-   1  |+from pandas import DataFrame
-1  2  | def f():
-2  3  |     from pandas import DataFrame
-3  4  | 
--------------------------------------------------------------------------------
-61 62 |     from typing import TYPE_CHECKING
-62 63 | 
-63 64 |     if TYPE_CHECKING:
-64    |-        from pandas import DataFrame
-   65 |+        pass
-65 66 | 
-66 67 |     def func(value: DataFrame):
-67 68 |         ...
-
-
--- a/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linterrulesflake8_type_checkingteststyping-only-third-party-import_quote.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_type_checking/snapshots/ruff_linterrulesflake8_type_checkingteststyping-only-third-party-import_quote.py.snap
@@ -1,4 +0,0 @@
---
-source: crates/ruff_linter/src/rules/flake8_type_checking/mod.rs
---
-
--- a/crates/ruff_linter/src/rules/flynt/helpers.rs
+++ b/crates/ruff_linter/src/rules/flynt/helpers.rs
@@ -1,23 +1,25 @@
 use ruff_python_ast::{self as ast, Arguments, ConversionFlag, Expr};
 use ruff_text_size::TextRange;

-/// Wrap an expression in a [`ast::FStringElement::Expression`] with no special formatting.
-fn to_f_string_expression_element(inner: &Expr) -> ast::FStringElement {
-    ast::FStringElement::Expression(ast::FStringExpressionElement {
-        expression: Box::new(inner.clone()),
+/// Wrap an expression in a `FormattedValue` with no special formatting.
+fn to_formatted_value_expr(inner: &Expr) -> Expr {
+    let node = ast::ExprFormattedValue {
+        value: Box::new(inner.clone()),
        debug_text: None,
        conversion: ConversionFlag::None,
        format_spec: None,
        range: TextRange::default(),
-    })
+    };
+    node.into()
 }

-/// Convert a string to a [`ast::FStringElement::Literal`].
-pub(super) fn to_f_string_literal_element(s: &str) -> ast::FStringElement {
-    ast::FStringElement::Literal(ast::FStringLiteralElement {
-        value: s.to_owned(),
-        range: TextRange::default(),
-    })
+/// Convert a string to a constant string expression.
+pub(super) fn to_constant_string(s: &str) -> Expr {
+    let node = ast::StringLiteral {
+        value: s.to_string(),
+        ..ast::StringLiteral::default()
+    };
+    node.into()
 }

 /// Figure out if `expr` represents a "simple" call
@@ -49,19 +51,15 @@ fn is_simple_callee(func: &Expr) -> bool {
 }

 /// Convert an expression to a f-string element (if it looks like a good idea).
-pub(super) fn to_f_string_element(expr: &Expr) -> Option<ast::FStringElement> {
+pub(super) fn to_f_string_element(expr: &Expr) -> Option<Expr> {
    match expr {
-        Expr::StringLiteral(ast::ExprStringLiteral { value, range }) => {
-            Some(ast::FStringElement::Literal(ast::FStringLiteralElement {
-                value: value.to_string(),
-                range: *range,
-            }))
-        }
+        // These are directly handled by `unparse_f_string_element`:
+        Expr::StringLiteral(_) | Expr::FString(_) | Expr::FormattedValue(_) => Some(expr.clone()),
        // These should be pretty safe to wrap in a formatted value.
        Expr::NumberLiteral(_) | Expr::BooleanLiteral(_) | Expr::Name(_) | Expr::Attribute(_) => {
-            Some(to_f_string_expression_element(expr))
+            Some(to_formatted_value_expr(expr))
        }
-        Expr::Call(_) if is_simple_call(expr) => Some(to_f_string_expression_element(expr)),
+        Expr::Call(_) if is_simple_call(expr) => Some(to_formatted_value_expr(expr)),
        _ => None,
    }
 }
--- a/crates/ruff_linter/src/rules/flynt/rules/static_join_to_fstring.rs
+++ b/crates/ruff_linter/src/rules/flynt/rules/static_join_to_fstring.rs
@@ -78,7 +78,7 @@ fn build_fstring(joiner: &str, joinees: &[Expr]) -> Option<Expr> {
        return Some(node.into());
    }

-    let mut f_string_elements = Vec::with_capacity(joinees.len() * 2);
+    let mut fstring_elems = Vec::with_capacity(joinees.len() * 2);
    let mut first = true;

    for expr in joinees {
@@ -88,13 +88,13 @@ fn build_fstring(joiner: &str, joinees: &[Expr]) -> Option<Expr> {
            return None;
        }
        if !std::mem::take(&mut first) {
-            f_string_elements.push(helpers::to_f_string_literal_element(joiner));
+            fstring_elems.push(helpers::to_constant_string(joiner));
        }
-        f_string_elements.push(helpers::to_f_string_element(expr)?);
+        fstring_elems.push(helpers::to_f_string_element(expr)?);
    }

    let node = ast::FString {
-        elements: f_string_elements,
+        values: fstring_elems,
        range: TextRange::default(),
    };
    Some(node.into())
@@ -127,7 +127,7 @@ pub(crate) fn static_join_to_fstring(checker: &mut Checker, expr: &Expr, joiner:
    };

    // Try to build the fstring (internally checks whether e.g. the elements are
-    // convertible to f-string elements).
+    // convertible to f-string parts).
    let Some(new_expr) = build_fstring(joiner, joinees) else {
        return;
    };
--- a/crates/ruff_linter/src/rules/isort/mod.rs
+++ b/crates/ruff_linter/src/rules/isort/mod.rs
@@ -200,7 +200,6 @@ fn format_import_block(
                    // Add a blank lines between direct and from imports.
                    if settings.from_first
                        && lines_between_types > 0
-                        && !settings.force_sort_within_sections
                        && line_insertion == Some(LineInsertion::Necessary)
                    {
                        for _ in 0..lines_between_types {
@@ -226,7 +225,6 @@ fn format_import_block(
                    // Add a blank lines between direct and from imports.
                    if !settings.from_first
                        && lines_between_types > 0
-                        && !settings.force_sort_within_sections
                        && line_insertion == Some(LineInsertion::Necessary)
                    {
                        for _ in 0..lines_between_types {
@@ -724,26 +722,6 @@ mod tests {
        Ok(())
    }

-    #[test_case(Path::new("force_sort_within_sections_lines_between.py"))]
-    fn force_sort_within_sections_lines_between(path: &Path) -> Result<()> {
-        let snapshot = format!("force_sort_within_sections_{}", path.to_string_lossy());
-        let mut diagnostics = test_path(
-            Path::new("isort").join(path).as_path(),
-            &LinterSettings {
-                isort: super::settings::Settings {
-                    force_sort_within_sections: true,
-                    lines_between_types: 2,
-                    ..super::settings::Settings::default()
-                },
-                src: vec![test_resource_path("fixtures/isort")],
-                ..LinterSettings::for_rule(Rule::UnsortedImports)
-            },
-        )?;
-        diagnostics.sort_by_key(Ranged::start);
-        assert_messages!(snapshot, diagnostics);
-        Ok(())
-    }
-
    #[test_case(Path::new("comment.py"))]
    #[test_case(Path::new("comments_and_newlines.py"))]
    #[test_case(Path::new("docstring.py"))]
--- a/crates/ruff_linter/src/rules/isort/snapshots/ruff_linterrulesisorttestsforce_sort_within_sections_force_sort_within_sections_lines_between.py.snap
+++ b/crates/ruff_linter/src/rules/isort/snapshots/ruff_linterrulesisorttestsforce_sort_within_sections_force_sort_within_sections_lines_between.py.snap
@@ -1,4 +0,0 @@
---
-source: crates/ruff_linter/src/rules/isort/mod.rs
---
-
--- a/crates/ruff_linter/src/rules/pep8_naming/helpers.rs
+++ b/crates/ruff_linter/src/rules/pep8_naming/helpers.rs
@@ -112,11 +112,7 @@ pub(super) fn is_django_model_import(name: &str, stmt: &Stmt, semantic: &Semanti
                    arguments.find_argument("model_name", arguments.args.len().saturating_sub(1))
                {
                    if let Some(string_literal) = argument.as_string_literal_expr() {
-                        if string_literal.value.to_str() == name {
-                            return true;
-                        }
-                    } else {
-                        return true;
+                        return string_literal.value.to_str() == name;
                    }
                }
            }
@@ -131,9 +127,7 @@ pub(super) fn is_django_model_import(name: &str, stmt: &Stmt, semantic: &Semanti
                if let Some(argument) = arguments.find_argument("dotted_path", 0) {
                    if let Some(string_literal) = argument.as_string_literal_expr() {
                        if let Some((.., model)) = string_literal.value.to_str().rsplit_once('.') {
-                            if model == name {
-                                return true;
-                            }
+                            return model == name;
                        }
                    }
                }
--- a/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linterrulespep8_namingtestsN806_N806.py.snap
+++ b/crates/ruff_linter/src/rules/pep8_naming/snapshots/ruff_linterrulespep8_namingtestsN806_N806.py.snap
@@ -52,15 +52,6 @@ N806.py:57:5: N806 Variable `Bad` in function should be lowercase
 56 |     Bad = apps.get_model()  # N806
 57 |     Bad = apps.get_model(model_name="Stream")  # N806
   |     ^^^ N806
-58 | 
-59 |     Address: Type = apps.get_model("zerver", variable)  # OK
-   |
-
-N806.py:60:5: N806 Variable `ValidationError` in function should be lowercase
-   |
-59 |     Address: Type = apps.get_model("zerver", variable)  # OK
-60 |     ValidationError = import_string(variable)  # N806
-   |     ^^^^^^^^^^^^^^^ N806
   |


--- a/crates/ruff_linter/src/rules/perflint/rules/unnecessary_list_cast.rs
+++ b/crates/ruff_linter/src/rules/perflint/rules/unnecessary_list_cast.rs
@@ -1,7 +1,7 @@
 use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::{self as ast, Arguments, Expr, Stmt};
-use ruff_python_semantic::analyze::typing::find_assigned_value;
+use ruff_python_ast::Stmt;
+use ruff_python_ast::{self as ast, Arguments, Expr};
 use ruff_text_size::TextRange;

 use crate::checkers::ast::Checker;
@@ -110,13 +110,30 @@ pub(crate) fn unnecessary_list_cast(checker: &mut Checker, iter: &Expr, body: &[
            if body.iter().any(|stmt| match_append(stmt, id)) {
                return;
            }
-            let Some(value) = find_assigned_value(id, checker.semantic()) else {
-                return;
-            };
-            if matches!(value, Expr::Tuple(_) | Expr::List(_) | Expr::Set(_)) {
-                let mut diagnostic = Diagnostic::new(UnnecessaryListCast, *list_range);
-                diagnostic.set_fix(remove_cast(*list_range, *iterable_range));
-                checker.diagnostics.push(diagnostic);
+            let scope = checker.semantic().current_scope();
+            if let Some(binding_id) = scope.get(id) {
+                let binding = checker.semantic().binding(binding_id);
+                if binding.kind.is_assignment() || binding.kind.is_named_expr_assignment() {
+                    if let Some(parent_id) = binding.source {
+                        let parent = checker.semantic().statement(parent_id);
+                        if let Stmt::Assign(ast::StmtAssign { value, .. })
+                        | Stmt::AnnAssign(ast::StmtAnnAssign {
+                            value: Some(value), ..
+                        })
+                        | Stmt::AugAssign(ast::StmtAugAssign { value, .. }) = parent
+                        {
+                            if matches!(
+                                value.as_ref(),
+                                Expr::Tuple(_) | Expr::List(_) | Expr::Set(_)
+                            ) {
+                                let mut diagnostic =
+                                    Diagnostic::new(UnnecessaryListCast, *list_range);
+                                diagnostic.set_fix(remove_cast(*list_range, *iterable_range));
+                                checker.diagnostics.push(diagnostic);
+                            }
+                        }
+                    }
+                }
            }
        }
        _ => {}
--- a/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linterrulesperflinttestsPERF101_PERF101.py.snap
+++ b/crates/ruff_linter/src/rules/perflint/snapshots/ruff_linterrulesperflinttestsPERF101_PERF101.py.snap
@@ -201,22 +201,4 @@ PERF101.py:57:10: PERF101 [*] Do not cast an iterable to `list` before iterating
 59 59 |     other_list.append(i + 1)
 60 60 | 

-PERF101.py:69:10: PERF101 [*] Do not cast an iterable to `list` before iterating over it
-   |
-67 | x, y, nested_tuple = (1, 2, (3, 4, 5))
-68 | 
-69 | for i in list(nested_tuple):  # PERF101
-   |          ^^^^^^^^^^^^^^^^^^ PERF101
-70 |     pass
-   |
-   = help: Remove `list()` cast
-
-ℹ Safe fix
-66 66 | 
-67 67 | x, y, nested_tuple = (1, 2, (3, 4, 5))
-68 68 | 
-69    |-for i in list(nested_tuple):  # PERF101
-   69 |+for i in nested_tuple:  # PERF101
-70 70 |     pass
-

--- a/crates/ruff_linter/src/rules/pycodestyle/mod.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/mod.rs
@@ -65,7 +65,6 @@ mod tests {
    }

    #[test_case(Rule::IsLiteral, Path::new("constant_literals.py"))]
-    #[test_case(Rule::ModuleImportNotAtTopOfFile, Path::new("E402.py"))]
    #[test_case(Rule::TypeComparison, Path::new("E721.py"))]
    fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
        let snapshot = format!(
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/imports.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/imports.rs
@@ -41,10 +41,6 @@ impl Violation for MultipleImportsOnOneLine {
 /// According to [PEP 8], "imports are always put at the top of the file, just after any
 /// module comments and docstrings, and before module globals and constants."
 ///
-/// In [preview], this rule makes an exception for `sys.path` modifications,
-/// allowing for `sys.path.insert`, `sys.path.append`, and similar
-/// modifications between import statements.
-///
 /// ## Example
 /// ```python
 /// "One string"
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/mod.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/mod.rs
@@ -381,16 +381,20 @@ impl Whitespace {
            }
        }

-        if len == content.text_len() {
-            // All whitespace up to the start of the line -> Indent
-            (Self::None, TextSize::default())
-        } else if has_tabs {
+        if has_tabs {
            (Self::Tab, len)
        } else {
            match count {
                0 => (Self::None, TextSize::default()),
                1 => (Self::Single, len),
-                _ => (Self::Many, len),
+                _ => {
+                    if len == content.text_len() {
+                        // All whitespace up to the start of the line -> Indent
+                        (Self::None, TextSize::default())
+                    } else {
+                        (Self::Many, len)
+                    }
+                }
            }
        }
    }
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_around_named_parameter_equals.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_around_named_parameter_equals.rs
@@ -1,4 +1,4 @@
-use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix};
+use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_parser::TokenKind;
 use ruff_text_size::{Ranged, TextRange, TextSize};
@@ -34,15 +34,11 @@ use crate::rules::pycodestyle::rules::logical_lines::{LogicalLine, LogicalLineTo
 #[violation]
 pub struct UnexpectedSpacesAroundKeywordParameterEquals;

-impl AlwaysFixableViolation for UnexpectedSpacesAroundKeywordParameterEquals {
+impl Violation for UnexpectedSpacesAroundKeywordParameterEquals {
    #[derive_message_formats]
    fn message(&self) -> String {
        format!("Unexpected spaces around keyword / parameter equals")
    }
-
-    fn fix_title(&self) -> String {
-        format!("Remove whitespace")
-    }
 }

 /// ## What it does
@@ -169,31 +165,22 @@ pub(crate) fn whitespace_around_named_parameter_equals(
                        }
                    }
                } else {
-                    // If there's space between the preceding token and the equals sign, report it.
                    if token.start() != prev_end {
-                        let mut diagnostic = Diagnostic::new(
+                        context.push(
                            UnexpectedSpacesAroundKeywordParameterEquals,
                            TextRange::new(prev_end, token.start()),
                        );
-                        diagnostic.set_fix(Fix::safe_edit(Edit::deletion(prev_end, token.start())));
-                        context.push_diagnostic(diagnostic);
                    }

-                    // If there's space between the equals sign and the following token, report it.
                    while let Some(next) = iter.peek() {
                        if next.kind() == TokenKind::NonLogicalNewline {
                            iter.next();
                        } else {
                            if next.start() != token.end() {
-                                let mut diagnostic = Diagnostic::new(
+                                context.push(
                                    UnexpectedSpacesAroundKeywordParameterEquals,
                                    TextRange::new(token.end(), next.start()),
                                );
-                                diagnostic.set_fix(Fix::safe_edit(Edit::deletion(
-                                    token.end(),
-                                    next.start(),
-                                )));
-                                context.push_diagnostic(diagnostic);
                            }
                            break;
                        }
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_before_comment.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/logical_lines/whitespace_before_comment.rs
@@ -1,4 +1,4 @@
-use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix};
+use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_parser::TokenKind;
 use ruff_python_trivia::PythonWhitespace;
@@ -66,15 +66,11 @@ impl AlwaysFixableViolation for TooFewSpacesBeforeInlineComment {
 #[violation]
 pub struct NoSpaceAfterInlineComment;

-impl AlwaysFixableViolation for NoSpaceAfterInlineComment {
+impl Violation for NoSpaceAfterInlineComment {
    #[derive_message_formats]
    fn message(&self) -> String {
        format!("Inline comment should start with `# `")
    }
-
-    fn fix_title(&self) -> String {
-        format!("Format space")
-    }
 }

 /// ## What it does
@@ -102,15 +98,11 @@ impl AlwaysFixableViolation for NoSpaceAfterInlineComment {
 #[violation]
 pub struct NoSpaceAfterBlockComment;

-impl AlwaysFixableViolation for NoSpaceAfterBlockComment {
+impl Violation for NoSpaceAfterBlockComment {
    #[derive_message_formats]
    fn message(&self) -> String {
        format!("Block comment should start with `# `")
    }
-
-    fn fix_title(&self) -> String {
-        format!("Format space")
-    }
 }

 /// ## What it does
@@ -138,15 +130,11 @@ impl AlwaysFixableViolation for NoSpaceAfterBlockComment {
 #[violation]
 pub struct MultipleLeadingHashesForBlockComment;

-impl AlwaysFixableViolation for MultipleLeadingHashesForBlockComment {
+impl Violation for MultipleLeadingHashesForBlockComment {
    #[derive_message_formats]
    fn message(&self) -> String {
        format!("Too many leading `#` before block comment")
    }
-
-    fn fix_title(&self) -> String {
-        format!("Remove leading `#`")
-    }
 }

 /// E261, E262, E265, E266
@@ -196,30 +184,14 @@ pub(crate) fn whitespace_before_comment(

            if is_inline_comment {
                if bad_prefix.is_some() || comment.chars().next().is_some_and(char::is_whitespace) {
-                    let mut diagnostic = Diagnostic::new(NoSpaceAfterInlineComment, range);
-                    diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
-                        format_leading_space(token_text),
-                        range,
-                    )));
-                    context.push_diagnostic(diagnostic);
+                    context.push(NoSpaceAfterInlineComment, range);
                }
            } else if let Some(bad_prefix) = bad_prefix {
                if bad_prefix != '!' || !line.is_start_of_file() {
                    if bad_prefix != '#' {
-                        let mut diagnostic = Diagnostic::new(NoSpaceAfterBlockComment, range);
-                        diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
-                            format_leading_space(token_text),
-                            range,
-                        )));
-                        context.push_diagnostic(diagnostic);
+                        context.push(NoSpaceAfterBlockComment, range);
                    } else if !comment.is_empty() {
-                        let mut diagnostic =
-                            Diagnostic::new(MultipleLeadingHashesForBlockComment, range);
-                        diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
-                            format_leading_hashes(token_text),
-                            range,
-                        )));
-                        context.push_diagnostic(diagnostic);
+                        context.push(MultipleLeadingHashesForBlockComment, range);
                    }
                }
            }
@@ -228,17 +200,3 @@ pub(crate) fn whitespace_before_comment(
        }
    }
 }
-
-/// Format a comment to have a single space after the `#`.
-fn format_leading_space(comment: &str) -> String {
-    if let Some(rest) = comment.strip_prefix("#:") {
-        format!("#: {}", rest.trim_start())
-    } else {
-        format!("# {}", comment.trim_start_matches('#').trim_start())
-    }
-}
-
-/// Format a comment to strip multiple leading `#` characters.
-fn format_leading_hashes(comment: &str) -> String {
-    format!("# {}", comment.trim_start_matches('#').trim_start())
-}
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsE251_E25.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsE251_E25.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/pycodestyle/mod.rs
 ---
-E25.py:2:12: E251 [*] Unexpected spaces around keyword / parameter equals
+E25.py:2:12: E251 Unexpected spaces around keyword / parameter equals
  |
 1 | #: E251 E251
 2 | def foo(bar = False):
@@ -9,17 +9,8 @@ E25.py:2:12: E251 [*] Unexpected spaces around keyword / parameter equals
 3 |     '''Test function with an error in declaration'''
 4 |     pass
  |
-  = help: Remove whitespace

-ℹ Safe fix
-1 1 | #: E251 E251
-2   |-def foo(bar = False):
-  2 |+def foo(bar= False):
-3 3 |     '''Test function with an error in declaration'''
-4 4 |     pass
-5 5 | #: E251
-
-E25.py:2:14: E251 [*] Unexpected spaces around keyword / parameter equals
+E25.py:2:14: E251 Unexpected spaces around keyword / parameter equals
  |
 1 | #: E251 E251
 2 | def foo(bar = False):
@@ -27,17 +18,8 @@ E25.py:2:14: E251 [*] Unexpected spaces around keyword / parameter equals
 3 |     '''Test function with an error in declaration'''
 4 |     pass
  |
-  = help: Remove whitespace

-ℹ Safe fix
-1 1 | #: E251 E251
-2   |-def foo(bar = False):
-  2 |+def foo(bar =False):
-3 3 |     '''Test function with an error in declaration'''
-4 4 |     pass
-5 5 | #: E251
-
-E25.py:6:9: E251 [*] Unexpected spaces around keyword / parameter equals
+E25.py:6:9: E251 Unexpected spaces around keyword / parameter equals
  |
 4 |     pass
 5 | #: E251
@@ -46,19 +28,8 @@ E25.py:6:9: E251 [*] Unexpected spaces around keyword / parameter equals
 7 | #: E251
 8 | foo(bar =True)
  |
-  = help: Remove whitespace

-ℹ Safe fix
-3 3 |     '''Test function with an error in declaration'''
-4 4 |     pass
-5 5 | #: E251
-6   |-foo(bar= True)
-  6 |+foo(bar=True)
-7 7 | #: E251
-8 8 | foo(bar =True)
-9 9 | #: E251 E251
-
-E25.py:8:8: E251 [*] Unexpected spaces around keyword / parameter equals
+E25.py:8:8: E251 Unexpected spaces around keyword / parameter equals
   |
 6 | foo(bar= True)
 7 | #: E251
@@ -67,19 +38,8 @@ E25.py:8:8: E251 [*] Unexpected spaces around keyword / parameter equals
 9 | #: E251 E251
 10 | foo(bar = True)
   |
-   = help: Remove whitespace

-ℹ Safe fix
-5 5 | #: E251
-6 6 | foo(bar= True)
-7 7 | #: E251
-8   |-foo(bar =True)
-  8 |+foo(bar=True)
-9 9 | #: E251 E251
-10 10 | foo(bar = True)
-11 11 | #: E251
-
-E25.py:10:8: E251 [*] Unexpected spaces around keyword / parameter equals
+E25.py:10:8: E251 Unexpected spaces around keyword / parameter equals
   |
 8 | foo(bar =True)
 9 | #: E251 E251
@@ -88,19 +48,8 @@ E25.py:10:8: E251 [*] Unexpected spaces around keyword / parameter equals
 11 | #: E251
 12 | y = bar(root= "sdasd")
   |
-   = help: Remove whitespace

-ℹ Safe fix
-7  7  | #: E251
-8  8  | foo(bar =True)
-9  9  | #: E251 E251
-10    |-foo(bar = True)
-   10 |+foo(bar= True)
-11 11 | #: E251
-12 12 | y = bar(root= "sdasd")
-13 13 | #: E251:2:29
-
-E25.py:10:10: E251 [*] Unexpected spaces around keyword / parameter equals
+E25.py:10:10: E251 Unexpected spaces around keyword / parameter equals
   |
 8 | foo(bar =True)
 9 | #: E251 E251
@@ -109,19 +58,8 @@ E25.py:10:10: E251 [*] Unexpected spaces around keyword / parameter equals
 11 | #: E251
 12 | y = bar(root= "sdasd")
   |
-   = help: Remove whitespace

-ℹ Safe fix
-7  7  | #: E251
-8  8  | foo(bar =True)
-9  9  | #: E251 E251
-10    |-foo(bar = True)
-   10 |+foo(bar =True)
-11 11 | #: E251
-12 12 | y = bar(root= "sdasd")
-13 13 | #: E251:2:29
-
-E25.py:12:14: E251 [*] Unexpected spaces around keyword / parameter equals
+E25.py:12:14: E251 Unexpected spaces around keyword / parameter equals
   |
 10 | foo(bar = True)
 11 | #: E251
@@ -130,19 +68,8 @@ E25.py:12:14: E251 [*] Unexpected spaces around keyword / parameter equals
 13 | #: E251:2:29
 14 | parser.add_argument('--long-option',
   |
-   = help: Remove whitespace

-ℹ Safe fix
-9  9  | #: E251 E251
-10 10 | foo(bar = True)
-11 11 | #: E251
-12    |-y = bar(root= "sdasd")
-   12 |+y = bar(root="sdasd")
-13 13 | #: E251:2:29
-14 14 | parser.add_argument('--long-option',
-15 15 |                     default=
-
-E25.py:15:29: E251 [*] Unexpected spaces around keyword / parameter equals
+E25.py:15:29: E251 Unexpected spaces around keyword / parameter equals
   |
 13 |   #: E251:2:29
 14 |   parser.add_argument('--long-option',
@@ -153,20 +80,8 @@ E25.py:15:29: E251 [*] Unexpected spaces around keyword / parameter equals
 17 |   #: E251:1:45
 18 |   parser.add_argument('--long-option', default
   |
-   = help: Remove whitespace

-ℹ Safe fix
-12 12 | y = bar(root= "sdasd")
-13 13 | #: E251:2:29
-14 14 | parser.add_argument('--long-option',
-15    |-                    default=
-16    |-                    "/rather/long/filesystem/path/here/blah/blah/blah")
-   15 |+                    default="/rather/long/filesystem/path/here/blah/blah/blah")
-17 16 | #: E251:1:45
-18 17 | parser.add_argument('--long-option', default
-19 18 |                     ="/rather/long/filesystem/path/here/blah/blah/blah")
-
-E25.py:18:45: E251 [*] Unexpected spaces around keyword / parameter equals
+E25.py:18:45: E251 Unexpected spaces around keyword / parameter equals
   |
 16 |                       "/rather/long/filesystem/path/here/blah/blah/blah")
 17 |   #: E251:1:45
@@ -177,20 +92,8 @@ E25.py:18:45: E251 [*] Unexpected spaces around keyword / parameter equals
 20 |   #: E251:3:8 E251:3:10
 21 |   foo(True,
   |
-   = help: Remove whitespace

-ℹ Safe fix
-15 15 |                     default=
-16 16 |                     "/rather/long/filesystem/path/here/blah/blah/blah")
-17 17 | #: E251:1:45
-18    |-parser.add_argument('--long-option', default
-19    |-                    ="/rather/long/filesystem/path/here/blah/blah/blah")
-   18 |+parser.add_argument('--long-option', default="/rather/long/filesystem/path/here/blah/blah/blah")
-20 19 | #: E251:3:8 E251:3:10
-21 20 | foo(True,
-22 21 |     baz=(1, 2),
-
-E25.py:23:8: E251 [*] Unexpected spaces around keyword / parameter equals
+E25.py:23:8: E251 Unexpected spaces around keyword / parameter equals
   |
 21 | foo(True,
 22 |     baz=(1, 2),
@@ -199,19 +102,8 @@ E25.py:23:8: E251 [*] Unexpected spaces around keyword / parameter equals
 24 |     )
 25 | #: Okay
   |
-   = help: Remove whitespace

-ℹ Safe fix
-20 20 | #: E251:3:8 E251:3:10
-21 21 | foo(True,
-22 22 |     baz=(1, 2),
-23    |-    biz = 'foo'
-   23 |+    biz= 'foo'
-24 24 |     )
-25 25 | #: Okay
-26 26 | foo(bar=(1 == 1))
-
-E25.py:23:10: E251 [*] Unexpected spaces around keyword / parameter equals
+E25.py:23:10: E251 Unexpected spaces around keyword / parameter equals
   |
 21 | foo(True,
 22 |     baz=(1, 2),
@@ -220,16 +112,5 @@ E25.py:23:10: E251 [*] Unexpected spaces around keyword / parameter equals
 24 |     )
 25 | #: Okay
   |
-   = help: Remove whitespace
-
-ℹ Safe fix
-20 20 | #: E251:3:8 E251:3:10
-21 21 | foo(True,
-22 22 |     baz=(1, 2),
-23    |-    biz = 'foo'
-   23 |+    biz ='foo'
-24 24 |     )
-25 25 | #: Okay
-26 26 | foo(bar=(1 == 1))


--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsE262_E26.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsE262_E26.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/pycodestyle/mod.rs
 ---
-E26.py:4:12: E262 [*] Inline comment should start with `# `
+E26.py:4:12: E262 Inline comment should start with `# `
  |
 2 | pass # an inline comment
 3 | #: E262:1:12
@@ -10,19 +10,8 @@ E26.py:4:12: E262 [*] Inline comment should start with `# `
 5 | #: E262:1:12
 6 | x = x + 1  #  Increment x
  |
-  = help: Format space

-ℹ Safe fix
-1 1 | #: E261:1:5
-2 2 | pass # an inline comment
-3 3 | #: E262:1:12
-4   |-x = x + 1  #Increment x
-  4 |+x = x + 1  # Increment x
-5 5 | #: E262:1:12
-6 6 | x = x + 1  #  Increment x
-7 7 | #: E262:1:12
-
-E26.py:6:12: E262 [*] Inline comment should start with `# `
+E26.py:6:12: E262 Inline comment should start with `# `
  |
 4 | x = x + 1  #Increment x
 5 | #: E262:1:12
@@ -31,19 +20,8 @@ E26.py:6:12: E262 [*] Inline comment should start with `# `
 7 | #: E262:1:12
 8 | x = y + 1  #:  Increment x
  |
-  = help: Format space

-ℹ Safe fix
-3 3 | #: E262:1:12
-4 4 | x = x + 1  #Increment x
-5 5 | #: E262:1:12
-6   |-x = x + 1  #  Increment x
-  6 |+x = x + 1  # Increment x
-7 7 | #: E262:1:12
-8 8 | x = y + 1  #:  Increment x
-9 9 | #: E265:1:1
-
-E26.py:8:12: E262 [*] Inline comment should start with `# `
+E26.py:8:12: E262 Inline comment should start with `# `
   |
 6 | x = x + 1  #  Increment x
 7 | #: E262:1:12
@@ -52,19 +30,8 @@ E26.py:8:12: E262 [*] Inline comment should start with `# `
 9 | #: E265:1:1
 10 | #Block comment
   |
-   = help: Format space

-ℹ Safe fix
-5 5 | #: E262:1:12
-6 6 | x = x + 1  #  Increment x
-7 7 | #: E262:1:12
-8   |-x = y + 1  #:  Increment x
-  8 |+x = y + 1  #: Increment x
-9 9 | #: E265:1:1
-10 10 | #Block comment
-11 11 | a = 1
-
-E26.py:63:9: E262 [*] Inline comment should start with `# `
+E26.py:63:9: E262 Inline comment should start with `# `
   |
 61 | # -*- coding: utf8 -*-
 62 | #  (One space one NBSP) Ok for block comment
@@ -73,19 +40,8 @@ E26.py:63:9: E262 [*] Inline comment should start with `# `
 64 | #: E262:2:9
 65 | #  (Two spaces) Ok for block comment
   |
-   = help: Format space

-ℹ Safe fix
-60 60 | #: E262:3:9
-61 61 | # -*- coding: utf8 -*-
-62 62 | #  (One space one NBSP) Ok for block comment
-63    |-a = 42  #  (One space one NBSP)
-   63 |+a = 42  # (One space one NBSP)
-64 64 | #: E262:2:9
-65 65 | #  (Two spaces) Ok for block comment
-66 66 | a = 42  #  (Two spaces)
-
-E26.py:66:9: E262 [*] Inline comment should start with `# `
+E26.py:66:9: E262 Inline comment should start with `# `
   |
 64 | #: E262:2:9
 65 | #  (Two spaces) Ok for block comment
@@ -94,52 +50,5 @@ E26.py:66:9: E262 [*] Inline comment should start with `# `
 67 | 
 68 | #: E265:5:1
   |
-   = help: Format space
-
-ℹ Safe fix
-63 63 | a = 42  #  (One space one NBSP)
-64 64 | #: E262:2:9
-65 65 | #  (Two spaces) Ok for block comment
-66    |-a = 42  #  (Two spaces)
-   66 |+a = 42  # (Two spaces)
-67 67 | 
-68 68 | #: E265:5:1
-69 69 | ### Means test is not done yet
-
-E26.py:84:8: E262 [*] Inline comment should start with `# `
-   |
-82 | ##  Foo
-83 | 
-84 | a = 1  ## Foo
-   |        ^^^^^^ E262
-85 | 
-86 | a = 1  #:Foo
-   |
-   = help: Format space
-
-ℹ Safe fix
-81 81 | #: E266:1:3
-82 82 | ##  Foo
-83 83 | 
-84    |-a = 1  ## Foo
-   84 |+a = 1  # Foo
-85 85 | 
-86 86 | a = 1  #:Foo
-
-E26.py:86:8: E262 [*] Inline comment should start with `# `
-   |
-84 | a = 1  ## Foo
-85 | 
-86 | a = 1  #:Foo
-   |        ^^^^^ E262
-   |
-   = help: Format space
-
-ℹ Safe fix
-83 83 | 
-84 84 | a = 1  ## Foo
-85 85 | 
-86    |-a = 1  #:Foo
-   86 |+a = 1  #: Foo


--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsE265_E26.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsE265_E26.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/pycodestyle/mod.rs
 ---
-E26.py:10:1: E265 [*] Block comment should start with `# `
+E26.py:10:1: E265 Block comment should start with `# `
   |
 8 | x = y + 1  #:  Increment x
 9 | #: E265:1:1
@@ -10,19 +10,8 @@ E26.py:10:1: E265 [*] Block comment should start with `# `
 11 | a = 1
 12 | #: E265:2:1
   |
-   = help: Format space

-ℹ Safe fix
-7  7  | #: E262:1:12
-8  8  | x = y + 1  #:  Increment x
-9  9  | #: E265:1:1
-10    |-#Block comment
-   10 |+# Block comment
-11 11 | a = 1
-12 12 | #: E265:2:1
-13 13 | m = 42
-
-E26.py:14:1: E265 [*] Block comment should start with `# `
+E26.py:14:1: E265 Block comment should start with `# `
   |
 12 | #: E265:2:1
 13 | m = 42
@@ -31,19 +20,8 @@ E26.py:14:1: E265 [*] Block comment should start with `# `
 15 | mx = 42 - 42
 16 | #: E266:3:5 E266:6:5
   |
-   = help: Format space

-ℹ Safe fix
-11 11 | a = 1
-12 12 | #: E265:2:1
-13 13 | m = 42
-14    |-#! This is important
-   14 |+# ! This is important
-15 15 | mx = 42 - 42
-16 16 | #: E266:3:5 E266:6:5
-17 17 | def how_it_feel(r):
-
-E26.py:25:1: E265 [*] Block comment should start with `# `
+E26.py:25:1: E265 Block comment should start with `# `
   |
 23 |     return
 24 | #: E265:1:1 E266:2:1
@@ -52,19 +30,8 @@ E26.py:25:1: E265 [*] Block comment should start with `# `
 26 | ##    logging.error()
 27 | #: W291:1:42
   |
-   = help: Format space

-ℹ Safe fix
-22 22 |     ### Of course it is unused
-23 23 |     return
-24 24 | #: E265:1:1 E266:2:1
-25    |-##if DEBUG:
-   25 |+# if DEBUG:
-26 26 | ##    logging.error()
-27 27 | #: W291:1:42
-28 28 | #########################################
-
-E26.py:32:1: E265 [*] Block comment should start with `# `
+E26.py:32:1: E265 Block comment should start with `# `
   |
 31 | #: Okay
 32 | #!/usr/bin/env python
@@ -72,19 +39,8 @@ E26.py:32:1: E265 [*] Block comment should start with `# `
 33 | 
 34 | pass  # an inline comment
   |
-   = help: Format space

-ℹ Safe fix
-29 29 | #:
-30 30 | 
-31 31 | #: Okay
-32    |-#!/usr/bin/env python
-   32 |+# !/usr/bin/env python
-33 33 | 
-34 34 | pass  # an inline comment
-35 35 | x = x + 1   # Increment x
-
-E26.py:73:1: E265 [*] Block comment should start with `# `
+E26.py:73:1: E265 Block comment should start with `# `
   |
 71 | # F   Means test is failing (F)
 72 | # EF  Means test is giving error and Failing
@@ -92,37 +48,5 @@ E26.py:73:1: E265 [*] Block comment should start with `# `
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ E265
 74 | # 8   Means test runs forever
   |
-   = help: Format space
-
-ℹ Safe fix
-70 70 | # E   Means test is giving error (E)
-71 71 | # F   Means test is failing (F)
-72 72 | # EF  Means test is giving error and Failing
-73    |-#!   Means test is segfaulting
-   73 |+# !   Means test is segfaulting
-74 74 | # 8   Means test runs forever
-75 75 | 
-76 76 | #: Colon prefix is okay
-
-E26.py:78:1: E265 [*] Block comment should start with `# `
-   |
-76 | #: Colon prefix is okay
-77 | 
-78 | ###This is a variable ###
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^ E265
-79 | 
-80 | # We should strip the space, but preserve the hashes.
-   |
-   = help: Format space
-
-ℹ Safe fix
-75 75 | 
-76 76 | #: Colon prefix is okay
-77 77 | 
-78    |-###This is a variable ###
-   78 |+# This is a variable ###
-79 79 | 
-80 80 | # We should strip the space, but preserve the hashes.
-81 81 | #: E266:1:3


--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsE266_E26.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsE266_E26.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/pycodestyle/mod.rs
 ---
-E26.py:19:5: E266 [*] Too many leading `#` before block comment
+E26.py:19:5: E266 Too many leading `#` before block comment
   |
 17 | def how_it_feel(r):
 18 | 
@@ -9,19 +9,8 @@ E26.py:19:5: E266 [*] Too many leading `#` before block comment
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^ E266
 20 |     a = 42
   |
-   = help: Remove leading `#`

-ℹ Safe fix
-16 16 | #: E266:3:5 E266:6:5
-17 17 | def how_it_feel(r):
-18 18 | 
-19    |-    ### This is a variable ###
-   19 |+    # This is a variable ###
-20 20 |     a = 42
-21 21 | 
-22 22 |     ### Of course it is unused
-
-E26.py:22:5: E266 [*] Too many leading `#` before block comment
+E26.py:22:5: E266 Too many leading `#` before block comment
   |
 20 |     a = 42
 21 | 
@@ -30,19 +19,8 @@ E26.py:22:5: E266 [*] Too many leading `#` before block comment
 23 |     return
 24 | #: E265:1:1 E266:2:1
   |
-   = help: Remove leading `#`

-ℹ Safe fix
-19 19 |     ### This is a variable ###
-20 20 |     a = 42
-21 21 | 
-22    |-    ### Of course it is unused
-   22 |+    # Of course it is unused
-23 23 |     return
-24 24 | #: E265:1:1 E266:2:1
-25 25 | ##if DEBUG:
-
-E26.py:26:1: E266 [*] Too many leading `#` before block comment
+E26.py:26:1: E266 Too many leading `#` before block comment
   |
 24 | #: E265:1:1 E266:2:1
 25 | ##if DEBUG:
@@ -51,19 +29,8 @@ E26.py:26:1: E266 [*] Too many leading `#` before block comment
 27 | #: W291:1:42
 28 | #########################################
   |
-   = help: Remove leading `#`

-ℹ Safe fix
-23 23 |     return
-24 24 | #: E265:1:1 E266:2:1
-25 25 | ##if DEBUG:
-26    |-##    logging.error()
-   26 |+# logging.error()
-27 27 | #: W291:1:42
-28 28 | #########################################
-29 29 | #:
-
-E26.py:69:1: E266 [*] Too many leading `#` before block comment
+E26.py:69:1: E266 Too many leading `#` before block comment
   |
 68 | #: E265:5:1
 69 | ### Means test is not done yet
@@ -71,37 +38,5 @@ E26.py:69:1: E266 [*] Too many leading `#` before block comment
 70 | # E   Means test is giving error (E)
 71 | # F   Means test is failing (F)
   |
-   = help: Remove leading `#`
-
-ℹ Safe fix
-66 66 | a = 42  #  (Two spaces)
-67 67 | 
-68 68 | #: E265:5:1
-69    |-### Means test is not done yet
-   69 |+# Means test is not done yet
-70 70 | # E   Means test is giving error (E)
-71 71 | # F   Means test is failing (F)
-72 72 | # EF  Means test is giving error and Failing
-
-E26.py:82:1: E266 [*] Too many leading `#` before block comment
-   |
-80 | # We should strip the space, but preserve the hashes.
-81 | #: E266:1:3
-82 | ##  Foo
-   | ^^^^^^^ E266
-83 | 
-84 | a = 1  ## Foo
-   |
-   = help: Remove leading `#`
-
-ℹ Safe fix
-79 79 | 
-80 80 | # We should strip the space, but preserve the hashes.
-81 81 | #: E266:1:3
-82    |-##  Foo
-   82 |+# Foo
-83 83 | 
-84 84 | a = 1  ## Foo
-85 85 | 


--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsE402_E402.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsE402_E402.py.snap
@@ -1,57 +1,27 @@
 ---
 source: crates/ruff_linter/src/rules/pycodestyle/mod.rs
 ---
-E402.py:25:1: E402 Module level import not at top of file
+E402.py:24:1: E402 Module level import not at top of file
   |
-23 | sys.path.insert(0, "some/path")
-24 | 
-25 | import f
-   | ^^^^^^^^ E402
-26 | 
-27 | import matplotlib
-   |
-
-E402.py:27:1: E402 Module level import not at top of file
-   |
-25 | import f
-26 | 
-27 | import matplotlib
-   | ^^^^^^^^^^^^^^^^^ E402
-28 | 
-29 | matplotlib.use("Agg")
-   |
-
-E402.py:31:1: E402 Module level import not at top of file
-   |
-29 | matplotlib.use("Agg")
-30 | 
-31 | import g
-   | ^^^^^^^^ E402
-32 | 
-33 | __some__magic = 1
-   |
-
-E402.py:35:1: E402 Module level import not at top of file
-   |
-33 | __some__magic = 1
-34 | 
-35 | import h
+22 | __some__magic = 1
+23 | 
+24 | import f
   | ^^^^^^^^ E402
   |

-E402.py:45:1: E402 Module level import not at top of file
+E402.py:34:1: E402 Module level import not at top of file
   |
-43 |     import j
-44 | 
-45 | import k; import l
+32 |     import g
+33 | 
+34 | import h; import i
   | ^^^^^^^^ E402
   |

-E402.py:45:11: E402 Module level import not at top of file
+E402.py:34:11: E402 Module level import not at top of file
   |
-43 |     import j
-44 | 
-45 | import k; import l
+32 |     import g
+33 | 
+34 | import h; import i
   |           ^^^^^^^^ E402
   |

--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestspreview__E402_E402.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestspreview__E402_E402.py.snap
@@ -1,28 +0,0 @@
---
-source: crates/ruff_linter/src/rules/pycodestyle/mod.rs
---
-E402.py:35:1: E402 Module level import not at top of file
-   |
-33 | __some__magic = 1
-34 | 
-35 | import h
-   | ^^^^^^^^ E402
-   |
-
-E402.py:45:1: E402 Module level import not at top of file
-   |
-43 |     import j
-44 | 
-45 | import k; import l
-   | ^^^^^^^^ E402
-   |
-
-E402.py:45:11: E402 Module level import not at top of file
-   |
-43 |     import j
-44 | 
-45 | import k; import l
-   |           ^^^^^^^^ E402
-   |
-
-
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsshebang.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsshebang.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/pycodestyle/mod.rs
 ---
-shebang.py:3:1: E265 [*] Block comment should start with `# `
+shebang.py:3:1: E265 Block comment should start with `# `
  |
 1 | #!/usr/bin/python
 2 | #
@@ -9,13 +9,5 @@ shebang.py:3:1: E265 [*] Block comment should start with `# `
  | ^^ E265
 4 | #:
  |
-  = help: Format space
-
-ℹ Safe fix
-1 1 | #!/usr/bin/python
-2 2 | #
-3   |-#!
-  3 |+# !
-4 4 | #:


--- a/crates/ruff_linter/src/rules/pyflakes/rules/f_string_missing_placeholders.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/f_string_missing_placeholders.rs
@@ -1,6 +1,6 @@
 use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast as ast;
+use ruff_python_ast::{self as ast, Expr};
 use ruff_source_file::Locator;
 use ruff_text_size::{Ranged, TextRange, TextSize};

@@ -47,12 +47,11 @@ impl AlwaysFixableViolation for FStringMissingPlaceholders {

 /// F541
 pub(crate) fn f_string_missing_placeholders(checker: &mut Checker, expr: &ast::ExprFString) {
-    if expr.value.f_strings().any(|f_string| {
-        f_string
-            .elements
-            .iter()
-            .any(ast::FStringElement::is_expression)
-    }) {
+    if expr
+        .value
+        .f_strings()
+        .any(|f_string| f_string.values.iter().any(Expr::is_formatted_value_expr))
+    {
        return;
    }

--- a/crates/ruff_linter/src/rules/pyflakes/rules/unused_variable.rs
+++ b/crates/ruff_linter/src/rules/pyflakes/rules/unused_variable.rs
@@ -247,14 +247,6 @@ fn remove_unused_variable(binding: &Binding, checker: &Checker) -> Option<Fix> {
                    Some(Fix::unsafe_edit(edit).isolate(isolation))
                };
            }
-        } else {
-            let name = binding.name(checker.locator());
-            let renamed = format!("_{name}");
-            if checker.settings.dummy_variable_rgx.is_match(&renamed) {
-                let edit = Edit::range_replacement(renamed, binding.range());
-
-                return Some(Fix::unsafe_edit(edit).isolate(isolation));
-            }
        }
    }

--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linterrulespyflakestestsF841_F841_0.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linterrulespyflakestestsF841_F841_0.py.snap
@@ -57,7 +57,7 @@ F841_0.py:20:5: F841 [*] Local variable `foo` is assigned to but never used
 22 21 | 
 23 22 |     bar = (1, 2)

-F841_0.py:21:6: F841 [*] Local variable `a` is assigned to but never used
+F841_0.py:21:6: F841 Local variable `a` is assigned to but never used
   |
 19 | def f():
 20 |     foo = (1, 2)
@@ -68,17 +68,7 @@ F841_0.py:21:6: F841 [*] Local variable `a` is assigned to but never used
   |
   = help: Remove assignment to unused variable `a`

-ℹ Unsafe fix
-18 18 | 
-19 19 | def f():
-20 20 |     foo = (1, 2)
-21    |-    (a, b) = (1, 2)
-   21 |+    (_a, b) = (1, 2)
-22 22 | 
-23 23 |     bar = (1, 2)
-24 24 |     (c, d) = bar
-
-F841_0.py:21:9: F841 [*] Local variable `b` is assigned to but never used
+F841_0.py:21:9: F841 Local variable `b` is assigned to but never used
   |
 19 | def f():
 20 |     foo = (1, 2)
@@ -89,16 +79,6 @@ F841_0.py:21:9: F841 [*] Local variable `b` is assigned to but never used
   |
   = help: Remove assignment to unused variable `b`

-ℹ Unsafe fix
-18 18 | 
-19 19 | def f():
-20 20 |     foo = (1, 2)
-21    |-    (a, b) = (1, 2)
-   21 |+    (a, _b) = (1, 2)
-22 22 | 
-23 23 |     bar = (1, 2)
-24 24 |     (c, d) = bar
-
 F841_0.py:26:14: F841 [*] Local variable `baz` is assigned to but never used
   |
 24 |     (c, d) = bar
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linterrulespyflakestestsF841_F841_1.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linterrulespyflakestestsF841_F841_1.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/pyflakes/mod.rs
 ---
-F841_1.py:6:5: F841 [*] Local variable `x` is assigned to but never used
+F841_1.py:6:5: F841 Local variable `x` is assigned to but never used
  |
 5 | def f():
 6 |     x, y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
@@ -9,17 +9,7 @@ F841_1.py:6:5: F841 [*] Local variable `x` is assigned to but never used
  |
  = help: Remove assignment to unused variable `x`

-ℹ Unsafe fix
-3 3 | 
-4 4 | 
-5 5 | def f():
-6   |-    x, y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
-  6 |+    _x, y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
-7 7 | 
-8 8 | 
-9 9 | def f():
-
-F841_1.py:6:8: F841 [*] Local variable `y` is assigned to but never used
+F841_1.py:6:8: F841 Local variable `y` is assigned to but never used
  |
 5 | def f():
 6 |     x, y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
@@ -27,16 +17,6 @@ F841_1.py:6:8: F841 [*] Local variable `y` is assigned to but never used
  |
  = help: Remove assignment to unused variable `y`

-ℹ Unsafe fix
-3 3 | 
-4 4 | 
-5 5 | def f():
-6   |-    x, y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
-  6 |+    x, _y = 1, 2  # this triggers F841 as it's just a simple assignment where unpacking isn't needed
-7 7 | 
-8 8 | 
-9 9 | def f():
-
 F841_1.py:16:14: F841 [*] Local variable `coords` is assigned to but never used
   |
 15 | def f():
@@ -73,7 +53,7 @@ F841_1.py:20:5: F841 [*] Local variable `coords` is assigned to but never used
 22 22 | 
 23 23 | def f():

-F841_1.py:24:6: F841 [*] Local variable `a` is assigned to but never used
+F841_1.py:24:6: F841 Local variable `a` is assigned to but never used
   |
 23 | def f():
 24 |     (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
@@ -81,14 +61,7 @@ F841_1.py:24:6: F841 [*] Local variable `a` is assigned to but never used
   |
   = help: Remove assignment to unused variable `a`

-ℹ Unsafe fix
-21 21 | 
-22 22 | 
-23 23 | def f():
-24    |-    (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
-   24 |+    (_a, b) = (x, y) = 1, 2  # this triggers F841 on everything
-
-F841_1.py:24:9: F841 [*] Local variable `b` is assigned to but never used
+F841_1.py:24:9: F841 Local variable `b` is assigned to but never used
   |
 23 | def f():
 24 |     (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
@@ -96,14 +69,7 @@ F841_1.py:24:9: F841 [*] Local variable `b` is assigned to but never used
   |
   = help: Remove assignment to unused variable `b`

-ℹ Unsafe fix
-21 21 | 
-22 22 | 
-23 23 | def f():
-24    |-    (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
-   24 |+    (a, _b) = (x, y) = 1, 2  # this triggers F841 on everything
-
-F841_1.py:24:15: F841 [*] Local variable `x` is assigned to but never used
+F841_1.py:24:15: F841 Local variable `x` is assigned to but never used
   |
 23 | def f():
 24 |     (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
@@ -111,14 +77,7 @@ F841_1.py:24:15: F841 [*] Local variable `x` is assigned to but never used
   |
   = help: Remove assignment to unused variable `x`

-ℹ Unsafe fix
-21 21 | 
-22 22 | 
-23 23 | def f():
-24    |-    (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
-   24 |+    (a, b) = (_x, y) = 1, 2  # this triggers F841 on everything
-
-F841_1.py:24:18: F841 [*] Local variable `y` is assigned to but never used
+F841_1.py:24:18: F841 Local variable `y` is assigned to but never used
   |
 23 | def f():
 24 |     (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
@@ -126,11 +85,4 @@ F841_1.py:24:18: F841 [*] Local variable `y` is assigned to but never used
   |
   = help: Remove assignment to unused variable `y`

-ℹ Unsafe fix
-21 21 | 
-22 22 | 
-23 23 | def f():
-24    |-    (a, b) = (x, y) = 1, 2  # this triggers F841 on everything
-   24 |+    (a, b) = (x, _y) = 1, 2  # this triggers F841 on everything
-

--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linterrulespyflakestestsF841_F841_3.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linterrulespyflakestestsF841_F841_3.py.snap
@@ -156,7 +156,7 @@ F841_3.py:27:46: F841 [*] Local variable `z3` is assigned to but never used
 29 29 | 
 30 30 | 

-F841_3.py:32:6: F841 [*] Local variable `x1` is assigned to but never used
+F841_3.py:32:6: F841 Local variable `x1` is assigned to but never used
   |
 31 | def f():
 32 |     (x1, y1) = (1, 2)
@@ -166,17 +166,7 @@ F841_3.py:32:6: F841 [*] Local variable `x1` is assigned to but never used
   |
   = help: Remove assignment to unused variable `x1`

-ℹ Unsafe fix
-29 29 | 
-30 30 | 
-31 31 | def f():
-32    |-    (x1, y1) = (1, 2)
-   32 |+    (_x1, y1) = (1, 2)
-33 33 |     (x2, y2) = coords2 = (1, 2)
-34 34 |     coords3 = (x3, y3) = (1, 2)
-35 35 | 
-
-F841_3.py:32:10: F841 [*] Local variable `y1` is assigned to but never used
+F841_3.py:32:10: F841 Local variable `y1` is assigned to but never used
   |
 31 | def f():
 32 |     (x1, y1) = (1, 2)
@@ -186,16 +176,6 @@ F841_3.py:32:10: F841 [*] Local variable `y1` is assigned to but never used
   |
   = help: Remove assignment to unused variable `y1`

-ℹ Unsafe fix
-29 29 | 
-30 30 | 
-31 31 | def f():
-32    |-    (x1, y1) = (1, 2)
-   32 |+    (x1, _y1) = (1, 2)
-33 33 |     (x2, y2) = coords2 = (1, 2)
-34 34 |     coords3 = (x3, y3) = (1, 2)
-35 35 | 
-
 F841_3.py:33:16: F841 [*] Local variable `coords2` is assigned to but never used
   |
 31 | def f():
--- a/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linterrulespyflakestestspreview__F841_F841_4.py.snap
+++ b/crates/ruff_linter/src/rules/pyflakes/snapshots/ruff_linterrulespyflakestestspreview__F841_F841_4.py.snap
@@ -20,7 +20,7 @@ F841_4.py:12:5: F841 [*] Local variable `a` is assigned to but never used
 14 14 | 
 15 15 | 

-F841_4.py:13:5: F841 [*] Local variable `b` is assigned to but never used
+F841_4.py:13:5: F841 Local variable `b` is assigned to but never used
   |
 11 | def bar():
 12 |     a = foo()
@@ -29,17 +29,7 @@ F841_4.py:13:5: F841 [*] Local variable `b` is assigned to but never used
   |
   = help: Remove assignment to unused variable `b`

-ℹ Unsafe fix
-10 10 | 
-11 11 | def bar():
-12 12 |     a = foo()
-13    |-    b, c = foo()
-   13 |+    _b, c = foo()
-14 14 | 
-15 15 | 
-16 16 | def baz():
-
-F841_4.py:13:8: F841 [*] Local variable `c` is assigned to but never used
+F841_4.py:13:8: F841 Local variable `c` is assigned to but never used
   |
 11 | def bar():
 12 |     a = foo()
@@ -48,14 +38,4 @@ F841_4.py:13:8: F841 [*] Local variable `c` is assigned to but never used
   |
   = help: Remove assignment to unused variable `c`

-ℹ Unsafe fix
-10 10 | 
-11 11 | def bar():
-12 12 |     a = foo()
-13    |-    b, c = foo()
-   13 |+    b, _c = foo()
-14 14 | 
-15 15 | 
-16 16 | def baz():
-

--- a/crates/ruff_linter/src/rules/pylint/rules/assert_on_string_literal.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/assert_on_string_literal.rs
@@ -70,28 +70,26 @@ pub(crate) fn assert_on_string_literal(checker: &mut Checker, test: &Expr) {
            ));
        }
        Expr::FString(ast::ExprFString { value, .. }) => {
-            let kind = if value.iter().all(|f_string_part| match f_string_part {
+            let kind = if value.parts().all(|f_string_part| match f_string_part {
                ast::FStringPart::Literal(literal) => literal.is_empty(),
-                ast::FStringPart::FString(f_string) => {
-                    f_string.elements.iter().all(|element| match element {
-                        ast::FStringElement::Literal(ast::FStringLiteralElement {
-                            value, ..
-                        }) => value.is_empty(),
-                        ast::FStringElement::Expression(_) => false,
-                    })
-                }
+                ast::FStringPart::FString(f_string) => f_string.values.iter().all(|value| {
+                    if let Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) = value {
+                        value.is_empty()
+                    } else {
+                        false
+                    }
+                }),
            }) {
                Kind::Empty
-            } else if value.iter().any(|f_string_part| match f_string_part {
+            } else if value.parts().any(|f_string_part| match f_string_part {
                ast::FStringPart::Literal(literal) => !literal.is_empty(),
-                ast::FStringPart::FString(f_string) => {
-                    f_string.elements.iter().any(|element| match element {
-                        ast::FStringElement::Literal(ast::FStringLiteralElement {
-                            value, ..
-                        }) => !value.is_empty(),
-                        ast::FStringElement::Expression(_) => false,
-                    })
-                }
+                ast::FStringPart::FString(f_string) => f_string.values.iter().any(|value| {
+                    if let Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) = value {
+                        !value.is_empty()
+                    } else {
+                        false
+                    }
+                }),
            }) {
                Kind::NonEmpty
            } else {
--- a/crates/ruff_linter/src/rules/pylint/rules/subprocess_run_without_check.rs
+++ b/crates/ruff_linter/src/rules/pylint/rules/subprocess_run_without_check.rs
@@ -1,10 +1,9 @@
-use ruff_diagnostics::{AlwaysFixableViolation, Applicability, Diagnostic, Fix};
+use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast as ast;
 use ruff_text_size::Ranged;

 use crate::checkers::ast::Checker;
-use crate::fix::edits::add_argument;

 /// ## What it does
 /// Checks for uses of `subprocess.run` without an explicit `check` argument.
@@ -37,25 +36,16 @@ use crate::fix::edits::add_argument;
 /// subprocess.run(["ls", "nonexistent"], check=False)  # Explicitly no check.
 /// ```
 ///
-/// ## Fix safety
-/// This rule's fix is marked as unsafe for function calls that contain
-/// `**kwargs`, as adding a `check` keyword argument to such a call may lead
-/// to a duplicate keyword argument error.
-///
 /// ## References
 /// - [Python documentation: `subprocess.run`](https://docs.python.org/3/library/subprocess.html#subprocess.run)
 #[violation]
 pub struct SubprocessRunWithoutCheck;

-impl AlwaysFixableViolation for SubprocessRunWithoutCheck {
+impl Violation for SubprocessRunWithoutCheck {
    #[derive_message_formats]
    fn message(&self) -> String {
        format!("`subprocess.run` without explicit `check` argument")
    }
-
-    fn fix_title(&self) -> String {
-        "Add explicit `check=False`".to_string()
-    }
 }

 /// PLW1510
@@ -66,27 +56,10 @@ pub(crate) fn subprocess_run_without_check(checker: &mut Checker, call: &ast::Ex
        .is_some_and(|call_path| matches!(call_path.as_slice(), ["subprocess", "run"]))
    {
        if call.arguments.find_keyword("check").is_none() {
-            let mut diagnostic = Diagnostic::new(SubprocessRunWithoutCheck, call.func.range());
-            diagnostic.set_fix(Fix::applicable_edit(
-                add_argument(
-                    "check=False",
-                    &call.arguments,
-                    checker.indexer().comment_ranges(),
-                    checker.locator().contents(),
-                ),
-                // If the function call contains `**kwargs`, mark the fix as unsafe.
-                if call
-                    .arguments
-                    .keywords
-                    .iter()
-                    .any(|keyword| keyword.arg.is_none())
-                {
-                    Applicability::Unsafe
-                } else {
-                    Applicability::Safe
-                },
+            checker.diagnostics.push(Diagnostic::new(
+                SubprocessRunWithoutCheck,
+                call.func.range(),
            ));
-            checker.diagnostics.push(diagnostic);
        }
    }
 }
--- a/Show More
+++ b/Show More