Revert "Special-case typing._SpecialForm"

This reverts commit 70e62b5444.
Special-case typing._SpecialForm
2026-01-06 14:44:48 -05:00 · 2026-01-06 14:44:32 -05:00 · 2026-01-06 14:44:32 -05:00 · 2026-01-06 17:24:51 +00:00 · 2026-01-06 12:09:40 -05:00 · 2026-01-06 16:50:16 +00:00
1009 changed files with 9877 additions and 5509 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -20,9 +20,11 @@
 # ty
 /crates/ty* @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager
 /crates/ruff_db/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_project/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_server/ @carljm @MichaReiser @sharkdp @dcreager
+/crates/ty_project/ @carljm @MichaReiser @sharkdp @dcreager @Gankra
+/crates/ty_ide/ @carljm @MichaReiser @sharkdp @dcreager @Gankra
+/crates/ty_server/ @carljm @MichaReiser @sharkdp @dcreager @Gankra
 /crates/ty/ @carljm @MichaReiser @sharkdp @dcreager
-/crates/ty_wasm/ @carljm @MichaReiser @sharkdp @dcreager
+/crates/ty_wasm/ @carljm @MichaReiser @sharkdp @dcreager @Gankra
 /scripts/ty_benchmark/ @carljm @MichaReiser @AlexWaygood @sharkdp @dcreager
-/crates/ty_python_semantic @carljm @AlexWaygood @sharkdp @dcreager
+/crates/ty_python_semantic/ @carljm @AlexWaygood @sharkdp @dcreager
+/crates/ty_module_resolver/ @carljm @MichaReiser @AlexWaygood Gankra
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -281,11 +281,11 @@ jobs:
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@b9c5db3aef04caffaf95a1d03931de10fb2a140f # v2.65.1
+        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@b9c5db3aef04caffaf95a1d03931de10fb2a140f # v2.65.1
+        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
        with:
          tool: cargo-insta
      - name: "Install uv"
@@ -343,7 +343,7 @@ jobs:
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@b9c5db3aef04caffaf95a1d03931de10fb2a140f # v2.65.1
+        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
        with:
          tool: cargo-nextest
      - name: "Install uv"
@@ -376,7 +376,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@b9c5db3aef04caffaf95a1d03931de10fb2a140f # v2.65.1
+        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
        with:
          tool: cargo-nextest
      - name: "Install uv"
@@ -468,7 +468,7 @@ jobs:
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
      - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@4a9028576ed64318f7b24193a62695e96dcbe015 # v1.16.5
+        uses: cargo-bins/cargo-binstall@80aaafe04903087c333980fa2686259ddd34b2d9 # v1.16.6
      - name: "Install cargo-fuzz"
        # Download the latest version from quick install and not the github releases because github releases only has MUSL targets.
        run: cargo binstall cargo-fuzz --force  --disable-strategies crate-meta-data --no-confirm
@@ -713,7 +713,7 @@ jobs:
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@4a9028576ed64318f7b24193a62695e96dcbe015 # v1.16.5
+      - uses: cargo-bins/cargo-binstall@80aaafe04903087c333980fa2686259ddd34b2d9 # v1.16.6
      - run: cargo binstall --no-confirm cargo-shear
      - run: cargo shear

@@ -972,7 +972,7 @@ jobs:
        run: rustup show

      - name: "Install codspeed"
-        uses: taiki-e/install-action@b9c5db3aef04caffaf95a1d03931de10fb2a140f # v2.65.1
+        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
        with:
          tool: cargo-codspeed

@@ -980,7 +980,7 @@ jobs:
        run: cargo codspeed build --features "codspeed,ruff_instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench formatter --bench lexer --bench linter --bench parser

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
+        uses: CodSpeedHQ/action@972e3437949c89e1357ebd1a2dbc852fcbc57245 # v4.5.1
        with:
          mode: simulation
          run: cargo codspeed run
@@ -1011,7 +1011,7 @@ jobs:
        run: rustup show

      - name: "Install codspeed"
-        uses: taiki-e/install-action@b9c5db3aef04caffaf95a1d03931de10fb2a140f # v2.65.1
+        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
        with:
          tool: cargo-codspeed

@@ -1047,7 +1047,7 @@ jobs:
      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6

      - name: "Install codspeed"
-        uses: taiki-e/install-action@b9c5db3aef04caffaf95a1d03931de10fb2a140f # v2.65.1
+        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
        with:
          tool: cargo-codspeed

@@ -1061,7 +1061,7 @@ jobs:
        run: chmod +x target/codspeed/simulation/ruff_benchmark/ty

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
+        uses: CodSpeedHQ/action@972e3437949c89e1357ebd1a2dbc852fcbc57245 # v4.5.1
        with:
          mode: simulation
          run: cargo codspeed run --bench ty "${{ matrix.benchmark }}"
@@ -1098,7 +1098,7 @@ jobs:
        run: rustup show

      - name: "Install codspeed"
-        uses: taiki-e/install-action@b9c5db3aef04caffaf95a1d03931de10fb2a140f # v2.65.1
+        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
        with:
          tool: cargo-codspeed

@@ -1136,7 +1136,7 @@ jobs:
      - uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6

      - name: "Install codspeed"
-        uses: taiki-e/install-action@b9c5db3aef04caffaf95a1d03931de10fb2a140f # v2.65.1
+        uses: taiki-e/install-action@28a9d316db64b78a951f3f8587a5d08cc97ad8eb # v2.65.6
        with:
          tool: cargo-codspeed

@@ -1150,7 +1150,7 @@ jobs:
        run: chmod +x target/codspeed/walltime/ruff_benchmark/ty_walltime

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
+        uses: CodSpeedHQ/action@972e3437949c89e1357ebd1a2dbc852fcbc57245 # v4.5.1
        env:
          # enabling walltime flamegraphs adds ~6 minutes to the CI time, and they don't
          # appear to provide much useful insight for our walltime benchmarks right now
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -32,13 +32,13 @@ repos:
      - id: validate-pyproject

  - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.22
+    rev: 1.0.0
    hooks:
      - id: mdformat
        language: python # means renovate will also update `additional_dependencies`
        additional_dependencies:
-          - mdformat-mkdocs==4.0.0
-          - mdformat-footnote==0.1.1
+          - mdformat-mkdocs==5.0.0
+          - mdformat-footnote==0.1.2
        exclude: |
          (?x)^(
            docs/formatter/black\.md
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -0,0 +1,70 @@
+# Ruff Repository
+
+This repository contains both Ruff (a Python linter and formatter) and ty (a Python type checker). The crates follow a naming convention: `ruff_*` for Ruff-specific code and `ty_*` for ty-specific code. ty reuses several Ruff crates, including the Python parser (`ruff_python_parser`) and AST definitions (`ruff_python_ast`).
+
+## Running Tests
+
+Run all tests (using `nextest` for faster execution):
+
+```sh
+cargo nextest run
+```
+
+For faster test execution, use the `fast-test` profile which enables optimizations while retaining debug info:
+
+```sh
+cargo nextest run --cargo-profile fast-test
+```
+
+Run tests for a specific crate:
+
+```sh
+cargo nextest run -p ty_python_semantic
+```
+
+Run a specific mdtest (use a substring of the test name):
+
+```sh
+MDTEST_TEST_FILTER="<filter>" cargo nextest run -p ty_python_semantic mdtest
+```
+
+Update snapshots after running tests:
+
+```sh
+cargo insta accept
+```
+
+## Running Clippy
+
+```sh
+cargo clippy --workspace --all-targets --all-features -- -D warnings
+```
+
+## Running Debug Builds
+
+Use debug builds (not `--release`) when developing, as release builds lack debug assertions and have slower compile times.
+
+Run Ruff:
+
+```sh
+cargo run --bin ruff -- check path/to/file.py
+```
+
+Run ty:
+
+```sh
+cargo run --bin ty -- check path/to/file.py
+```
+
+## Pull Requests
+
+When working on ty, PR titles should start with `[ty]` and be tagged with the `ty` GitHub label.
+
+## Development Guidelines
+
+- All changes must be tested. If you're not testing your changes, you're not done.
+- Get your tests to pass. If you didn't run the tests, your code does not work.
+- Follow existing code style. Check neighboring files for patterns.
+- Always run `uvx pre-commit run -a` at the end of a task.
+- Avoid writing significant amounts of new code. This is often a sign that we're missing an existing method or mechanism that could help solve the problem. Look for existing utilities first.
+- Avoid falling back to patterns that require `panic!`, `unreachable!`, or `.unwrap()`. Instead, try to encode those constraints in the type system.
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -146,9 +146,12 @@ dependencies = [

 [[package]]
 name = "arc-swap"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e"
+dependencies = [
+ "rustversion",
+]

 [[package]]
 name = "argfile"
@@ -1030,7 +1033,7 @@ dependencies = [
 "libc",
 "option-ext",
 "redox_users",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]

 [[package]]
@@ -1122,7 +1125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
 "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -1645,9 +1648,9 @@ dependencies = [

 [[package]]
 name = "insta"
-version = "1.45.0"
+version = "1.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b76866be74d68b1595eb8060cb9191dca9c021db2316558e52ddc5d55d41b66c"
+checksum = "983e3b24350c84ab8a65151f537d67afbbf7153bb9f1110e03e9fa9b07f67a5c"
 dependencies = [
 "console 0.15.11",
 "once_cell",
@@ -1778,9 +1781,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"

 [[package]]
 name = "jiff"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35"
+checksum = "a87d9b8105c23642f50cbbae03d1f75d8422c5cb98ce7ee9271f7ff7505be6b8"
 dependencies = [
 "jiff-static",
 "jiff-tzdb-platform",
@@ -1788,14 +1791,14 @@ dependencies = [
 "portable-atomic",
 "portable-atomic-util",
 "serde_core",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
 name = "jiff-static"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69"
+checksum = "b787bebb543f8969132630c51fd0afab173a86c6abae56ff3b9e5e3e3f9f6e58"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2057,9 +2060,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"

 [[package]]
 name = "matchit"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea5f97102eb9e54ab99fb70bb175589073f554bdadfb74d9bd656482ea73e2a"
+checksum = "b3eede3bdf92f3b4f9dc04072a9ce5ab557d5ec9038773bf9ffcd5588b3cc05b"

 [[package]]
 name = "memchr"
@@ -2631,9 +2634,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.103"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0"
 dependencies = [
 "unicode-ident",
 ]
@@ -3246,7 +3249,6 @@ name = "ruff_memory_usage"
 version = "0.0.0"
 dependencies = [
 "get-size2",
- "ordermap",
 ]

 [[package]]
@@ -3617,15 +3619,15 @@ checksum = "781442f29170c5c93b7185ad559492601acdc71d5bb0706f5868094f45cfcd08"

 [[package]]
 name = "rustix"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
 dependencies = [
 "bitflags 2.10.0",
 "errno",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -3692,9 +3694,9 @@ dependencies = [

 [[package]]
 name = "schemars"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289"
+checksum = "54e910108742c57a770f492731f99be216a52fadd361b06c8fb59d74ccc267d2"
 dependencies = [
 "dyn-clone",
 "ref-cast",
@@ -3705,9 +3707,9 @@ dependencies = [

 [[package]]
 name = "schemars_derive"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301858a4023d78debd2353c7426dc486001bddc91ae31a76fb1f55132f7e2633"
+checksum = "4908ad288c5035a8eb12cfdf0d49270def0a268ee162b75eeee0f85d155a7c45"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3781,15 +3783,15 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.146"
+version = "1.0.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "217ca874ae0207aac254aa02c957ded05585a90892cc8d87f9e5fa49669dadd8"
+checksum = "3084b546a1dd6289475996f182a22aba973866ea8e8b02c51d9f46b1336a22da"
 dependencies = [
 "itoa",
 "memchr",
- "ryu",
 "serde",
 "serde_core",
+ "zmij",
 ]

 [[package]]
@@ -4019,15 +4021,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"

 [[package]]
 name = "tempfile"
-version = "3.23.0"
+version = "3.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
+checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
 dependencies = [
 "fastrand",
 "getrandom 0.3.4",
 "once_cell",
 "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -5131,7 +5133,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -5523,6 +5525,12 @@ dependencies = [
 "zstd",
 ]

+[[package]]
+name = "zmij"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30e0d8dffbae3d840f64bda38e28391faef673a7b5a6017840f2a106c8145868"
+
 [[package]]
 name = "zstd"
 version = "0.11.2+zstd.1.5.2"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -93,6 +93,7 @@ get-size2 = { version = "0.7.3", features = [
    "smallvec",
    "hashbrown",
    "compact-str",
+    "ordermap"
 ] }
 getrandom = { version = "0.3.1" }
 glob = { version = "0.3.1" }
@@ -334,6 +335,11 @@ strip = false
 debug = "full"
 lto = false

+# Profile for faster iteration: applies minimal optimizations for faster tests.
+[profile.fast-test]
+inherits = "dev"
+opt-level = 1
+
 # The profile that 'cargo dist' will build with.
 [profile.dist]
 inherits = "release"
--- a/crates/ruff/src/commands/format.rs
+++ b/crates/ruff/src/commands/format.rs
@@ -1305,7 +1305,7 @@ mod tests {
        settings.add_filter(r"(Panicked at) [^:]+:\d+:\d+", "$1 <location>");
        let _s = settings.bind_to_scope();

-        assert_snapshot!(str::from_utf8(&buf)?, @r"
+        assert_snapshot!(str::from_utf8(&buf)?, @"
        io: test.py: Permission denied
        --> test.py:1:1

--- a/crates/ruff/src/commands/snapshots/ruffcommandschecktestE902_E902.py.snap
+++ b/crates/ruff/src/commands/snapshots/ruffcommandschecktestE902_E902.py.snap
@@ -4,4 +4,3 @@ source: crates/ruff/src/commands/check.rs
 /home/ferris/project/code.py:1:1: E902 Permission denied (os error 13)
 /home/ferris/project/notebook.ipynb:1:1: E902 Permission denied (os error 13)
 /home/ferris/project/pyproject.toml:1:1: E902 Permission denied (os error 13)
-
--- a/crates/ruff/src/snapshots/ruffversiontests__version_formatting.snap
+++ b/crates/ruff/src/snapshots/ruffversiontests__version_formatting.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/ruff/src/version.rs
 expression: version
-snapshot_kind: text
 ---
 0.0.0
--- a/crates/ruff/src/snapshots/ruffversiontests__version_formatting_with_commit_info.snap
+++ b/crates/ruff/src/snapshots/ruffversiontests__version_formatting_with_commit_info.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/ruff/src/version.rs
 expression: version
-snapshot_kind: text
 ---
 0.0.0 (53b0f5d92 2023-10-19)
--- a/crates/ruff/src/snapshots/ruffversiontests__version_formatting_with_commits_since_last_tag.snap
+++ b/crates/ruff/src/snapshots/ruffversiontests__version_formatting_with_commits_since_last_tag.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/ruff/src/version.rs
 expression: version
-snapshot_kind: text
 ---
 0.0.0+24 (53b0f5d92 2023-10-19)
--- a/crates/ruff/src/snapshots/ruffversiontests__version_serializable.snap
+++ b/crates/ruff/src/snapshots/ruffversiontests__version_serializable.snap
@@ -1,7 +1,6 @@
 ---
 source: crates/ruff/src/version.rs
 expression: version
-snapshot_kind: text
 ---
 {
  "version": "0.0.0",
--- a/crates/ruff/tests/analyze_graph.rs
+++ b/crates/ruff/tests/analyze_graph.rs
@@ -132,29 +132,29 @@ fn dependents() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().arg("--direction").arg("dependents").current_dir(&root), @r###"
-            success: true
-            exit_code: 0
-            ----- stdout -----
-            {
-              "ruff/__init__.py": [],
-              "ruff/a.py": [],
-              "ruff/b.py": [
-                "ruff/a.py"
-              ],
-              "ruff/c.py": [
-                "ruff/b.py"
-              ],
-              "ruff/d.py": [
-                "ruff/c.py"
-              ],
-              "ruff/e.py": [
-                "ruff/d.py"
-              ]
-            }
+        assert_cmd_snapshot!(command().arg("--direction").arg("dependents").current_dir(&root), @r#"
+        success: true
+        exit_code: 0
+        ----- stdout -----
+        {
+          "ruff/__init__.py": [],
+          "ruff/a.py": [],
+          "ruff/b.py": [
+            "ruff/a.py"
+          ],
+          "ruff/c.py": [
+            "ruff/b.py"
+          ],
+          "ruff/d.py": [
+            "ruff/c.py"
+          ],
+          "ruff/e.py": [
+            "ruff/d.py"
+          ]
+        }

-            ----- stderr -----
-            "###);
+        ----- stderr -----
+        "#);
    });

    Ok(())
@@ -184,21 +184,21 @@ fn string_detection() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r###"
-            success: true
-            exit_code: 0
-            ----- stdout -----
-            {
-              "ruff/__init__.py": [],
-              "ruff/a.py": [
-                "ruff/b.py"
-              ],
-              "ruff/b.py": [],
-              "ruff/c.py": []
-            }
+        assert_cmd_snapshot!(command().current_dir(&root), @r#"
+        success: true
+        exit_code: 0
+        ----- stdout -----
+        {
+          "ruff/__init__.py": [],
+          "ruff/a.py": [
+            "ruff/b.py"
+          ],
+          "ruff/b.py": [],
+          "ruff/c.py": []
+        }

-            ----- stderr -----
-            "###);
+        ----- stderr -----
+        "#);
    });

    insta::with_settings!({
@@ -319,7 +319,7 @@ fn globs() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r###"
+        assert_cmd_snapshot!(command().current_dir(&root), @r#"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -340,7 +340,7 @@ fn globs() -> Result<()> {
        }

        ----- stderr -----
-        "###);
+        "#);
    });

    Ok(())
@@ -368,7 +368,7 @@ fn exclude() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r###"
+        assert_cmd_snapshot!(command().current_dir(&root), @r#"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -381,7 +381,7 @@ fn exclude() -> Result<()> {
        }

        ----- stderr -----
-        "###);
+        "#);
    });

    Ok(())
@@ -421,7 +421,7 @@ fn wildcard() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r###"
+        assert_cmd_snapshot!(command().current_dir(&root), @r#"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -443,7 +443,7 @@ fn wildcard() -> Result<()> {
        }

        ----- stderr -----
-        "###);
+        "#);
    });

    Ok(())
@@ -639,7 +639,7 @@ fn venv() -> Result<()> {
    }, {
        assert_cmd_snapshot!(
            command().args(["--python", "none"]).arg("packages/albatross").current_dir(&root),
-            @r"
+            @"
        success: false
        exit_code: 2
        ----- stdout -----
@@ -695,7 +695,7 @@ fn notebook_basic() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r###"
+        assert_cmd_snapshot!(command().current_dir(&root), @r#"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -708,7 +708,7 @@ fn notebook_basic() -> Result<()> {
        }

        ----- stderr -----
-        "###);
+        "#);
    });

    Ok(())
@@ -765,7 +765,7 @@ fn notebook_with_magic() -> Result<()> {
    insta::with_settings!({
        filters => INSTA_FILTERS.to_vec(),
    }, {
-        assert_cmd_snapshot!(command().current_dir(&root), @r###"
+        assert_cmd_snapshot!(command().current_dir(&root), @r#"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -778,7 +778,7 @@ fn notebook_with_magic() -> Result<()> {
        }

        ----- stderr -----
-        "###);
+        "#);
    });

    Ok(())
--- a/crates/ruff/tests/cli/analyze_graph.rs
+++ b/crates/ruff/tests/cli/analyze_graph.rs
@@ -29,7 +29,7 @@ fn type_checking_imports() -> anyhow::Result<()> {
        ("ruff/c.py", ""),
    ])?;

-    assert_cmd_snapshot!(test.command(), @r###"
+    assert_cmd_snapshot!(test.command(), @r#"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -46,12 +46,12 @@ fn type_checking_imports() -> anyhow::Result<()> {
    }

    ----- stderr -----
-    "###);
+    "#);

    assert_cmd_snapshot!(
        test.command()
            .arg("--no-type-checking-imports"),
-        @r###"
+        @r#"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -65,7 +65,7 @@ fn type_checking_imports() -> anyhow::Result<()> {
    }

    ----- stderr -----
-    "###
+    "#
    );

    Ok(())
@@ -103,7 +103,7 @@ fn type_checking_imports_from_config() -> anyhow::Result<()> {
        ),
    ])?;

-    assert_cmd_snapshot!(test.command(), @r###"
+    assert_cmd_snapshot!(test.command(), @r#"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -117,7 +117,7 @@ fn type_checking_imports_from_config() -> anyhow::Result<()> {
    }

    ----- stderr -----
-    "###);
+    "#);

    test.write_file(
        "ruff.toml",
@@ -127,7 +127,7 @@ fn type_checking_imports_from_config() -> anyhow::Result<()> {
        "#,
    )?;

-    assert_cmd_snapshot!(test.command(), @r###"
+    assert_cmd_snapshot!(test.command(), @r#"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -144,7 +144,7 @@ fn type_checking_imports_from_config() -> anyhow::Result<()> {
    }

    ----- stderr -----
-    "###
+    "#
    );

    Ok(())
--- a/crates/ruff/tests/cli/format.rs
+++ b/crates/ruff/tests/cli/format.rs
@@ -51,7 +51,7 @@ fn default_files() -> Result<()> {

    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
-        .arg("--check"), @r"
+        .arg("--check"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -71,7 +71,7 @@ fn format_warn_stdin_filename_with_files() -> Result<()> {
    assert_cmd_snapshot!(test.format_command()
        .args(["--isolated", "--stdin-filename", "foo.py"])
        .arg("foo.py")
-        .pass_stdin("foo =     1"), @r"
+        .pass_stdin("foo =     1"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -87,7 +87,7 @@ fn format_warn_stdin_filename_with_files() -> Result<()> {
 fn nonexistent_config_file() -> Result<()> {
    let test = CliTest::new()?;
    assert_cmd_snapshot!(test.format_command()
-        .args(["--config", "foo.toml", "."]), @r"
+        .args(["--config", "foo.toml", "."]), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -111,7 +111,7 @@ fn nonexistent_config_file() -> Result<()> {
 fn config_override_rejected_if_invalid_toml() -> Result<()> {
    let test = CliTest::new()?;
    assert_cmd_snapshot!(test.format_command()
-        .args(["--config", "foo = bar", "."]), @r"
+        .args(["--config", "foo = bar", "."]), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -145,7 +145,7 @@ fn too_many_config_files() -> Result<()> {
        .arg("ruff.toml")
        .arg("--config")
        .arg("ruff2.toml")
-        .arg("."), @r"
+        .arg("."), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -168,7 +168,7 @@ fn config_file_and_isolated() -> Result<()> {
        .arg("--isolated")
        .arg("--config")
        .arg("ruff.toml")
-        .arg("."), @r"
+        .arg("."), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -390,7 +390,7 @@ fn mixed_line_endings() -> Result<()> {
    assert_cmd_snapshot!(test.format_command()
        .arg("--diff")
        .arg("--isolated")
-        .arg("."), @r"
+        .arg("."), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -446,7 +446,7 @@ OTHER = "OTHER"
        // Explicitly pass test.py, should be formatted regardless of it being excluded by format.exclude
        .arg("test.py")
        // Format all other files in the directory, should respect the `exclude` and `format.exclude` options
-        .arg("."), @r"
+        .arg("."), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -469,7 +469,7 @@ fn deduplicate_directory_and_explicit_file() -> Result<()> {
            .arg("--check")
            .arg(".")
            .arg("main.py"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -495,7 +495,7 @@ from module import =
    assert_cmd_snapshot!(test.format_command()
        .arg("--check")
        .arg("--isolated")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -522,7 +522,7 @@ if __name__ == "__main__":
    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
        .arg("--check")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -534,7 +534,7 @@ if __name__ == "__main__":

    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -545,7 +545,7 @@ if __name__ == "__main__":

    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -614,7 +614,7 @@ fn output_format_notebook() -> Result<()> {

    assert_cmd_snapshot!(
        test.format_command().args(["--isolated", "--preview", "--check"]).arg(path),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -672,7 +672,7 @@ if __name__ == "__main__":
    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
        .arg("--exit-non-zero-on-format")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -685,7 +685,7 @@ if __name__ == "__main__":
    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
        .arg("--exit-non-zero-on-format")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -701,7 +701,7 @@ if __name__ == "__main__":
    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
        .arg("--exit-non-zero-on-fix")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -714,7 +714,7 @@ if __name__ == "__main__":
    assert_cmd_snapshot!(test.format_command()
        .arg("--isolated")
        .arg("--exit-non-zero-on-fix")
-        .arg("main.py"), @r"
+        .arg("main.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -771,7 +771,7 @@ OTHER = "OTHER"
        // Explicitly pass test.py, should not be formatted because of --force-exclude
        .arg("test.py")
        // Format all other files in the directory, should respect the `exclude` and `format.exclude` options
-        .arg("."), @r"
+        .arg("."), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -931,7 +931,7 @@ tab-size = 2
            .pass_stdin(r"
 if True:
    pass
-    "), @r"
+    "), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1144,7 +1144,7 @@ def say_hy(name: str):
    assert_cmd_snapshot!(test.format_command()
        .arg("--config")
        .arg("ruff.toml")
-        .arg("test.py"), @r"
+        .arg("test.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1184,7 +1184,7 @@ def say_hy(name: str):
    assert_cmd_snapshot!(test.format_command()
        .arg("--config")
        .arg("ruff.toml")
-        .arg("test.py"), @r"
+        .arg("test.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1216,7 +1216,7 @@ def say_hy(name: str):
    assert_cmd_snapshot!(test.format_command()
        .arg("--config")
        .arg("ruff.toml")
-        .arg("test.py"), @r"
+        .arg("test.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1246,7 +1246,7 @@ fn test_diff() -> Result<()> {

    assert_cmd_snapshot!(
        test.format_command().args(["--isolated", "--diff"]).args(paths),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1311,7 +1311,7 @@ fn test_diff_no_change() -> Result<()> {
    let paths = [fixtures.join("unformatted.py")];
    assert_cmd_snapshot!(
        test.format_command().args(["--isolated", "--diff"]).args(paths),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1341,7 +1341,7 @@ fn test_diff_stdin_unformatted() -> Result<()> {
        test.format_command()
            .args(["--isolated", "--diff", "-", "--stdin-filename", "unformatted.py"])
            .pass_stdin(unformatted),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1366,7 +1366,7 @@ fn test_diff_stdin_formatted() -> Result<()> {
    let unformatted = fs::read(fixtures.join("formatted.py")).unwrap();
    assert_cmd_snapshot!(
        test.format_command().args(["--isolated", "--diff", "-"]).pass_stdin(unformatted),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1873,7 +1873,7 @@ include = ["*.ipy"]
    assert_cmd_snapshot!(test.format_command()
        .args(["--config", "ruff.toml"])
        .args(["--extension", "ipy:ipynb"])
-        .arg("."), @r"
+        .arg("."), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1938,7 +1938,7 @@ include = ["*.ipy"]
    assert_cmd_snapshot!(test.format_command()
        .args(["--config", "ruff.toml"])
        .args(["--extension", "ipy:ipynb"])
-        .arg("."), @r"
+        .arg("."), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2021,7 +2021,7 @@ def file2(arg1, arg2,):
    assert_cmd_snapshot!(test.format_command()
        .args(["--isolated", "--range=1:8-1:15"])
        .arg("file1.py")
-        .arg("file2.py"),  @r"
+        .arg("file2.py"),  @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2068,7 +2068,7 @@ fn range_start_larger_than_end() -> Result<()> {
 def foo(arg1, arg2,):
    print("Shouldn't format this" )

-"#), @r"
+"#), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2168,7 +2168,7 @@ fn range_missing_line() -> Result<()> {
 def foo(arg1, arg2,):
    print("Should format this" )

-"#), @r"
+"#), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2192,7 +2192,7 @@ fn zero_line_number() -> Result<()> {
 def foo(arg1, arg2,):
    print("Should format this" )

-"#), @r"
+"#), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2217,7 +2217,7 @@ fn column_and_line_zero() -> Result<()> {
 def foo(arg1, arg2,):
    print("Should format this" )

-"#), @r"
+"#), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2274,7 +2274,7 @@ fn range_formatting_notebook() -> Result<()> {
 "nbformat": 4,
 "nbformat_minor": 5
 }
-"#), @r"
+"#), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2355,7 +2355,7 @@ fn cookiecutter_globbing() -> Result<()> {
    ])?;

    assert_cmd_snapshot!(test.format_command()
-            .args(["--isolated", "--diff", "."]), @r"
+            .args(["--isolated", "--diff", "."]), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2374,7 +2374,7 @@ fn stable_output_format_warning() -> Result<()> {
        test.format_command()
            .args(["--output-format=full", "-"])
            .pass_stdin(""),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
--- a/crates/ruff/tests/cli/lint.rs
+++ b/crates/ruff/tests/cli/lint.rs
@@ -39,7 +39,7 @@ inline-quotes = "single"
            .arg("ruff.toml")
            .args(["--stdin-filename", "test.py"])
            .arg("-")
-            .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
+            .pass_stdin(r#"a = "abcba".strip("aba")"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -76,18 +76,18 @@ inline-quotes = "single"
            .arg("--config")
            .arg("ruff.toml")
            .arg("-")
-            .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        -:1:5: Q000 [*] Double quotes found but single quotes preferred
-        -:1:5: B005 Using `.strip()` with multi-character strings is misleading
-        -:1:19: Q000 [*] Double quotes found but single quotes preferred
-        Found 3 errors.
-        [*] 2 fixable with the `--fix` option.
+            .pass_stdin(r#"a = "abcba".strip("aba")"#), @"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:5: Q000 [*] Double quotes found but single quotes preferred
+    -:1:5: B005 Using `.strip()` with multi-character strings is misleading
+    -:1:19: Q000 [*] Double quotes found but single quotes preferred
+    Found 3 errors.
+    [*] 2 fixable with the `--fix` option.

-        ----- stderr -----
-        ");
+    ----- stderr -----
+    ");

    Ok(())
 }
@@ -110,7 +110,7 @@ inline-quotes = "single"
        .arg("--config")
        .arg("ruff.toml")
        .arg("-")
-        .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
+        .pass_stdin(r#"a = "abcba".strip("aba")"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -150,7 +150,7 @@ inline-quotes = "single"
        .arg("--config")
        .arg("ruff.toml")
        .arg("-")
-        .pass_stdin(r#"a = "abcba".strip("aba")"#), @r"
+        .pass_stdin(r#"a = "abcba".strip("aba")"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -220,7 +220,7 @@ OTHER = "OTHER"
            // Explicitly pass test.py, should be linted regardless of it being excluded by lint.exclude
            .arg("test.py")
            // Lint all other files in the directory, should respect the `exclude` and `lint.exclude` options
-            .arg("."), @r"
+            .arg("."), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -259,16 +259,16 @@ exclude = ["main.py"]
            .arg(".")
            // Explicitly pass main.py, should be linted regardless of it being excluded by lint.exclude
            .arg("main.py"),
-        @r"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        main.py:1:8: F401 [*] `os` imported but unused
-        Found 1 error.
-        [*] 1 fixable with the `--fix` option.
+        @"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    main.py:1:8: F401 [*] `os` imported but unused
+    Found 1 error.
+    [*] 1 fixable with the `--fix` option.

-        ----- stderr -----
-        "
+    ----- stderr -----
+    "
    );

    Ok(())
@@ -299,7 +299,7 @@ from test import say_hy

 if __name__ == "__main__":
    say_hy("dear Ruff contributor")
-"#), @r"
+"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -340,7 +340,7 @@ max-line-length = 100
 _ = "---------------------------------------------------------------------------亜亜亜亜亜亜"
 # longer than 100
 _ = "---------------------------------------------------------------------------亜亜亜亜亜亜亜亜亜亜亜亜亜亜"
-"#), @r"
+"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -381,7 +381,7 @@ from test import say_hy

 if __name__ == "__main__":
    say_hy("dear Ruff contributor")
-"#), @r"
+"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -422,7 +422,7 @@ from test import say_hy

 if __name__ == "__main__":
    say_hy("dear Ruff contributor")
-"#), @r"
+"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -461,7 +461,7 @@ ignore = ["D203", "D212"]
    assert_cmd_snapshot!(fixture
        .check_command()
        .current_dir(fixture.root().join("subdirectory"))
-        , @r"
+        , @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -478,7 +478,7 @@ ignore = ["D203", "D212"]
 fn nonexistent_config_file() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "foo.toml", "."]), @r"
+        .args(["--config", "foo.toml", "."]), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -501,7 +501,7 @@ fn nonexistent_config_file() {
 fn config_override_rejected_if_invalid_toml() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "foo = bar", "."]), @r"
+        .args(["--config", "foo = bar", "."]), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -537,7 +537,7 @@ fn too_many_config_files() -> Result<()> {
        .arg("ruff.toml")
        .arg("--config")
        .arg("ruff2.toml")
-        .arg("."), @r"
+        .arg("."), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -556,7 +556,7 @@ fn too_many_config_files() -> Result<()> {
 fn extend_passed_via_config_argument() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "extend = 'foo.toml'", "."]), @r"
+        .args(["--config", "extend = 'foo.toml'", "."]), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -588,17 +588,17 @@ extend = "ruff3.toml"
    )?;

    assert_cmd_snapshot!(fixture
-        .check_command(), @r"
-        success: false
-        exit_code: 2
-        ----- stdout -----
+        .check_command(), @"
+    success: false
+    exit_code: 2
+    ----- stdout -----

-        ----- stderr -----
-        ruff failed
-          Cause: Failed to load extended configuration `[TMP]/ruff3.toml` (`[TMP]/ruff.toml` extends `[TMP]/ruff2.toml` extends `[TMP]/ruff3.toml`)
-          Cause: Failed to read [TMP]/ruff3.toml
-          Cause: No such file or directory (os error 2)
-        ");
+    ----- stderr -----
+    ruff failed
+      Cause: Failed to load extended configuration `[TMP]/ruff3.toml` (`[TMP]/ruff.toml` extends `[TMP]/ruff2.toml` extends `[TMP]/ruff3.toml`)
+      Cause: Failed to read [TMP]/ruff3.toml
+      Cause: No such file or directory (os error 2)
+    ");

    Ok(())
 }
@@ -627,7 +627,7 @@ extend = "ruff.toml"

    assert_cmd_snapshot!(fixture
        .check_command(),
-        @r"
+        @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -659,7 +659,7 @@ select = [E501]

    assert_cmd_snapshot!(
        fixture.check_command(),
-        @r"
+        @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -688,7 +688,7 @@ fn config_file_and_isolated() -> Result<()> {
        .arg("--config")
        .arg("ruff.toml")
        .arg("--isolated")
-        .arg("."), @r"
+        .arg("."), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -742,7 +742,7 @@ x = "longer_than_90_charactersssssssssssssssssssssssssssssssssssssssssssssssssss
        .args(["--config", "lint.extend-select=['E501', 'F841']"])
        .args(["--config", "lint.isort.combine-as-imports = false"])
        .arg("-")
-        .pass_stdin(test_code), @r"
+        .pass_stdin(test_code), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -761,7 +761,7 @@ fn valid_toml_but_nonexistent_option_provided_via_config_argument() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
        .args([".", "--config", "extend-select=['F481']"]),  // No such code as F481!
-        @r"
+        @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -788,7 +788,7 @@ fn each_toml_option_requires_a_new_flag_1() {
        // commas can't be used to delimit different config overrides;
        // you need a new --config flag for each override
        .args([".", "--config", "extend-select=['F841'], line-length=90"]),
-        @r"
+        @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -819,7 +819,7 @@ fn each_toml_option_requires_a_new_flag_2() {
        // spaces *also* can't be used to delimit different config overrides;
        // you need a new --config flag for each override
        .args([".", "--config", "extend-select=['F841'] line-length=90"]),
-        @r"
+        @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -886,7 +886,7 @@ fn value_given_to_table_key_is_not_inline_table_2() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
        .args([".", "--config", r#"lint=123"#]),
-        @r"
+        @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -953,7 +953,7 @@ select=["E501"]
        .arg("ruff.toml")
        .args(["--config", "line-length=110"])
        .arg("-")
-        .pass_stdin(test_code), @r"
+        .pass_stdin(test_code), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -976,7 +976,7 @@ fn complex_config_setting_overridden_via_cli() -> Result<()> {
        .args(["--config", "lint.per-file-ignores = {'generated.py' = ['N801']}"])
        .args(["--stdin-filename", "generated.py"])
        .arg("-")
-        .pass_stdin(test_code), @r"
+        .pass_stdin(test_code), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -993,7 +993,7 @@ fn deprecated_config_option_overridden_via_cli() {
        .args(STDIN_BASE_OPTIONS)
        .args(["--config", "select=['N801']", "-"])
        .pass_stdin("class lowercase: ..."),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1061,7 +1061,7 @@ include = ["*.ipy"]
        .check_command()
        .args(["--config", "ruff.toml"])
        .args(["--extension", "ipy:ipynb"])
-        .arg("."), @r"
+        .arg("."), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1111,7 +1111,7 @@ external = ["AAA"]
        .pass_stdin(r#"
 # flake8: noqa: AAA101, BBB102
 import os
-"#), @r"
+"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1147,7 +1147,7 @@ required-version = "0.1.0"
        .arg("-")
        .pass_stdin(r#"
 import os
-"#), @r"
+"#), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1184,7 +1184,7 @@ required-version = "{version}"
        .arg("-")
        .pass_stdin(r#"
 import os
-"#), @r"
+"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1222,7 +1222,7 @@ required-version = ">{version}"
        .arg("-")
        .pass_stdin(r#"
 import os
-"#), @r"
+"#), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1252,7 +1252,7 @@ required-version = ">=0.1.0"
        .arg("-")
        .pass_stdin(r#"
 import os
-"#), @r"
+"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1289,7 +1289,7 @@ import os

 def func():
    x = 1
-"#), @r"
+"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1323,7 +1323,7 @@ fn negated_per_file_ignores() -> Result<()> {
        .arg("ruff.toml")
        .arg("--select")
        .arg("RUF901")
-        , @r"
+        , @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1355,7 +1355,7 @@ fn negated_per_file_ignores_absolute() -> Result<()> {
        .arg("ruff.toml")
        .arg("--select")
        .arg("RUF901")
-        , @r"
+        , @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1389,7 +1389,7 @@ fn negated_per_file_ignores_overlap() -> Result<()> {
        .arg("ruff.toml")
        .arg("--select")
        .arg("RUF901")
-        , @r"
+        , @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1423,7 +1423,7 @@ import os  # F401
 def function():
    import os  # F811
    print(os.name)
-"#), @r"
+"#), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1466,7 +1466,7 @@ import sys
        .check_command()
        .args(["--config", "ruff.toml"])
        .arg("noqa.py"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1482,7 +1482,7 @@ import sys
        .args(["--config", "ruff.toml"])
        .arg("noqa.py")
        .args(["--preview"]),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1497,7 +1497,7 @@ import sys
        .args(["--config", "ruff.toml"])
        .arg("noqa.py")
        .args(["--ignore-noqa", "--preview"]),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1539,7 +1539,7 @@ def first_square():
        .arg("-")
        .pass_stdin(r#"

-"#), @r"
+"#), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1551,7 +1551,8 @@ def first_square():
    let test_code =
        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");

-    insta::assert_snapshot!(test_code, @r"
+    insta::assert_snapshot!(test_code, @"
+
    def first_square():
        return [x * x for x in range(20)][0]  # noqa: RUF015
    ");
@@ -1587,7 +1588,7 @@ def unused(x):
        .arg("-")
        .pass_stdin(r#"

-"#), @r"
+"#), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1599,7 +1600,8 @@ def unused(x):
    let test_code =
        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");

-    insta::assert_snapshot!(test_code, @r"
+    insta::assert_snapshot!(test_code, @"
+
    def unused(x):  # noqa: ANN001, ANN201, D103
        pass
    ");
@@ -1635,7 +1637,7 @@ import a
        .arg("-")
        .pass_stdin(r#"

-"#), @r"
+"#), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1647,7 +1649,8 @@ import a
    let test_code =
        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");

-    insta::assert_snapshot!(test_code, @r"
+    insta::assert_snapshot!(test_code, @"
+
    import z  # noqa: I001
    import c
    import a
@@ -1684,7 +1687,7 @@ def unused(x):  # noqa: ANN001, ARG001, D103
        .arg("-")
        .pass_stdin(r#"

-"#), @r"
+"#), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1696,7 +1699,8 @@ def unused(x):  # noqa: ANN001, ARG001, D103
    let test_code =
        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");

-    insta::assert_snapshot!(test_code, @r"
+    insta::assert_snapshot!(test_code, @"
+
    def unused(x):  # noqa: ANN001, ANN201, ARG001, D103
        pass
    ");
@@ -1732,7 +1736,7 @@ import os
        .arg("-")
        .pass_stdin(r#"

-"#), @r"
+"#), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1743,7 +1747,8 @@ import os
    let test_code =
        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");

-    insta::assert_snapshot!(test_code, @r"
+    insta::assert_snapshot!(test_code, @"
+
    # ruff: noqa F401
    import os
    ");
@@ -1779,7 +1784,7 @@ import os
        .arg("-")
        .pass_stdin(r#"

-"#), @r"
+"#), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1790,7 +1795,8 @@ import os
    let test_code =
        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");

-    insta::assert_snapshot!(test_code, @r"
+    insta::assert_snapshot!(test_code, @"
+
    # ruff: disable[F401]
    import os
    ");
@@ -1831,7 +1837,7 @@ print(
        .arg("-")
        .pass_stdin(r#"

-"#), @r"
+"#), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1844,6 +1850,7 @@ print(
        fs::read_to_string(fixture.root().join("noqa.py")).expect("should read test file");

    insta::assert_snapshot!(test_code, @r#"
+
    print(
        """First line
        second line
@@ -1886,7 +1893,7 @@ def first_square():

    assert_cmd_snapshot!(fixture
        .check_command()
-        .args(["--add-noqa"]), @r"
+        .args(["--add-noqa"]), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1915,7 +1922,7 @@ from foo import (  # noqa: F401
        .check_command()
        .arg("--add-noqa")
        .arg("--select=F401")
-        .arg("noqa.py"), @r"
+        .arg("noqa.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1942,7 +1949,7 @@ def foo():
        .check_command()
        .arg("--add-noqa=TODO: fix")
        .arg("--select=F401,F841")
-        .arg("test.py"), @r"
+        .arg("test.py"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1952,12 +1959,12 @@ def foo():
    ");

    let content = fs::read_to_string(fixture.root().join("test.py"))?;
-    insta::assert_snapshot!(content, @r"
-import os  # noqa: F401 TODO: fix
+    insta::assert_snapshot!(content, @"
+    import os  # noqa: F401 TODO: fix

-def foo():
-    x = 1  # noqa: F841 TODO: fix
-");
+    def foo():
+        x = 1  # noqa: F841 TODO: fix
+    ");

    Ok(())
 }
@@ -1971,7 +1978,7 @@ fn add_noqa_with_newline_in_reason() -> Result<()> {
        .check_command()
        .arg("--add-noqa=line1\nline2")
        .arg("--select=F401")
-        .arg("test.py"), @r###"
+        .arg("test.py"), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1979,7 +1986,7 @@ fn add_noqa_with_newline_in_reason() -> Result<()> {
    ----- stderr -----
    ruff failed
      Cause: --add-noqa <reason> cannot contain newline characters
-    "###);
+    ");

    Ok(())
 }
@@ -2003,7 +2010,7 @@ select = ["UP006"]
        .arg("pyproject.toml")
        .args(["--stdin-filename", "test.py"])
        .arg("-")
-        .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
+        .pass_stdin(r#"from typing import List; foo: List[int]"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2030,7 +2037,7 @@ select = ["UP006"]
        .arg("pyproject.toml")
        .args(["--stdin-filename", "test.py"])
        .arg("-")
-        .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
+        .pass_stdin(r#"from typing import List; foo: List[int]"#), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2061,7 +2068,7 @@ select = ["UP006"]
        .arg("pyproject.toml")
        .args(["--stdin-filename", "test.py"])
        .arg("-")
-        .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
+        .pass_stdin(r#"from typing import List; foo: List[int]"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2094,7 +2101,7 @@ select = ["UP006"]
        .arg("pyproject.toml")
        .args(["--stdin-filename", "test.py"])
        .arg("-")
-        .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
+        .pass_stdin(r#"from typing import List; foo: List[int]"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2127,7 +2134,7 @@ select = ["UP006"]
        .arg("pyproject.toml")
        .args(["--stdin-filename", "test.py"])
        .arg("-")
-        .pass_stdin(r#"from typing import List; foo: List[int]"#), @r"
+        .pass_stdin(r#"from typing import List; foo: List[int]"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2263,7 +2270,7 @@ requires-python = ">= 3.11"
        .check_command()
        .args(["--select","UP007"])
        .arg(".")
-        , @r###"
+        , @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2272,7 +2279,7 @@ requires-python = ">= 3.11"
    [*] 1 fixable with the `--fix` option.

    ----- stderr -----
-    "###);
+    ");
    Ok(())
 }

@@ -2348,7 +2355,7 @@ from typing import Union;foo: Union[int, str] = 1"#,
    assert_cmd_snapshot!(fixture
        .check_command()
        .arg("test.py")
-        , @r"
+        , @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2591,7 +2598,7 @@ fn checks_notebooks_in_stable() -> anyhow::Result<()> {
        .check_command()
        .arg("--select")
        .arg("F401")
-        , @r"
+        , @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2619,7 +2626,7 @@ fn nested_implicit_namespace_package() -> Result<()> {
        .check_command()
        .arg("--select")
        .arg("INP")
-        , @r"
+        , @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2633,7 +2640,7 @@ fn nested_implicit_namespace_package() -> Result<()> {
        .arg("--select")
        .arg("INP")
        .arg("--preview")
-        , @r"
+        , @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2764,7 +2771,7 @@ fn flake8_import_convention_nfkc_normalization() -> Result<()> {
        .arg("ruff.toml")
        .arg("-")
        .pass_stdin("")
-        , @r###"
+        , @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -2772,7 +2779,7 @@ fn flake8_import_convention_nfkc_normalization() -> Result<()> {
    ----- stderr -----
    ruff failed
      Cause: Invalid alias for module 'test.module': alias normalizes to '__debug__', which is not allowed.
-    "###);
+    ");
    Ok(())
 }

@@ -2822,7 +2829,7 @@ fn pyupgrade_up026_respects_isort_required_import_fix() {
            .arg("--fix")
            .arg("--no-cache")
            .pass_stdin("1\n"),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2849,7 +2856,7 @@ fn pyupgrade_up026_respects_isort_required_import_from_fix() {
            .arg("--fix")
            .arg("--no-cache")
            .pass_stdin("from mock import mock\n"),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2883,7 +2890,7 @@ d: Literal[None,] | Literal[None]
        .arg("--preview")
        .arg("--diff")
        .arg("-")
-        .pass_stdin(snippet), @r"
+        .pass_stdin(snippet), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2937,7 +2944,7 @@ def func(t: _T) -> _T:
    return x
 "#
        ),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2976,7 +2983,7 @@ class Foo[_T, __T]:
    pass
 "#
        ),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3041,7 +3048,7 @@ fn a005_module_shadowing_strict() -> Result<()> {
        .arg("--config")
        .arg(r#"lint.flake8-builtins.strict-checking = true"#)
        .args(["--select", "A005"]),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3069,7 +3076,7 @@ fn a005_module_shadowing_non_strict() -> Result<()> {
        .arg("--config")
        .arg(r#"lint.flake8-builtins.strict-checking = false"#)
        .args(["--select", "A005"]),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3094,7 +3101,7 @@ fn a005_module_shadowing_strict_default() -> Result<()> {

    assert_cmd_snapshot!(fixture.check_command()
        .args(["--select", "A005"]),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3127,7 +3134,7 @@ T = TypeVar("T")
 class A(Generic[T]):
    var: T
 "#),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3157,7 +3164,7 @@ T = TypeVar("T")
 class A(Generic[T]):
    var: T
 "#),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -3177,7 +3184,7 @@ fn walrus_before_py38() {
        .arg("--target-version=py38")
        .arg("-")
        .pass_stdin(r#"(x := 1)"#),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -3195,7 +3202,7 @@ fn walrus_before_py38() {
        .arg("--preview")
        .arg("-")
        .pass_stdin(r#"(x := 1)"#),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3222,7 +3229,7 @@ match 2:
        print("it's one")
 "#
        ),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -3245,7 +3252,7 @@ match 2:
        print("it's one")
 "#
        ),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3270,7 +3277,7 @@ match 2:
        print("it's one")
 "#
        ),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3296,7 +3303,7 @@ fn cache_syntax_errors() -> Result<()> {

    assert_cmd_snapshot!(
        cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3309,7 +3316,7 @@ fn cache_syntax_errors() -> Result<()> {
    // this should *not* be cached, like normal parse errors
    assert_cmd_snapshot!(
        cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3345,14 +3352,14 @@ fn cookiecutter_globbing() -> Result<()> {

    assert_cmd_snapshot!(fixture
        .check_command()
-        .arg("--select=F811"), @r"
-		success: true
-		exit_code: 0
-		----- stdout -----
-		All checks passed!
+        .arg("--select=F811"), @"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    All checks passed!

-		----- stderr -----
-		");
+    ----- stderr -----
+    ");

    // after removing the config file with the ignore, F811 applies, so the glob worked above
    fs::remove_file(
@@ -3363,7 +3370,7 @@ fn cookiecutter_globbing() -> Result<()> {

    assert_cmd_snapshot!(fixture
        .check_command()
-        .arg("--select=F811"), @r"
+        .arg("--select=F811"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3388,15 +3395,15 @@ fn cookiecutter_globbing_no_project_root() -> Result<()> {
    assert_cmd_snapshot!(fixture
        .check_command()
        .current_dir(fixture.root().join("{{cookiecutter.repo_name}}"))
-        .args(["--extend-per-file-ignores", "generated.py:Q"]), @r"
-	success: true
-	exit_code: 0
-	----- stdout -----
-	All checks passed!
+        .args(["--extend-per-file-ignores", "generated.py:Q"]), @"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    All checks passed!

-	----- stderr -----
-	warning: No Python files found under the given path(s)
-	");
+    ----- stderr -----
+    warning: No Python files found under the given path(s)
+    ");

    Ok(())
 }
@@ -3417,7 +3424,7 @@ fn semantic_syntax_errors() -> Result<()> {

    assert_cmd_snapshot!(
        cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3431,7 +3438,7 @@ fn semantic_syntax_errors() -> Result<()> {
    // this should *not* be cached, like normal parse errors
    assert_cmd_snapshot!(
        cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3449,7 +3456,7 @@ fn semantic_syntax_errors() -> Result<()> {
            .arg("--preview")
            .arg("-")
            .pass_stdin(contents),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3483,7 +3490,7 @@ class Foo:
            .arg("--target-version=py39")
            .arg("-")
            .pass_stdin(contents),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -3581,7 +3588,7 @@ nested_optional: Optional[Optional[Optional[str]]] = None
            .args(["--select", "UP045", "--diff", "--target-version", "py312"])
            .arg("-")
            .pass_stdin(contents),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3606,7 +3613,7 @@ fn show_fixes_in_full_output_with_preview_enabled() {
            .arg("--preview")
            .arg("-")
            .pass_stdin("import math"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3637,7 +3644,7 @@ fn rule_panic_mixed_results_concise() -> Result<()> {
        fixture.check_command()
            .args(["--select", "RUF9", "--preview"])
            .args(["normal.py", "panic.py"]),
-        @r"
+        @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -3672,7 +3679,7 @@ fn rule_panic_mixed_results_full() -> Result<()> {
        fixture.command()
            .args(["check", "--select", "RUF9", "--preview", "--output-format=full", "--no-cache"])
            .args(["normal.py", "panic.py"]),
-        @r"
+        @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -3781,7 +3788,7 @@ fn supported_file_extensions() -> Result<()> {
        fixture.check_command()
            .args(["--select", "F401"])
            .arg("src"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -3861,7 +3868,7 @@ fn supported_file_extensions_preview_enabled() -> Result<()> {
        fixture.check_command()
            .args(["--select", "F401", "--preview"])
            .arg("src"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
--- a/crates/ruff/tests/cli/snapshots/clilintflake8_import_convention_unused_aliased_import.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintflake8_import_convention_unused_aliased_import.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
@@ -17,7 +17,6 @@ info:
    - "--fix"
    - "-"
  stdin: "1"
-snapshot_kind: text
 ---
 success: false
 exit_code: 2
--- a/crates/ruff/tests/cli/snapshots/clilintflake8_import_convention_unused_aliased_import_no_conflict.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintflake8_import_convention_unused_aliased_import_no_conflict.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_azure.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_azure.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_concise.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_concise.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_full.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_full.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_github.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_github.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_gitlab.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_gitlab.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_grouped.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_grouped.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_json-lines.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_json-lines.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_json.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_json.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_junit.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_junit.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_pylint.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_pylint.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_rdjson.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_rdjson.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_sarif.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_sarif.snap
@@ -12,7 +12,6 @@ info:
    - "--target-version"
    - py39
    - input.py
-snapshot_kind: text
 ---
 success: false
 exit_code: 1
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_concise.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_concise.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_full.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_full.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_grouped.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintoutput_format_show_fixes_grouped.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/cli/snapshots/clilintwarn_invalid_noqa_with_no_diagnostics.snap
+++ b/crates/ruff/tests/cli/snapshots/clilintwarn_invalid_noqa_with_no_diagnostics.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/tests/lint.rs
+source: crates/ruff/tests/cli/lint.rs
 info:
  program: ruff
  args:
--- a/crates/ruff/tests/direxist_guard.rs
+++ b/crates/ruff/tests/direxist_guard.rs
@@ -18,13 +18,13 @@ fn check_in_deleted_directory_errors() {
    set_current_dir(&temp_path).unwrap();
    drop(temp_dir);

-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME)).arg("check"), @r###"
-            success: false
-            exit_code: 2
-            ----- stdout -----
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME)).arg("check"), @"
+    success: false
+    exit_code: 2
+    ----- stdout -----

-            ----- stderr -----
-            ruff failed
-              Cause: Working directory does not exist
-            "###);
+    ----- stderr -----
+    ruff failed
+      Cause: Working directory does not exist
+    ");
 }
--- a/crates/ruff/tests/integration_test.rs
+++ b/crates/ruff/tests/integration_test.rs
@@ -97,7 +97,7 @@ impl<'a> RuffCheck<'a> {
 fn stdin_success() {
    let mut cmd = RuffCheck::default().args([]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin(""), @r"
+        .pass_stdin(""), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -111,7 +111,7 @@ fn stdin_success() {
 fn stdin_error() {
    let mut cmd = RuffCheck::default().args([]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @r"
+        .pass_stdin("import os\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -136,7 +136,7 @@ fn stdin_filename() {
        .args(["--stdin-filename", "F401.py"])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @r"
+        .pass_stdin("import os\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -172,7 +172,7 @@ import bar   # unused import
    )?;

    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--isolated", "--no-cache", "--select", "F401"]).current_dir(tempdir.path()), @r"
+        .args(["check", "--isolated", "--no-cache", "--select", "F401"]).current_dir(tempdir.path()), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -208,7 +208,7 @@ fn check_warn_stdin_filename_with_files() {
        .filename("foo.py")
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @r"
+        .pass_stdin("import os\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -235,7 +235,7 @@ fn stdin_source_type_py() {
        .args(["--stdin-filename", "TCH.py"])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @r"
+        .pass_stdin("import os\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -261,7 +261,7 @@ fn stdin_source_type_pyi() {
        .args(["--stdin-filename", "TCH.pyi", "--select", "TCH"])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @r"
+        .pass_stdin("import os\n"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -294,7 +294,7 @@ fn stdin_json() {
 fn stdin_fix_py() {
    let mut cmd = RuffCheck::default().args(["--fix"]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\nimport sys\n\nprint(sys.version)\n"), @r"
+        .pass_stdin("import os\nimport sys\n\nprint(sys.version)\n"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -572,7 +572,7 @@ fn stdin_override_parser_ipynb() {
 },
 "nbformat": 4,
 "nbformat_minor": 5
-}"#), @r"
+}"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -610,7 +610,7 @@ fn stdin_override_parser_py() {
        ])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\n"), @r"
+        .pass_stdin("import os\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -633,7 +633,7 @@ fn stdin_override_parser_py() {
 fn stdin_fix_when_not_fixable_should_still_print_contents() {
    let mut cmd = RuffCheck::default().args(["--fix"]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import os\nimport sys\n\nif (1, 2):\n     print(sys.version)\n"), @r###"
+        .pass_stdin("import os\nimport sys\n\nif (1, 2):\n     print(sys.version)\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -654,14 +654,14 @@ fn stdin_fix_when_not_fixable_should_still_print_contents() {
      |

    Found 2 errors (1 fixed, 1 remaining).
-    "###);
+    ");
 }

 #[test]
 fn stdin_fix_when_no_issues_should_still_print_contents() {
    let mut cmd = RuffCheck::default().args(["--fix"]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("import sys\n\nprint(sys.version)\n"), @r"
+        .pass_stdin("import sys\n\nprint(sys.version)\n"), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -805,7 +805,7 @@ fn stdin_format_jupyter() {
 fn stdin_parse_error() {
    let mut cmd = RuffCheck::default().build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("from foo import\n"), @r"
+        .pass_stdin("from foo import\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -826,7 +826,7 @@ fn stdin_parse_error() {
 fn stdin_multiple_parse_error() {
    let mut cmd = RuffCheck::default().build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("from foo import\nbar =\n"), @r"
+        .pass_stdin("from foo import\nbar =\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -857,7 +857,7 @@ fn parse_error_not_included() {
    // Parse errors are always shown
    let mut cmd = RuffCheck::default().args(["--select=I"]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("foo =\n"), @r"
+        .pass_stdin("foo =\n"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -878,7 +878,7 @@ fn parse_error_not_included() {
 fn full_output_preview() {
    let mut cmd = RuffCheck::default().args(["--preview"]).build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("l = 1"), @r"
+        .pass_stdin("l = 1"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -907,7 +907,7 @@ preview = true
 ",
    )?;
    let mut cmd = RuffCheck::default().config(&pyproject_toml).build();
-    assert_cmd_snapshot!(cmd.pass_stdin("l = 1"), @r"
+    assert_cmd_snapshot!(cmd.pass_stdin("l = 1"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -929,7 +929,7 @@ preview = true
 fn full_output_format() {
    let mut cmd = RuffCheck::default().output_format("full").build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("l = 1"), @r"
+        .pass_stdin("l = 1"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -967,7 +967,7 @@ fn rule_f401_output_text() {

 #[test]
 fn rule_invalid_rule_name() {
-    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404"]), @r"
+    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404"]), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -981,7 +981,7 @@ fn rule_invalid_rule_name() {

 #[test]
 fn rule_invalid_rule_name_output_json() {
-    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "json"]), @r"
+    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "json"]), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -995,7 +995,7 @@ fn rule_invalid_rule_name_output_json() {

 #[test]
 fn rule_invalid_rule_name_output_text() {
-    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "text"]), @r"
+    assert_cmd_snapshot!(ruff_cmd().args(["rule", "RUF404", "--output-format", "text"]), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1016,7 +1016,7 @@ fn show_statistics() {
                         .pass_stdin(r#"
 def mvce(keys, values):
    return {key: value for key, value in zip(keys, values)}
-"#), @r"
+"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1037,7 +1037,7 @@ fn show_statistics_unsafe_fixes() {
                         .pass_stdin(r#"
 def mvce(keys, values):
    return {key: value for key, value in zip(keys, values)}
-"#), @r"
+"#), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1152,7 +1152,7 @@ fn show_statistics_partial_fix() {
        .args(["--select", "UP035", "--statistics"])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("from typing import List, AsyncGenerator"), @r"
+        .pass_stdin("from typing import List, AsyncGenerator"), @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1173,7 +1173,7 @@ fn show_statistics_syntax_errors() {
    // ParseError
    assert_cmd_snapshot!(
        cmd.pass_stdin("x ="),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1186,7 +1186,7 @@ fn show_statistics_syntax_errors() {
    // match before 3.10, UnsupportedSyntaxError
    assert_cmd_snapshot!(
        cmd.pass_stdin("match 2:\n  case 1: ..."),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1199,7 +1199,7 @@ fn show_statistics_syntax_errors() {
    // rebound comprehension variable, SemanticSyntaxError
    assert_cmd_snapshot!(
        cmd.pass_stdin("[x := 1 for x in range(0)]"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1216,7 +1216,7 @@ fn preview_enabled_prefix() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF9", "--output-format=concise", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1238,7 +1238,7 @@ fn preview_enabled_all() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "ALL", "--output-format=concise", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1265,7 +1265,7 @@ fn preview_enabled_direct() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF911", "--output-format=concise", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1282,7 +1282,7 @@ fn preview_disabled_direct() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF911", "--output-format=concise"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1299,7 +1299,7 @@ fn preview_disabled_prefix_empty() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF91", "--output-format=concise"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1316,7 +1316,7 @@ fn preview_disabled_does_not_warn_for_empty_ignore_selections() {
    let mut cmd = RuffCheck::default()
        .args(["--ignore", "RUF9", "--output-format=concise"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1332,7 +1332,7 @@ fn preview_disabled_does_not_warn_for_empty_fixable_selections() {
    let mut cmd = RuffCheck::default()
        .args(["--fixable", "RUF9", "--output-format=concise"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1354,7 +1354,7 @@ fn preview_group_selector() {
        ])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin("I=42\n"), @r"
+        .pass_stdin("I=42\n"), @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1379,7 +1379,7 @@ fn preview_enabled_group_ignore() {
            "--output-format=concise",
        ])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1400,7 +1400,7 @@ fn preview_enabled_group_ignore() {
 fn removed_direct() {
    // Selection of a removed rule should fail
    let mut cmd = RuffCheck::default().args(["--select", "RUF931"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1418,7 +1418,7 @@ fn removed_direct_multiple() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF930", "--select", "RUF931"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1436,7 +1436,7 @@ fn removed_indirect() {
    // Selection _including_ a removed rule without matching should not fail
    // nor should the rule be used
    let mut cmd = RuffCheck::default().args(["--select", "RUF93"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1449,7 +1449,7 @@ fn removed_indirect() {
 #[test]
 fn removed_ignore_direct() {
    let mut cmd = RuffCheck::default().args(["--ignore", "UP027"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1466,7 +1466,7 @@ fn removed_ignore_multiple_direct() {
    let mut cmd = RuffCheck::default()
        .args(["--ignore", "UP027", "--ignore", "PLR1706"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1482,7 +1482,7 @@ fn removed_ignore_multiple_direct() {
 #[test]
 fn removed_ignore_remapped_direct() {
    let mut cmd = RuffCheck::default().args(["--ignore", "PGH001"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1498,7 +1498,7 @@ fn removed_ignore_indirect() {
    // `PLR170` includes removed rules but should not select or warn
    // since it is not a "direct" selection
    let mut cmd = RuffCheck::default().args(["--ignore", "PLR170"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1512,7 +1512,7 @@ fn removed_ignore_indirect() {
 fn redirect_direct() {
    // Selection of a redirected rule directly should use the new rule and warn
    let mut cmd = RuffCheck::default().args(["--select", "RUF940"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1531,7 +1531,7 @@ fn redirect_indirect() {
    // Selection _including_ a redirected rule without matching should not fail
    // nor should the rule be used
    let mut cmd = RuffCheck::default().args(["--select", "RUF94"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1546,7 +1546,7 @@ fn redirect_prefix() {
    // Selection using a redirected prefix should switch to all rules in the
    // new prefix
    let mut cmd = RuffCheck::default().args(["--select", "RUF96"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1565,7 +1565,7 @@ fn deprecated_direct() {
    // Selection of a deprecated rule without preview enabled should still work
    // but a warning should be displayed
    let mut cmd = RuffCheck::default().args(["--select", "RUF920"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1586,7 +1586,7 @@ fn deprecated_multiple_direct() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF920", "--select", "RUF921"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1609,7 +1609,7 @@ fn deprecated_indirect() {
    // `RUF92` includes deprecated rules but should not warn
    // since it is not a "direct" selection
    let mut cmd = RuffCheck::default().args(["--select", "RUF92"]).build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1625,7 +1625,7 @@ fn deprecated_direct_preview_enabled() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF920", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1642,7 +1642,7 @@ fn deprecated_indirect_preview_enabled() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF92", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1659,7 +1659,7 @@ fn deprecated_multiple_direct_preview_enabled() {
    let mut cmd = RuffCheck::default()
        .args(["--select", "RUF920", "--select", "RUF921", "--preview"])
        .build();
-    assert_cmd_snapshot!(cmd, @r"
+    assert_cmd_snapshot!(cmd, @"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1720,7 +1720,7 @@ fn unreadable_dir() -> Result<()> {
        .filename(unreadable_dir.to_str().unwrap())
        .args([])
        .build();
-    assert_cmd_snapshot!(cmd, @r###"
+    assert_cmd_snapshot!(cmd, @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1728,7 +1728,7 @@ fn unreadable_dir() -> Result<()> {

    ----- stderr -----
    warning: Encountered error: Permission denied (os error 13)
-    "###);
+    ");
    Ok(())
 }

@@ -1758,7 +1758,7 @@ fn check_input_from_argfile() -> Result<()> {
        (file_a_path.display().to_string().as_str(), "/path/to/a.py"),
    ]}, {
        assert_cmd_snapshot!(cmd
-            .pass_stdin(""), @r"
+            .pass_stdin(""), @"
        success: false
        exit_code: 1
        ----- stdout -----
@@ -1787,17 +1787,17 @@ fn missing_argfile_reports_error() {
    insta::with_settings!({filters => vec![
        ("The system cannot find the file specified.", "No such file or directory")
    ]}, {
-        assert_cmd_snapshot!(cmd, @r"
-    success: false
-    exit_code: 2
-    ----- stdout -----
+        assert_cmd_snapshot!(cmd, @"
+        success: false
+        exit_code: 2
+        ----- stdout -----

-    ----- stderr -----
-    ruff failed
-      Cause: Failed to read CLI arguments from files
-      Cause: failed to open file `!.txt`
-      Cause: No such file or directory (os error 2)
-    ");
+        ----- stderr -----
+        ruff failed
+          Cause: Failed to read CLI arguments from files
+          Cause: failed to open file `!.txt`
+          Cause: No such file or directory (os error 2)
+        ");
    });
 }

@@ -1807,7 +1807,7 @@ fn check_hints_hidden_unsafe_fixes() {
        .args(["--select", "RUF901,RUF902"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1829,7 +1829,7 @@ fn check_hints_hidden_unsafe_fixes_with_no_safe_fixes() {
    let mut cmd = RuffCheck::default().args(["--select", "RUF902"]).build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("x = {'a': 1, 'a': 1}\n"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1849,7 +1849,7 @@ fn check_no_hint_for_hidden_unsafe_fixes_when_disabled() {
        .args(["--select", "RUF901,RUF902", "--no-unsafe-fixes"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1873,7 +1873,7 @@ fn check_no_hint_for_hidden_unsafe_fixes_with_no_safe_fixes_when_disabled() {
        .build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("x = {'a': 1, 'a': 1}\n"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1892,7 +1892,7 @@ fn check_shows_unsafe_fixes_with_opt_in() {
        .args(["--select", "RUF901,RUF902", "--unsafe-fixes"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1915,7 +1915,7 @@ fn fix_applies_safe_fixes_by_default() {
        .args(["--select", "RUF901,RUF902", "--fix"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1936,7 +1936,7 @@ fn fix_applies_unsafe_fixes_with_opt_in() {
        .args(["--select", "RUF901,RUF902", "--fix", "--unsafe-fixes"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -1955,7 +1955,7 @@ fn fix_does_not_apply_display_only_fixes() {
        .build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("def add_to_list(item, some_list=[]): ..."),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1975,7 +1975,7 @@ fn fix_does_not_apply_display_only_fixes_with_unsafe_fixes_enabled() {
        .build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("def add_to_list(item, some_list=[]): ..."),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -1994,7 +1994,7 @@ fn fix_only_unsafe_fixes_available() {
        .args(["--select", "RUF902", "--fix"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2014,7 +2014,7 @@ fn fix_only_flag_applies_safe_fixes_by_default() {
        .args(["--select", "RUF901,RUF902", "--fix-only"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2031,7 +2031,7 @@ fn fix_only_flag_applies_unsafe_fixes_with_opt_in() {
        .args(["--select", "RUF901,RUF902", "--fix-only", "--unsafe-fixes"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2049,7 +2049,7 @@ fn diff_shows_safe_fixes_by_default() {
        .args(["--select", "RUF901,RUF902", "--diff"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2069,7 +2069,7 @@ fn diff_shows_unsafe_fixes_with_opt_in() {
        .args(["--select", "RUF901,RUF902", "--diff", "--unsafe-fixes"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2091,7 +2091,7 @@ fn diff_does_not_show_display_only_fixes_with_unsafe_fixes_enabled() {
        .build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("def add_to_list(item, some_list=[]): ..."),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2106,7 +2106,7 @@ fn diff_only_unsafe_fixes_available() {
        .args(["--select", "RUF902", "--diff"])
        .build();
    assert_cmd_snapshot!(cmd,
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2134,7 +2134,7 @@ extend-unsafe-fixes = ["RUF901"]
        .args(["--select", "RUF901,RUF902"])
        .build();
    assert_cmd_snapshot!(cmd,
-            @r"
+            @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2170,7 +2170,7 @@ extend-safe-fixes = ["RUF902"]
        .args(["--select", "RUF901,RUF902"])
        .build();
    assert_cmd_snapshot!(cmd,
-            @r"
+            @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2208,7 +2208,7 @@ extend-safe-fixes = ["RUF902"]
        .args(["--select", "RUF901,RUF902"])
        .build();
    assert_cmd_snapshot!(cmd,
-            @r"
+            @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2248,7 +2248,7 @@ extend-safe-fixes = ["RUF9"]
        .build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\nprint(str('foo'))\nisinstance(x, (int, str))\n"),
-            @r"
+            @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2307,7 +2307,7 @@ def log(x, base) -> float:
        .args(["--select", "D41"])
        .build();
    assert_cmd_snapshot!(cmd
-        .pass_stdin(stdin), @r"
+        .pass_stdin(stdin), @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2360,7 +2360,7 @@ select = ["RUF017"]
    let mut cmd = RuffCheck::default().config(&ruff_toml).build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("x = [1, 2, 3]\ny = [4, 5, 6]\nsum([x, y], [])"),
-            @r"
+            @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2401,7 +2401,7 @@ unfixable = ["RUF"]
    let mut cmd = RuffCheck::default().config(&ruff_toml).build();
    assert_cmd_snapshot!(cmd
        .pass_stdin("x = [1, 2, 3]\ny = [4, 5, 6]\nsum([x, y], [])"),
-            @r"
+            @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2431,7 +2431,7 @@ fn pyproject_toml_stdin_syntax_error() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2457,7 +2457,7 @@ fn pyproject_toml_stdin_schema_error() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project]\nname = 1"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2484,7 +2484,7 @@ fn pyproject_toml_stdin_no_applicable_rules_selected() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project"),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2503,7 +2503,7 @@ fn pyproject_toml_stdin_no_applicable_rules_selected_2() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project"),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2522,7 +2522,7 @@ fn pyproject_toml_stdin_no_errors() {

    assert_cmd_snapshot!(
        cmd.pass_stdin(r#"[project]\nname = "ruff"\nversion = "0.0.0""#),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2547,7 +2547,7 @@ fn pyproject_toml_stdin_schema_error_fix() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project]\nname = 1"),
-        @r"
+        @"
    success: false
    exit_code: 1
    ----- stdout -----
@@ -2581,7 +2581,7 @@ fn pyproject_toml_stdin_schema_error_fix_only() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project]\nname = 1"),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
@@ -2607,7 +2607,7 @@ fn pyproject_toml_stdin_schema_error_fix_diff() {

    assert_cmd_snapshot!(
        cmd.pass_stdin("[project]\nname = 1"),
-        @r"
+        @"
    success: true
    exit_code: 0
    ----- stdout -----
--- a/crates/ruff/tests/resolve_files.rs
+++ b/crates/ruff/tests/resolve_files.rs
@@ -29,7 +29,7 @@ fn check_project_include_defaults() {
        filters => TEST_FILTERS.to_vec()
    }, {
        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--show-files"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @r"
+        .args(["check", "--show-files"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -53,7 +53,7 @@ fn check_project_respects_direct_paths() {
        filters => TEST_FILTERS.to_vec()
    }, {
        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--show-files", "b.py"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @r"
+        .args(["check", "--show-files", "b.py"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -72,7 +72,7 @@ fn check_project_respects_subdirectory_includes() {
        filters => TEST_FILTERS.to_vec()
    }, {
        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--show-files", "subdirectory"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @r"
+        .args(["check", "--show-files", "subdirectory"]).current_dir(Path::new("./resources/test/fixtures/include-test")), @"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -91,7 +91,7 @@ fn check_project_from_project_subdirectory_respects_includes() {
        filters => TEST_FILTERS.to_vec()
    }, {
        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--show-files"]).current_dir(Path::new("./resources/test/fixtures/include-test/subdirectory")), @r"
+        .args(["check", "--show-files"]).current_dir(Path::new("./resources/test/fixtures/include-test/subdirectory")), @"
        success: true
        exit_code: 0
        ----- stdout -----
--- a/crates/ruff/tests/snapshots/integration_test__stdin_json.snap
+++ b/crates/ruff/tests/snapshots/integration_test__stdin_json.snap
@@ -3,11 +3,12 @@ source: crates/ruff/tests/integration_test.rs
 info:
  program: ruff
  args:
-    - "-"
-    - "--isolated"
-    - "--no-cache"
+    - check
    - "--output-format"
    - json
+    - "--no-cache"
+    - "--isolated"
+    - "-"
    - "--stdin-filename"
    - F401.py
  stdin: "import os\n"
@@ -51,4 +52,3 @@ exit_code: 1
  }
 ]
 ----- stderr -----
-
--- a/crates/ruff/tests/version.rs
+++ b/crates/ruff/tests/version.rs
@@ -16,7 +16,7 @@ const VERSION_FILTER: [(&str, &str); 1] = [(
 fn version_basics() {
    insta::with_settings!({filters => VERSION_FILTER.to_vec()}, {
        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME)).arg("version"), @r"
+            Command::new(get_cargo_bin(BIN_NAME)).arg("version"), @"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -42,7 +42,7 @@ fn config_option_allowed_but_ignored() -> Result<()> {
                .arg("version")
                .arg("--config")
                .arg(&ruff_dot_toml)
-                .args(["--config", "lint.isort.extra-standard-library = ['foo', 'bar']"]), @r"
+                .args(["--config", "lint.isort.extra-standard-library = ['foo', 'bar']"]), @"
        success: true
        exit_code: 0
        ----- stdout -----
@@ -60,7 +60,7 @@ fn config_option_ignored_but_validated() {
        assert_cmd_snapshot!(
            Command::new(get_cargo_bin(BIN_NAME))
                .arg("version")
-                .args(["--config", "foo = bar"]), @r"
+                .args(["--config", "foo = bar"]), @"
        success: false
        exit_code: 2
        ----- stdout -----
@@ -91,7 +91,7 @@ fn config_option_ignored_but_validated() {
 fn isolated_option_allowed() {
    insta::with_settings!({filters => VERSION_FILTER.to_vec()}, {
        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME)).arg("version").arg("--isolated"), @r"
+            Command::new(get_cargo_bin(BIN_NAME)).arg("version").arg("--isolated"), @"
        success: true
        exit_code: 0
        ----- stdout -----
--- a/crates/ruff_benchmark/benches/ty.rs
+++ b/crates/ruff_benchmark/benches/ty.rs
@@ -557,6 +557,60 @@ fn benchmark_many_enum_members(criterion: &mut Criterion) {
    });
 }

+fn benchmark_many_enum_members_2(criterion: &mut Criterion) {
+    const NUM_ENUM_MEMBERS: usize = 48;
+
+    setup_rayon();
+
+    let mut code = "\
+from enum import Enum
+from typing_extensions import assert_never
+
+class E(Enum):
+"
+    .to_string();
+
+    for i in 0..NUM_ENUM_MEMBERS {
+        writeln!(&mut code, "    m{i} = {i}").ok();
+    }
+
+    code.push_str(
+        "
+    def method(self):
+        match self:",
+    );
+
+    for i in 0..NUM_ENUM_MEMBERS {
+        write!(
+            &mut code,
+            "
+            case E.m{i}:
+                pass"
+        )
+        .ok();
+    }
+
+    write!(
+        &mut code,
+        "
+            case _:
+                assert_never(self)"
+    )
+    .ok();
+
+    criterion.bench_function("ty_micro[many_enum_members_2]", |b| {
+        b.iter_batched_ref(
+            || setup_micro_case(&code),
+            |case| {
+                let Case { db, .. } = case;
+                let result = db.check();
+                assert_eq!(result.len(), 0);
+            },
+            BatchSize::SmallInput,
+        );
+    });
+}
+
 struct ProjectBenchmark<'a> {
    project: InstalledProject<'a>,
    fs: MemoryFileSystem,
@@ -717,6 +771,7 @@ criterion_group!(
    benchmark_complex_constrained_attributes_2,
    benchmark_complex_constrained_attributes_3,
    benchmark_many_enum_members,
+    benchmark_many_enum_members_2,
 );
 criterion_group!(project, anyio, attrs, hydra, datetype);
 criterion_main!(check_file, micro, project);
--- a/crates/ruff_db/src/diagnostic/render.rs
+++ b/crates/ruff_db/src/diagnostic/render.rs
@@ -1284,7 +1284,7 @@ watermelon
        let diag = env.err().primary("animals", "5", "5", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -1308,7 +1308,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        warning[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -1328,7 +1328,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        info[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -1355,7 +1355,7 @@ watermelon
        let diag = builder.build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1374,7 +1374,7 @@ watermelon
        let diag = builder.build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1395,7 +1395,7 @@ watermelon
        let diag = env.err().primary("non-ascii", "5", "5", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> non-ascii:5:1
          |
@@ -1414,7 +1414,7 @@ watermelon
        let diag = env.err().primary("non-ascii", "2:4", "2:8", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> non-ascii:2:2
          |
@@ -1438,7 +1438,7 @@ watermelon
        env.context(1);
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -1455,7 +1455,7 @@ watermelon
        env.context(0);
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -1470,7 +1470,7 @@ watermelon
        env.context(2);
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1487,7 +1487,7 @@ watermelon
        env.context(2);
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:11:1
           |
@@ -1504,7 +1504,7 @@ watermelon
        env.context(200);
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:5:1
           |
@@ -1537,7 +1537,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:1:1
           |
@@ -1581,7 +1581,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1606,7 +1606,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1634,7 +1634,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1662,7 +1662,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:1:1
          |
@@ -1687,7 +1687,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:1:1
           |
@@ -1718,7 +1718,7 @@ watermelon
        // window.
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:1:1
           |
@@ -1756,7 +1756,7 @@ watermelon
        let diag = env.err().primary("spacey-animals", "8", "8", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> spacey-animals:8:1
          |
@@ -1773,7 +1773,7 @@ watermelon
        let diag = env.err().primary("spacey-animals", "12", "12", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> spacey-animals:12:1
           |
@@ -1791,7 +1791,7 @@ watermelon
        let diag = env.err().primary("spacey-animals", "13", "13", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> spacey-animals:13:1
           |
@@ -1831,7 +1831,7 @@ watermelon
        // instead of special casing the snippet assembly.
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> spacey-animals:3:1
          |
@@ -1860,7 +1860,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -1897,7 +1897,7 @@ watermelon
        );
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -1934,7 +1934,7 @@ watermelon
        );
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -1962,7 +1962,7 @@ watermelon
        diag.sub(env.sub_warn().primary("fruits", "3", "3", "").build());
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -1998,7 +1998,7 @@ watermelon
        diag.sub(env.sub_warn().primary("animals", "11", "11", "").build());
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -2037,7 +2037,7 @@ watermelon
        diag.sub(env.sub_warn().primary("fruits", "3", "3", "").build());
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -2085,7 +2085,7 @@ watermelon
        diag.sub(env.sub_warn().secondary("animals", "3", "3", "").build());
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:3:1
          |
@@ -2121,7 +2121,7 @@ watermelon
        let diag = env.err().primary("animals", "5", "6", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2144,7 +2144,7 @@ watermelon
        let diag = env.err().primary("animals", "5", "7:0", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2164,7 +2164,7 @@ watermelon
        let diag = env.err().primary("animals", "5", "7:1", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2184,7 +2184,7 @@ watermelon
        let diag = env.err().primary("animals", "5:3", "8:8", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:5:4
           |
@@ -2206,7 +2206,7 @@ watermelon
        let diag = env.err().secondary("animals", "5:3", "8:8", "").build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:5:4
           |
@@ -2238,7 +2238,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:4:1
          |
@@ -2267,7 +2267,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:4:1
          |
@@ -2298,7 +2298,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2333,7 +2333,7 @@ watermelon
        // better using only ASCII art.
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2361,7 +2361,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2393,7 +2393,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:3
          |
@@ -2415,7 +2415,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:3
          |
@@ -2448,7 +2448,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:8:1
           |
@@ -2488,7 +2488,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> animals:5:1
          |
@@ -2532,7 +2532,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
         --> fruits:1:1
          |
@@ -2567,7 +2567,7 @@ watermelon
            .build();
        insta::assert_snapshot!(
            env.render(&diag),
-            @r"
+            @"
        error[test-diagnostic]: main diagnostic message
          --> animals:11:1
           |
--- a/crates/ruff_db/src/diagnostic/render/concise.rs
+++ b/crates/ruff_db/src/diagnostic/render/concise.rs
@@ -137,7 +137,7 @@ mod tests {
    #[test]
    fn output() {
        let (env, diagnostics) = create_diagnostics(DiagnosticFormat::Concise);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
        fib.py:1:8: error[unused-import] `os` imported but unused
        fib.py:6:5: error[unused-variable] Local variable `x` is assigned to but never used
        undef.py:1:4: error[undefined-name] Undefined name `a`
@@ -150,7 +150,7 @@ mod tests {
        env.hide_severity(true);
        env.show_fix_status(true);
        env.fix_applicability(Applicability::DisplayOnly);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
        fib.py:1:8: F401 [*] `os` imported but unused
        fib.py:6:5: F841 [*] Local variable `x` is assigned to but never used
        undef.py:1:4: F821 Undefined name `a`
@@ -164,7 +164,7 @@ mod tests {
        env.show_fix_status(true);
        env.fix_applicability(Applicability::DisplayOnly);
        env.preview(true);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
        fib.py:1:8: F401 [*] `os` imported but unused
        fib.py:6:5: F841 [*] Local variable `x` is assigned to but never used
        undef.py:1:4: F821 Undefined name `a`
@@ -177,7 +177,7 @@ mod tests {
        env.hide_severity(true);
        env.show_fix_status(true);
        env.fix_applicability(Applicability::DisplayOnly);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
        syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
        syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
        ");
@@ -186,7 +186,7 @@ mod tests {
    #[test]
    fn syntax_errors() {
        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Concise);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
        syntax_errors.py:1:15: error[invalid-syntax] Expected one or more symbol names after import
        syntax_errors.py:3:12: error[invalid-syntax] Expected ')', found newline
        ");
@@ -195,7 +195,7 @@ mod tests {
    #[test]
    fn notebook_output() {
        let (env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Concise);
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
+        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @"
        notebook.ipynb:cell 1:2:8: error[unused-import] `os` imported but unused
        notebook.ipynb:cell 2:2:8: error[unused-import] `math` imported but unused
        notebook.ipynb:cell 3:4:5: error[unused-variable] Local variable `x` is assigned to but never used
--- a/crates/ruff_db/src/files.rs
+++ b/crates/ruff_db/src/files.rs
@@ -526,7 +526,7 @@ impl VirtualFile {
    }

    /// Increments the revision of the underlying [`File`].
-    fn sync(&self, db: &mut dyn Db) {
+    pub fn sync(&self, db: &mut dyn Db) {
        let file = self.0;
        tracing::debug!("Updating the revision of `{}`", file.path(db));
        let current_revision = file.revision(db);
--- a/crates/ruff_db/src/vendored.rs
+++ b/crates/ruff_db/src/vendored.rs
@@ -619,19 +619,19 @@ pub(crate) mod tests {
    fn read_directory_stdlib() {
        let mock_typeshed = mock_typeshed();

-        assert_snapshot!(readdir_snapshot(&mock_typeshed, "stdlib"), @r"
+        assert_snapshot!(readdir_snapshot(&mock_typeshed, "stdlib"), @"
        vendored://stdlib/asyncio/
        vendored://stdlib/functools.pyi
        ");
-        assert_snapshot!(readdir_snapshot(&mock_typeshed, "stdlib/"), @r"
+        assert_snapshot!(readdir_snapshot(&mock_typeshed, "stdlib/"), @"
        vendored://stdlib/asyncio/
        vendored://stdlib/functools.pyi
        ");
-        assert_snapshot!(readdir_snapshot(&mock_typeshed, "./stdlib"), @r"
+        assert_snapshot!(readdir_snapshot(&mock_typeshed, "./stdlib"), @"
        vendored://stdlib/asyncio/
        vendored://stdlib/functools.pyi
        ");
-        assert_snapshot!(readdir_snapshot(&mock_typeshed, "./stdlib/"), @r"
+        assert_snapshot!(readdir_snapshot(&mock_typeshed, "./stdlib/"), @"
        vendored://stdlib/asyncio/
        vendored://stdlib/functools.pyi
        ");
--- a/crates/ruff_linter/src/comments/snapshots/ruff_lintercommentsshebangtestsshebang_end_of_line.snap
+++ b/crates/ruff_linter/src/comments/snapshots/ruff_lintercommentsshebangtestsshebang_end_of_line.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/ruff_linter/src/comments/shebang.rs
 expression: "ShebangDirective::try_extract(source)"
-snapshot_kind: text
 ---
 None
--- a/crates/ruff_linter/src/comments/snapshots/ruff_lintercommentsshebangtestsshebang_leading_space.snap
+++ b/crates/ruff_linter/src/comments/snapshots/ruff_lintercommentsshebangtestsshebang_leading_space.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/ruff_linter/src/comments/shebang.rs
 expression: "ShebangDirective::try_extract(source)"
-snapshot_kind: text
 ---
 None
--- a/crates/ruff_linter/src/comments/snapshots/ruff_lintercommentsshebangtestsshebang_match.snap
+++ b/crates/ruff_linter/src/comments/snapshots/ruff_lintercommentsshebangtestsshebang_match.snap
@@ -1,7 +1,6 @@
 ---
 source: crates/ruff_linter/src/comments/shebang.rs
 expression: "ShebangDirective::try_extract(source)"
-snapshot_kind: text
 ---
 Some(
    ShebangDirective(
--- a/crates/ruff_linter/src/comments/snapshots/ruff_lintercommentsshebangtestsshebang_match_trailing_comment.snap
+++ b/crates/ruff_linter/src/comments/snapshots/ruff_lintercommentsshebangtestsshebang_match_trailing_comment.snap
@@ -1,7 +1,6 @@
 ---
 source: crates/ruff_linter/src/comments/shebang.rs
 expression: "ShebangDirective::try_extract(source)"
-snapshot_kind: text
 ---
 Some(
    ShebangDirective(
--- a/crates/ruff_linter/src/comments/snapshots/ruff_lintercommentsshebangtestsshebang_non_match.snap
+++ b/crates/ruff_linter/src/comments/snapshots/ruff_lintercommentsshebangtestsshebang_non_match.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/ruff_linter/src/comments/shebang.rs
 expression: "ShebangDirective::try_extract(source)"
-snapshot_kind: text
 ---
 None
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegroupedtestsdefault.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagegroupedtestsdefault.snap
@@ -1,7 +1,6 @@
 ---
 source: crates/ruff_linter/src/message/grouped.rs
 expression: content
-snapshot_kind: text
 ---
 fib.py:
  1:8 F401 `os` imported but unused
--- a/crates/ruff_linter/src/noqa.rs
+++ b/crates/ruff_linter/src/noqa.rs
@@ -1326,7 +1326,7 @@ mod tests {
    fn noqa_all() {
        let source = "# noqa";
        let directive = lex_inline_noqa(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Ok(
            Some(
                NoqaLexerOutput {
@@ -1347,7 +1347,7 @@ mod tests {
    fn noqa_no_code() {
        let source = "# noqa:";
        let directive = lex_inline_noqa(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Err(
            MissingCodes,
        )
@@ -1359,7 +1359,7 @@ mod tests {
    fn noqa_no_code_invalid_suffix() {
        let source = "# noqa: foo";
        let directive = lex_inline_noqa(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Err(
            MissingCodes,
        )
@@ -1371,7 +1371,7 @@ mod tests {
    fn noqa_no_code_trailing_content() {
        let source = "# noqa:  # Foo";
        let directive = lex_inline_noqa(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Err(
            MissingCodes,
        )
@@ -1383,7 +1383,7 @@ mod tests {
    fn malformed_code_1() {
        let source = "# noqa: F";
        let directive = lex_inline_noqa(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Err(
            MissingCodes,
        )
@@ -1422,7 +1422,7 @@ mod tests {
    fn malformed_code_3() {
        let source = "# noqa: RUF001F";
        let directive = lex_inline_noqa(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Err(
            InvalidCodeSuffix,
        )
@@ -1492,7 +1492,7 @@ mod tests {
    fn noqa_all_case_insensitive() {
        let source = "# NOQA";
        let directive = lex_inline_noqa(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Ok(
            Some(
                NoqaLexerOutput {
@@ -1625,7 +1625,7 @@ mod tests {
    fn noqa_all_no_space() {
        let source = "#noqa";
        let directive = lex_inline_noqa(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Ok(
            Some(
                NoqaLexerOutput {
@@ -1704,7 +1704,7 @@ mod tests {
    fn noqa_all_multi_space() {
        let source = "#  noqa";
        let directive = lex_inline_noqa(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Ok(
            Some(
                NoqaLexerOutput {
@@ -1837,7 +1837,7 @@ mod tests {
    fn noqa_all_leading_comment() {
        let source = "# Some comment describing the noqa # noqa";
        let directive = lex_inline_noqa(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Ok(
            Some(
                NoqaLexerOutput {
@@ -1916,7 +1916,7 @@ mod tests {
    fn noqa_all_trailing_comment() {
        let source = "# noqa # Some comment describing the noqa";
        let directive = lex_inline_noqa(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Ok(
            Some(
                NoqaLexerOutput {
@@ -1995,7 +1995,7 @@ mod tests {
    fn noqa_invalid_codes() {
        let source = "# noqa: unused-import, F401, some other code";
        let directive = lex_inline_noqa(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Err(
            MissingCodes,
        )
@@ -2139,7 +2139,7 @@ mod tests {
    fn noqa_code_invalid_code_suffix() {
        let source = "# noqa: F401abc";
        let directive = lex_inline_noqa(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Err(
            InvalidCodeSuffix,
        )
@@ -2151,7 +2151,7 @@ mod tests {
    fn noqa_invalid_suffix() {
        let source = "# noqa[F401]";
        let directive = lex_inline_noqa(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Err(
            InvalidSuffix,
        )
@@ -2163,7 +2163,7 @@ mod tests {
    fn flake8_exemption_all() {
        let source = "# flake8: noqa";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Ok(
            Some(
                NoqaLexerOutput {
@@ -2184,7 +2184,7 @@ mod tests {
    fn flake8_noqa_no_code() {
        let source = "# flake8: noqa:";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Err(
            MissingCodes,
        )
@@ -2196,7 +2196,7 @@ mod tests {
    fn flake8_noqa_no_code_invalid_suffix() {
        let source = "# flake8: noqa: foo";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Err(
            MissingCodes,
        )
@@ -2208,7 +2208,7 @@ mod tests {
    fn flake8_noqa_no_code_trailing_content() {
        let source = "# flake8: noqa:  # Foo";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Err(
            MissingCodes,
        )
@@ -2220,7 +2220,7 @@ mod tests {
    fn flake8_malformed_code_1() {
        let source = "# flake8: noqa: F";
        let directive = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Err(
            MissingCodes,
        )
@@ -2259,7 +2259,7 @@ mod tests {
    fn flake8_malformed_code_3() {
        let source = "# flake8: noqa: RUF001F";
        let directive = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Err(
            InvalidCodeSuffix,
        )
@@ -2271,7 +2271,7 @@ mod tests {
    fn ruff_exemption_all() {
        let source = "# ruff: noqa";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Ok(
            Some(
                NoqaLexerOutput {
@@ -2292,7 +2292,7 @@ mod tests {
    fn ruff_noqa_no_code() {
        let source = "# ruff: noqa:";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Err(
            MissingCodes,
        )
@@ -2304,7 +2304,7 @@ mod tests {
    fn ruff_noqa_no_code_invalid_suffix() {
        let source = "# ruff: noqa: foo";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Err(
            MissingCodes,
        )
@@ -2316,7 +2316,7 @@ mod tests {
    fn ruff_noqa_no_code_trailing_content() {
        let source = "# ruff: noqa:  # Foo";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Err(
            MissingCodes,
        )
@@ -2328,7 +2328,7 @@ mod tests {
    fn ruff_malformed_code_1() {
        let source = "# ruff: noqa: F";
        let directive = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Err(
            MissingCodes,
        )
@@ -2367,7 +2367,7 @@ mod tests {
    fn ruff_malformed_code_3() {
        let source = "# ruff: noqa: RUF001F";
        let directive = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(directive, @r"
+        assert_debug_snapshot!(directive, @"
        Err(
            InvalidCodeSuffix,
        )
@@ -2379,7 +2379,7 @@ mod tests {
    fn flake8_exemption_all_no_space() {
        let source = "#flake8:noqa";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Ok(
            Some(
                NoqaLexerOutput {
@@ -2400,7 +2400,7 @@ mod tests {
    fn ruff_exemption_all_no_space() {
        let source = "#ruff:noqa";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Ok(
            Some(
                NoqaLexerOutput {
@@ -2619,7 +2619,7 @@ mod tests {
    fn ruff_exemption_invalid_code_suffix() {
        let source = "# ruff: noqa: F401abc";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Err(
            InvalidCodeSuffix,
        )
@@ -2685,7 +2685,7 @@ mod tests {
    fn ruff_exemption_all_leading_comment() {
        let source = "# Leading comment # ruff: noqa";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Ok(
            Some(
                NoqaLexerOutput {
@@ -2706,7 +2706,7 @@ mod tests {
    fn ruff_exemption_all_trailing_comment() {
        let source = "# ruff: noqa # Trailing comment";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Ok(
            Some(
                NoqaLexerOutput {
@@ -2754,7 +2754,7 @@ mod tests {
    fn ruff_exemption_all_trailing_comment_no_space() {
        let source = "# ruff: noqa# Trailing comment";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Ok(
            Some(
                NoqaLexerOutput {
@@ -2775,7 +2775,7 @@ mod tests {
    fn ruff_exemption_all_trailing_comment_no_hash() {
        let source = "# ruff: noqa Trailing comment";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Ok(
            Some(
                NoqaLexerOutput {
@@ -2823,7 +2823,7 @@ mod tests {
    fn flake8_exemption_all_case_insensitive() {
        let source = "# flake8: NoQa";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Ok(
            Some(
                NoqaLexerOutput {
@@ -2844,7 +2844,7 @@ mod tests {
    fn ruff_exemption_all_case_insensitive() {
        let source = "# ruff: NoQa";
        let exemption = lex_file_exemption(TextRange::up_to(source.text_len()), source);
-        assert_debug_snapshot!(exemption, @r"
+        assert_debug_snapshot!(exemption, @"
        Ok(
            Some(
                NoqaLexerOutput {
--- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linterrulesflake8_annotationstestsallow_nested_overload.snap
+++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linterrulesflake8_annotationstestsallow_nested_overload.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_annotations/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linterrulesflake8_annotationstestssuppress_dummy_args.snap
+++ b/crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linterrulesflake8_annotationstestssuppress_dummy_args.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_annotations/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linterrulesflake8_asynctestsASYNC109_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linterrulesflake8_asynctestsASYNC109_1.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_async/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS401_S401.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS401_S401.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS402_S402.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS402_S402.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS403_S403.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS403_S403.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS404_S404.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS404_S404.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS405_S405.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS405_S405.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS406_S406.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS406_S406.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS407_S407.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS407_S407.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS408_S408.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS408_S408.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS409_S409.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS409_S409.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS410_S410.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS410_S410.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS411_S411.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS411_S411.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS412_S412.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS412_S412.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS413_S413.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS413_S413.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS415_S415.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS415_S415.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB006_B006_1.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB006_B006_1.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB027_B027.pyi.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB027_B027.pyi.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linterrulesflake8_builtinstestsA005_A005modules_abc__init.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linterrulesflake8_builtinstestsA005_A005modules_abc__init.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_builtins/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linterrulesflake8_builtinstestsA005_A005modules_abc__init.py_builtins_allowed_modules.snap
+++ b/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linterrulesflake8_builtinstestsA005_A005modules_abc__init.py_builtins_allowed_modules.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_builtins/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linterrulesflake8_builtinstestsA005_A005moduleslogging__init.py_builtins_allowed_modules.snap
+++ b/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linterrulesflake8_builtinstestsA005_A005moduleslogging__init.py_builtins_allowed_modules.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_builtins/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linterrulesflake8_builtinstestsA005_A005modulesnon_builtin__init.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linterrulesflake8_builtinstestsA005_A005modulesnon_builtin__init.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_builtins/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linterrulesflake8_builtinstestsA005_A005modulesnon_builtin__init.py_builtins_allowed_modules.snap
+++ b/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linterrulesflake8_builtinstestsA005_A005modulesnon_builtin__init.py_builtins_allowed_modules.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_builtins/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linterrulesflake8_builtinstestsA005_A005modulespackage__xml.py_builtins_allowed_modules.snap
+++ b/crates/ruff_linter/src/rules/flake8_builtins/snapshots/ruff_linterrulesflake8_builtinstestsA005_A005modulespackage__xml.py_builtins_allowed_modules.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_builtins/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linterrulesflake8_comprehensionstestsC419_C419_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_comprehensions/snapshots/ruff_linterrulesflake8_comprehensionstestsC419_C419_2.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_comprehensions/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsnotice.snap
+++ b/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsnotice.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsnotice_with_c.snap
+++ b/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsnotice_with_c.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsnotice_with_caps.snap
+++ b/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsnotice_with_caps.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsnotice_with_comma.snap
+++ b/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsnotice_with_comma.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsnotice_with_range.snap
+++ b/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsnotice_with_range.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsnotice_with_unicode_c.snap
+++ b/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsnotice_with_unicode_c.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestssmall_file.snap
+++ b/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestssmall_file.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsvalid_author.snap
+++ b/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsvalid_author.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsvalid_author_with_comma_valid_space.snap
+++ b/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsvalid_author_with_comma_valid_space.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsvalid_author_with_dash.snap
+++ b/crates/ruff_linter/src/rules/flake8_copyright/snapshots/ruff_linterrulesflake8_copyrighttestsvalid_author_with_dash.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_copyright/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsfa102_ok_no_types.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsfa102_ok_no_types.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsfa102_ok_quoted_type.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsfa102_ok_quoted_type.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsfa102_ok_uses_future.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsfa102_ok_uses_future.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsno_future_import_uses_lowercase.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsno_future_import_uses_lowercase.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsno_future_import_uses_union.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsno_future_import_uses_union.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsno_future_import_uses_union_inner.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsno_future_import_uses_union_inner.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsok_no_types.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsok_no_types.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsok_non_simplifiable_types.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsok_non_simplifiable_types.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsok_uses_future.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsok_uses_future.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsok_variable_name.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_future_annotations/snapshots/ruff_linterrulesflake8_future_annotationstestsok_variable_name.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_future_annotations/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linterrulesflake8_implicit_str_concattestsmultiline_ISC003_ISC.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linterrulesflake8_implicit_str_concattestsmultiline_ISC003_ISC.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_implicit_str_concat/mod.rs
-snapshot_kind: text
 ---

--- a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linterrulesflake8_logging_formattestsG004_implicit_concat.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linterrulesflake8_logging_formattestsG004_implicit_concat.py.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_logging_format/mod.rs
-assertion_line: 50
 ---
 G004 Logging statement uses f-string
 --> G004_implicit_concat.py:6:10
--- a/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linterrulesflake8_logging_formattestsG_argparse_parser_error_ok.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_logging_format/snapshots/ruff_linterrulesflake8_logging_formattestsG_argparse_parser_error_ok.py.snap
@@ -1,5 +1,4 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_logging_format/mod.rs
-snapshot_kind: text
 ---

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Charlie Marsh	10d4e5642d	Revert "Special-case typing._SpecialForm" This reverts commit `70e62b5444`.	2026-01-06 14:44:48 -05:00
Charlie Marsh	70e62b5444	Special-case typing._SpecialForm	2026-01-06 14:44:32 -05:00
Charlie Marsh	fcf6a9999b	[ty] Validate class decorator constructor arguments	2026-01-06 14:44:32 -05:00
Charlie Marsh	01de8bef3e	[ty] Add named fields for `Place` enum (#22172 ) ## Summary Mechanical refactor to migrate this enum to named fields. No functional changes. See: https://github.com/astral-sh/ruff/pull/22093#discussion_r2636050127. --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-06 17:24:51 +00:00
Charlie Marsh	b59f6eb5e9	[ty] Support comparisons between variable-length tuples (#21824 ) ## Summary Closes https://github.com/astral-sh/ty/issues/1741.	2026-01-06 12:09:40 -05:00
Aria Desires	9ca78bdf76	[ty] Add Gankra as a CODEOWNER for lsp and imports work (#22420 ) Co-authored-by: Micha Reiser <micha@reiser.io>	2026-01-06 16:50:16 +00:00
Charlie Marsh	d65542c05e	[ty] Make tuple intersection a fallible operation (#22094 ) ## Summary This PR attempts to address a TODO in https://github.com/astral-sh/ruff/pull/21965#discussion_r2635378498.	2026-01-06 10:47:04 -05:00
Aria Desires	98728b2c98	[ty] improve indented codefence rendering in docstrings (#22408 ) By stripping leading indents from codefence lines to ensure they're properly understood by markdown (but otherwise preserving the indent in the codeblock so all the code renders roughly at the right indent). As described in [this comment](https://github.com/astral-sh/ty/issues/2352#issuecomment-3711686053) this solution is very "do what I mean" for when a user has an explicit markdown codeblock in e.g. a `Returns:` section which "has" to be indented but that indent makes the verbatim codefence invalid markdown. * Fixes https://github.com/astral-sh/ty/issues/2352	2026-01-06 10:44:31 -05:00
Dylan	924b2972f2	Update Black tests (#22405 ) I am updating these because we didn't have test coverage for the different handling of `fmt: skip` comments applied to multiple statements on the same line. This is in preparation for #22119 (to show before/after deviations). Follows the same procedure as in #20794 Edit: As it happens, the new fixtures do not even cover the case relevant to #22119 - they just deal with the already handled case of a one-line compound statement. Nevertheless, it seems worthwhile to make this update, especially since it uncovered a (possible?) bug.	2026-01-06 09:09:05 -06:00
Andrew Gallant	d035744959	[ty] Include `=` in completion suggestions in playground This was an accidental omission in #21988 and identified in astral-sh/ty#2203.	2026-01-06 09:26:29 -05:00
RasmusNygren	ce059c4857	[ty] Sort keyword argument completions higher (#22297 )	2026-01-06 10:57:10 +00:00
Micha Reiser	acbc83d6d2	[ty] Fix stale semantic tokens after opening the same document with new content (#22414 )	2026-01-06 11:52:51 +01:00
RasmusNygren	a9e5246786	[ty] Ensure the ty playground module is only ever loaded once (#22409 )	2026-01-06 10:52:02 +01:00
Charlie Marsh	8b8b174e4f	[ty] Add a diagnostic for `@functools.total_ordering` without a defined comparison method (#22183 ) ## Summary This raises a `ValueError` at runtime: ```python from functools import total_ordering @total_ordering class NoOrdering: def __eq__(self, other: object) -> bool: return True ``` Specifically: ``` Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/Library/Frameworks/Python.framework/Versions/3.11/lib/python3.11/functools.py", line 193, in total_ordering raise ValueError('must define at least one ordering operation: < > <= >=') ValueError: must define at least one ordering operation: < > <= >= ``` See: https://github.com/astral-sh/ty/issues/1202.	2026-01-06 04:14:06 +00:00
Charlie Marsh	28fa02129b	[ty] Add support for `@total_ordering` (#22181 ) ## Summary We have some suppressions in the pyx codebase related to this, so wanted to resolve. Closes https://github.com/astral-sh/ty/issues/1202.	2026-01-05 22:47:03 -05:00
Brent Westbrook	a10e42294b	[`pylint`] Demote `PLW1510` fix to display-only (#22318 ) Summary -- Closes #17091. `PLW1510` checks for `subprocess.run` calls without a `check` keyword argument and previously had a safe fix to add `check=False`. That's the default value, so technically it preserved the code's behavior, but as discussed in #17091 and #17087, Ruff can't actually know what the author intended. I don't think it hurts to keep this as a display-only fix instead of removing it entirely, but it definitely shouldn't be safe at the very least. Test Plan -- Existing tests	2026-01-05 19:36:16 -05:00
Amethyst Reese	12a4ca003f	[`flake8_print`] better suggestion for basicConfig in `T201` docs (#22101 ) `logging.basicConfig` should not be called at a global module scope, as that produces a race condition to configure logging based on which module gets imported first. Logging should instead be initialized in an entrypoint to the program, either in a `main()` or in the typical `if __name__ == "__main__"` block.	2026-01-05 11:42:47 -08:00
Charlie Marsh	60f7ec90ef	Add a `fast-test` profile (#22382 ) ## Summary We use this profile in uv to create success, as an optimization for the iterative test loop. We include `opt-level=1` because it ends up being "worth it" for testing (empirically), even though it means the build is actually a big slower than `dev` (if you remove `opt-level=1`, clean compile is about 22% faster than `dev`). Here are some benchmarks I generated with Claude -- the main motivator here is the incremental testing for `ty_python_semantic` which is 2.4x faster: ### `ty_python_semantic` Full test suite (471 tests): \| Scenario \| dev \| fast-test \| Improvement \| \|-------------\|-------\|------------\|-------------\| \| Clean \| 53s \| 49s \| 8% faster \| \| Incremental \| 17.8s \| 6.8s \| 2.4x faster \| Single test: \| Scenario \| dev \| fast-test \| Improvement \| \|-------------\|-------\|------------\|-------------\| \| Clean \| 42.5s \| 55.3s \| 30% slower \| \| Incremental \| 6.5s \| 6.1s \| ~same \| ### `ruff_linter` Full test suite (2622 tests): \| Scenario \| dev \| fast-test \| Improvement \| \|-------------\|-------\|------------\|-------------\| \| Clean \| 31s \| 41s \| 32% slower \| \| Incremental \| 11.9s \| 10.5s \| 12% faster \| Single test: \| Scenario \| dev \| fast-test \| Improvement \| \|-------------\|------\|------------\|-------------\| \| Clean \| 26s \| 36.5s \| 40% slower \| \| Incremental \| 4.5s \| 5.5s \| 22% slower \|	2026-01-05 19:35:43 +00:00
Jack O'Connor	922d964bcb	[ty] emit diagnostics for method definitions and other invalid statements in `TypedDict` class bodies (#22351 ) Fixes https://github.com/astral-sh/ty/issues/2277.	2026-01-05 11:28:04 -08:00
Jack O'Connor	4712503c6d	[ty] `cargo insta test --force-update-snapshots` (#22313 ) Snapshot tests recently started reporting this warning: > Snapshot test passes but the existing value is in a legacy format. > Please run cargo insta test --force-update-snapshots to update to a > newer format. This PR is the result of that forced update. One file (crates/ruff_db/src/diagnostic/render/full.rs) seems to get corrupted, because it contains strings with unprintable characters that trigger some bug in cargo-insta. I've manually reverted that file, and also manually reverted the `input_file:` lines, which we like.	2026-01-05 07:55:47 -08:00
Alex Waygood	6b3de1517a	[ty] Improve tracebacks when installing dependencies fails in ty_benchmark (#22399 )	2026-01-05 14:55:08 +00:00
Alex Waygood	f3dea6e5c9	[ty] Optimize `IntersectionType` for the common case of a single negated element (#22344 ) Co-authored-by: Micha Reiser <micha@reiser.io>	2026-01-05 13:41:50 +00:00
Micha Reiser	24dd149e03	[ty] Extract `relation` module from `types.rs` (#22232 )	2026-01-05 13:16:49 +00:00
Alex Waygood	b8d527ff46	[ty] Optimize and simplify `UnionElement::try_reduce` (#22339 )	2026-01-05 12:54:44 +00:00
Aria Desires	e63cf978ae	[ty] Implement support for explicit markdown code fences in docstring rendering (#22373 ) * Fixes https://github.com/astral-sh/ty/issues/2291	2026-01-05 07:13:24 -05:00
Rob Hand	3dab4ff8ad	[ty] (docs) - Note insta is required for working with ty tests in ty CONTRIBUTING.md (#22332 )	2026-01-05 11:05:13 +01:00
Jason K Hall	24580e2ee8	flake8-simplify: avoid unnecessary builtins import for SIM105 (#22358 )	2026-01-05 10:58:46 +01:00
renovate[bot]	3d3af6f7c8	Update pre-commit dependencies (#22393 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Micha Reiser <micha@reiser.io>	2026-01-05 10:24:40 +01:00
renovate[bot]	7cc34c081a	Update CodSpeedHQ/action action to v4.5.1 (#22389 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-01-05 09:10:06 +01:00
renovate[bot]	7a95013f56	Update Rust crate serde_json to v1.0.148 (#22387 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-01-05 09:09:23 +01:00
renovate[bot]	2395954d9a	Update Rust crate schemars to v1.2.0 (#22391 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Micha Reiser <micha@reiser.io>	2026-01-05 09:08:58 +01:00
renovate[bot]	670bd01fb5	Update Rust crate arc-swap to v1.8.0 (#22390 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-01-05 09:08:32 +01:00
renovate[bot]	eae5c685f8	Update Rust crate proc-macro2 to v1.0.104 (#22386 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-01-05 09:05:21 +01:00
renovate[bot]	994f05f3ca	Update Rust crate tempfile to v3.24.0 (#22392 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-01-05 09:04:59 +01:00
renovate[bot]	8dcecf323b	Update taiki-e/install-action action to v2.65.6 (#22388 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-01-05 08:03:31 +00:00
renovate[bot]	b12c94e411	Update Rust crate jiff to v0.2.17 (#22384 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-01-05 07:57:34 +00:00
renovate[bot]	a9c3ea9674	Update Rust crate matchit to v0.9.1 (#22385 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-01-05 07:56:54 +00:00
renovate[bot]	704c57f491	Update Rust crate insta to v1.45.1 (#22383 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-01-05 07:56:36 +00:00
renovate[bot]	7a27662eca	Update cargo-bins/cargo-binstall action to v1.16.6 (#22380 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-01-05 08:30:34 +01:00
renovate[bot]	ce2490ee93	Update dependency @cloudflare/workers-types to v4.20251229.0 (#22381 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-01-05 08:30:16 +01:00
Charlie Marsh	92a2f2c992	[ty] Apply class decorators via `try_call()` (#22375 ) ## Summary Decorators are now called with the class as an argument, and the return type becomes the class's type. This mirrors how function decorators already work. Closes https://github.com/astral-sh/ty/issues/2313.	2026-01-04 17:11:00 -05:00
Charlie Marsh	11b551c2be	Add a CLAUDE.md (#22370 ) ## Summary This is a starting point based on my own experiments. Feedback and changes welcome -- I think we should iterate on this a lot as we go.	2026-01-04 15:00:31 -05:00
Micha Reiser	b85c0190c5	[ty] Use upstream `GetSize` implementation for `OrderMap` and `OrderSet` (#22374 )	2026-01-04 19:54:03 +00:00
Micha Reiser	46a4bfc478	[ty] Use default `HashSet` for `TypeCollector` (#22368 )	2026-01-04 18:58:30 +00:00
Alex Waygood	0c53395917	[ty] Add a second benchmark for enums with many members (#22364 )	2026-01-04 17:58:20 +00:00
Alex Waygood	8464aca795	Bump docstring-adder pin (#22361 )	2026-01-03 20:21:45 +00:00