[ty] Do not infer types for unannotated implicit instance attribtues

[ty] Improve documentation for extra-paths and python config settings (#20717 )
Co-authored-by: Micha Reiser <micha@reiser.io>
2025-10-06 16:59:49 +02:00 · 2025-10-06 12:20:00 +00:00 · 2025-10-06 13:03:05 +01:00 · 2025-10-06 11:43:34 +00:00 · 2025-10-06 08:37:03 +02:00 · 2025-10-06 08:26:22 +02:00
368 changed files with 14201 additions and 5610 deletions
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -40,7 +40,7 @@ jobs:

      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1

-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -131,7 +131,7 @@ jobs:
            type=pep440,pattern={{ version }},value=${{ fromJson(inputs.plan).announcement_tag }}
            type=pep440,pattern={{ major }}.{{ minor }},value=${{ fromJson(inputs.plan).announcement_tag }}

-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -169,7 +169,7 @@ jobs:
    steps:
      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1

-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -276,7 +276,7 @@ jobs:
            type=pep440,pattern={{ version }},value=${{ fromJson(inputs.plan).announcement_tag }}
            type=pep440,pattern={{ major }}.{{ minor }},value=${{ fromJson(inputs.plan).announcement_tag }}

-      - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+      - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -225,7 +225,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - name: "Install Rust toolchain"
        run: |
          rustup component add clippy
@@ -245,21 +245,21 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
        with:
          tool: cargo-insta
      - name: "Install uv"
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
        with:
          enable-cache: "true"
      - name: ty mdtests (GitHub annotations)
@@ -307,21 +307,21 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
        with:
          tool: cargo-insta
      - name: "Install uv"
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
        with:
          enable-cache: "true"
      - name: "Run tests"
@@ -340,15 +340,15 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
        with:
          tool: cargo-nextest
      - name: "Install uv"
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
        with:
          enable-cache: "true"
      - name: "Run tests"
@@ -371,7 +371,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
@@ -400,7 +400,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
@@ -423,7 +423,7 @@ jobs:
        with:
          file: "Cargo.toml"
          field: "workspace.package.rust-version"
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - name: "Install Rust toolchain"
        env:
          MSRV: ${{ steps.msrv.outputs.value }}
@@ -446,13 +446,13 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          workspaces: "fuzz -> target"
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@20aa316bab4942180bbbabe93237858e8d77f1ed # v1.15.5
+        uses: cargo-bins/cargo-binstall@38e8f5e4c386b611d51e8aa997b9a06a3c8eb67a # v1.15.6
      - name: "Install cargo-fuzz"
        # Download the latest version from quick install and not the github releases because github releases only has MUSL targets.
        run: cargo binstall cargo-fuzz --force  --disable-strategies crate-meta-data --no-confirm
@@ -472,7 +472,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
        name: Download Ruff binary to test
        id: download-cached-binary
@@ -506,7 +506,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - name: "Install Rust toolchain"
        run: rustup component add rustfmt
      # Run all code generation scripts, and verify that the current output is
@@ -673,7 +673,7 @@ jobs:
          branch: ${{ github.event.pull_request.base.ref }}
          workflow: "ci.yaml"
          check_artifacts: true
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
      - name: Fuzz
        env:
          FORCE_COLOR: 1
@@ -703,7 +703,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@20aa316bab4942180bbbabe93237858e8d77f1ed # v1.15.5
+      - uses: cargo-bins/cargo-binstall@38e8f5e4c386b611d51e8aa997b9a06a3c8eb67a # v1.15.6
      - run: cargo binstall --no-confirm cargo-shear
      - run: cargo shear

@@ -720,7 +720,7 @@ jobs:
        with:
          python-version: ${{ env.PYTHON_VERSION }}
          architecture: x64
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - name: "Prep README.md"
        run: python scripts/transform_readme.py --target pypi
      - name: "Build wheels"
@@ -743,8 +743,8 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
        with:
          node-version: 22
@@ -777,7 +777,7 @@ jobs:
      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: "3.13"
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - name: "Add SSH key"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
@@ -786,7 +786,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: Install uv
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
      - name: "Install Insiders dependencies"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
        run: uv pip install -r docs/requirements-insiders.txt --system
@@ -816,7 +816,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Run checks"
@@ -886,7 +886,7 @@ jobs:
          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
        with:
          node-version: 22
@@ -920,22 +920,22 @@ jobs:
        with:
          persist-credentials: false

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0

      - name: "Install Rust toolchain"
        run: rustup show

      - name: "Install codspeed"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
        with:
          tool: cargo-codspeed

      - name: "Build benchmarks"
-        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark formatter lexer linter parser
+        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark --bench formatter --bench lexer --bench linter --bench parser

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@653fdc30e6c40ffd9739e40c8a0576f4f4523ca1 # v4.0.1
+        uses: CodSpeedHQ/action@3959e9e296ef25296e93e32afcc97196f966e57f # v4.1.0
        with:
          mode: instrumentation
          run: cargo codspeed run
@@ -955,22 +955,22 @@ jobs:
        with:
          persist-credentials: false

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0

      - name: "Install Rust toolchain"
        run: rustup show

      - name: "Install codspeed"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
        with:
          tool: cargo-codspeed

      - name: "Build benchmarks"
-        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark ty
+        run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark --bench ty

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@653fdc30e6c40ffd9739e40c8a0576f4f4523ca1 # v4.0.1
+        uses: CodSpeedHQ/action@3959e9e296ef25296e93e32afcc97196f966e57f # v4.1.0
        with:
          mode: instrumentation
          run: cargo codspeed run
@@ -989,14 +989,14 @@ jobs:
        with:
          persist-credentials: false

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0

      - name: "Install Rust toolchain"
        run: rustup show

      - name: "Install codspeed"
-        uses: taiki-e/install-action@67cc679904bee382389bf22082124fa963c6f6bd # v2.61.3
+        uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
        with:
          tool: cargo-codspeed

@@ -1004,7 +1004,7 @@ jobs:
        run: cargo codspeed build --features "codspeed,walltime" --no-default-features -p ruff_benchmark

      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@653fdc30e6c40ffd9739e40c8a0576f4f4523ca1 # v4.0.1
+        uses: CodSpeedHQ/action@3959e9e296ef25296e93e32afcc97196f966e57f # v4.1.0
        env:
          # enabling walltime flamegraphs adds ~6 minutes to the CI time, and they don't
          # appear to provide much useful insight for our walltime benchmarks right now
--- a/.github/workflows/daily_fuzz.yaml
+++ b/.github/workflows/daily_fuzz.yaml
@@ -34,12 +34,12 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
      - name: Build ruff
        # A debug build means the script runs slower once it gets started,
        # but this is outweighed by the fact that a release build takes *much* longer to compile in CI
--- a/.github/workflows/mypy_primer.yaml
+++ b/.github/workflows/mypy_primer.yaml
@@ -39,9 +39,9 @@ jobs:
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          workspaces: "ruff"

@@ -82,9 +82,9 @@ jobs:
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          workspaces: "ruff"

--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -68,7 +68,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1

      - name: "Install Insiders dependencies"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@@ -22,7 +22,7 @@ jobs:
      id-token: write
    steps:
      - name: "Install uv"
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
      - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
        with:
          pattern: wheels-*
--- a/.github/workflows/sync_typeshed.yaml
+++ b/.github/workflows/sync_typeshed.yaml
@@ -65,7 +65,7 @@ jobs:
        run: |
          git config --global user.name typeshedbot
          git config --global user.email '<>'
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
      - name: Sync typeshed stubs
        run: |
          rm -rf "ruff/${VENDORED_TYPESHED}"
@@ -117,7 +117,7 @@ jobs:
        with:
          persist-credentials: true
          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
      - name: Setup git
        run: |
          git config --global user.name typeshedbot
@@ -155,7 +155,7 @@ jobs:
        with:
          persist-credentials: true
          ref: ${{ env.UPSTREAM_BRANCH}}
-      - uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+      - uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
      - name: Setup git
        run: |
          git config --global user.name typeshedbot
--- a/.github/workflows/ty-ecosystem-analyzer.yaml
+++ b/.github/workflows/ty-ecosystem-analyzer.yaml
@@ -33,9 +33,9 @@ jobs:
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          workspaces: "ruff"

@@ -64,7 +64,7 @@ jobs:

          cd ..

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

          ecosystem-analyzer \
            --repository ruff \
@@ -95,6 +95,14 @@ jobs:
            --new-name "$REF_NAME" \
            --output diff-statistics.md

+          ecosystem-analyzer \
+            generate-timing-diff \
+            diagnostics-old.json \
+            diagnostics-new.json \
+            --old-name "main (merge base)" \
+            --new-name "$REF_NAME" \
+            --output-html dist/timing.html
+
          echo '## `ecosystem-analyzer` results' > comment.md
          echo >> comment.md
          cat diff-statistics.md >> comment.md
@@ -118,7 +126,7 @@ jobs:
          DEPLOYMENT_URL: ${{ steps.deploy.outputs.pages-deployment-alias-url }}
        run: |
          echo >> comment.md
-          echo "**[Full report with detailed diff]($DEPLOYMENT_URL/diff)**" >> comment.md
+          echo "**[Full report with detailed diff]($DEPLOYMENT_URL/diff)** ([timing results]($DEPLOYMENT_URL/timing))" >> comment.md

      - name: Upload comment
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -137,3 +145,9 @@ jobs:
        with:
          name: diff.html
          path: dist/diff.html
+
+      - name: Upload timing diff
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: timing.html
+          path: dist/timing.html
--- a/.github/workflows/ty-ecosystem-report.yaml
+++ b/.github/workflows/ty-ecosystem-report.yaml
@@ -29,9 +29,9 @@ jobs:
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@b75a909f75acd358c2196fb9a5f1299a9a8868a4 # v6.7.0
+        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          workspaces: "ruff"

@@ -49,12 +49,13 @@ jobs:

          cd ..

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

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

@@ -62,7 +63,7 @@ jobs:

          ecosystem-analyzer \
            generate-report \
-            --max-diagnostics-per-project=1200 \
+            --max-diagnostics-per-project=1000 \
            ecosystem-diagnostics.json \
            --output dist/index.html

--- a/.github/workflows/typing_conformance.yaml
+++ b/.github/workflows/typing_conformance.yaml
@@ -45,7 +45,7 @@ jobs:
          path: typing
          persist-credentials: false

-      - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
+      - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
        with:
          workspaces: "ruff"

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,96 @@
 # Changelog

+## 0.13.3
+
+Released on 2025-10-02.
+
+### Preview features
+
+- Display diffs for `ruff format --check` and add support for different output formats ([#20443](https://github.com/astral-sh/ruff/pull/20443))
+- \[`pyflakes`\] Handle some common submodule import situations for `unused-import` (`F401`) ([#20200](https://github.com/astral-sh/ruff/pull/20200))
+- \[`ruff`\] Do not flag `%r` + `repr()` combinations (`RUF065`) ([#20600](https://github.com/astral-sh/ruff/pull/20600))
+
+### Bug fixes
+
+- \[`cli`\] Add conflict between `--add-noqa` and `--diff` options ([#20642](https://github.com/astral-sh/ruff/pull/20642))
+- \[`pylint`\] Exempt required imports from `PLR0402` ([#20381](https://github.com/astral-sh/ruff/pull/20381))
+- \[`pylint`\] Fix missing `max-nested-blocks` in settings display ([#20574](https://github.com/astral-sh/ruff/pull/20574))
+- \[`pyupgrade`\] Prevent infinite loop with `I002` and `UP026` ([#20634](https://github.com/astral-sh/ruff/pull/20634))
+
+### Rule changes
+
+- \[`flake8-simplify`\] Improve help message clarity (`SIM105`) ([#20548](https://github.com/astral-sh/ruff/pull/20548))
+
+### Documentation
+
+- Add the *The Basics* title back to CONTRIBUTING.md ([#20624](https://github.com/astral-sh/ruff/pull/20624))
+- Fixed documentation for try_consider_else ([#20587](https://github.com/astral-sh/ruff/pull/20587))
+- \[`isort`\] Clarify dependency between `order-by-type` and `case-sensitive` settings ([#20559](https://github.com/astral-sh/ruff/pull/20559))
+- \[`pylint`\] Clarify fix safety to include left-hand hashability (`PLR6201`) ([#20518](https://github.com/astral-sh/ruff/pull/20518))
+
+### Other changes
+
+- \[`playground`\] Fix quick fixes for empty ranges in playground ([#20599](https://github.com/astral-sh/ruff/pull/20599))
+
+### Contributors
+
+- [@TaKO8Ki](https://github.com/TaKO8Ki)
+- [@ntBre](https://github.com/ntBre)
+- [@dylwil3](https://github.com/dylwil3)
+- [@MichaReiser](https://github.com/MichaReiser)
+- [@danparizher](https://github.com/danparizher)
+- [@LilMonk](https://github.com/LilMonk)
+- [@mgiovani](https://github.com/mgiovani)
+- [@IDrokin117](https://github.com/IDrokin117)
+
+## 0.13.2
+
+Released on 2025-09-25.
+
+### Preview features
+
+- \[`flake8-async`\] Implement `blocking-path-method` (`ASYNC240`) ([#20264](https://github.com/astral-sh/ruff/pull/20264))
+- \[`flake8-bugbear`\] Implement `map-without-explicit-strict` (`B912`) ([#20429](https://github.com/astral-sh/ruff/pull/20429))
+- \[`flake8-bultins`\] Detect class-scope builtin shadowing in decorators, default args, and attribute initializers (`A003`) ([#20178](https://github.com/astral-sh/ruff/pull/20178))
+- \[`ruff`\] Implement `logging-eager-conversion` (`RUF065`) ([#19942](https://github.com/astral-sh/ruff/pull/19942))
+- Include `.pyw` files by default when linting and formatting ([#20458](https://github.com/astral-sh/ruff/pull/20458))
+
+### Bug fixes
+
+- Deduplicate input paths ([#20105](https://github.com/astral-sh/ruff/pull/20105))
+- \[`flake8-comprehensions`\] Preserve trailing commas for single-element lists (`C409`) ([#19571](https://github.com/astral-sh/ruff/pull/19571))
+- \[`flake8-pyi`\] Avoid syntax error from conflict with `PIE790` (`PYI021`) ([#20010](https://github.com/astral-sh/ruff/pull/20010))
+- \[`flake8-simplify`\] Correct fix for positive `maxsplit` without separator (`SIM905`) ([#20056](https://github.com/astral-sh/ruff/pull/20056))
+- \[`pyupgrade`\] Fix `UP008` not to apply when `__class__` is a local variable ([#20497](https://github.com/astral-sh/ruff/pull/20497))
+- \[`ruff`\] Fix `B004` to skip invalid `hasattr`/`getattr` calls ([#20486](https://github.com/astral-sh/ruff/pull/20486))
+- \[`ruff`\] Replace `-nan` with `nan` when using the value to construct a `Decimal` (`FURB164` ) ([#20391](https://github.com/astral-sh/ruff/pull/20391))
+
+### Documentation
+
+- Add 'Finding ways to help' to CONTRIBUTING.md ([#20567](https://github.com/astral-sh/ruff/pull/20567))
+- Update import path to `ruff-wasm-web` ([#20539](https://github.com/astral-sh/ruff/pull/20539))
+- \[`flake8-bandit`\] Clarify the supported hashing functions (`S324`) ([#20534](https://github.com/astral-sh/ruff/pull/20534))
+
+### Other changes
+
+- \[`playground`\] Allow hover quick fixes to appear for overlapping diagnostics ([#20527](https://github.com/astral-sh/ruff/pull/20527))
+- \[`playground`\] Fix non‑BMP code point handling in quick fixes and markers ([#20526](https://github.com/astral-sh/ruff/pull/20526))
+
+### Contributors
+
+- [@BurntSushi](https://github.com/BurntSushi)
+- [@mtshiba](https://github.com/mtshiba)
+- [@second-ed](https://github.com/second-ed)
+- [@danparizher](https://github.com/danparizher)
+- [@ShikChen](https://github.com/ShikChen)
+- [@PieterCK](https://github.com/PieterCK)
+- [@GDYendell](https://github.com/GDYendell)
+- [@RazerM](https://github.com/RazerM)
+- [@TaKO8Ki](https://github.com/TaKO8Ki)
+- [@amyreese](https://github.com/amyreese)
+- [@ntbre](https://github.com/ntBre)
+- [@MichaReiser](https://github.com/MichaReiser)
+
 ## 0.13.1

 Released on 2025-09-18.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,22 +7,38 @@ Welcome! We're happy to have you here. Thank you in advance for your contributio
 > This guide is for Ruff. If you're looking to contribute to ty, please see [the ty contributing
 > guide](https://github.com/astral-sh/ruff/blob/main/crates/ty/CONTRIBUTING.md).

+## Finding ways to help
+
+We label issues that would be good for a first time contributor as
+[`good first issue`](https://github.com/astral-sh/ruff/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22).
+These usually do not require significant experience with Rust or the Ruff code base.
+
+We label issues that we think are a good opportunity for subsequent contributions as
+[`help wanted`](https://github.com/astral-sh/ruff/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22).
+These require varying levels of experience with Rust and Ruff. Often, we want to accomplish these
+tasks but do not have the resources to do so ourselves.
+
+You don't need our permission to start on an issue we have labeled as appropriate for community
+contribution as described above. However, it's a good idea to indicate that you are going to work on
+an issue to avoid concurrent attempts to solve the same problem.
+
+Please check in with us before starting work on an issue that has not been labeled as appropriate
+for community contribution. We're happy to receive contributions for other issues, but it's
+important to make sure we have consensus on the solution to the problem first.
+
+Outside of issues with the labels above, issues labeled as
+[`bug`](https://github.com/astral-sh/ruff/issues?q=is%3Aopen+is%3Aissue+label%3A%22bug%22) are the
+best candidates for contribution. In contrast, issues labeled with `needs-decision` or
+`needs-design` are _not_ good candidates for contribution. Please do not open pull requests for
+issues with these labels.
+
+Please do not open pull requests for new features without prior discussion. While we appreciate
+exploration of new features, we will often close these pull requests immediately. Adding a
+new feature to ruff creates a long-term maintenance burden and requires strong consensus from the ruff
+team before it is appropriate to begin work on an implementation.
+
 ## The Basics

-Ruff welcomes contributions in the form of pull requests.
-
-For small changes (e.g., bug fixes), feel free to submit a PR.
-
-For larger changes (e.g., new lint rules, new functionality, new configuration options), consider
-creating an [**issue**](https://github.com/astral-sh/ruff/issues) outlining your proposed change.
-You can also join us on [Discord](https://discord.com/invite/astral-sh) to discuss your idea with the
-community. We've labeled [beginner-friendly tasks](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
-in the issue tracker, along with [bugs](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3Abug)
-and [improvements](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3Aaccepted)
-that are ready for contributions.
-
-If you have suggestions on how we might improve the contributing documentation, [let us know](https://github.com/astral-sh/ruff/discussions/5693)!
-
 ### Prerequisites

 Ruff is written in Rust. You'll need to install the
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2738,7 +2738,7 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.13.1"
+version = "0.13.3"
 dependencies = [
 "anyhow",
 "argfile",
@@ -2994,7 +2994,7 @@ dependencies = [

 [[package]]
 name = "ruff_linter"
-version = "0.13.1"
+version = "0.13.3"
 dependencies = [
 "aho-corasick",
 "anyhow",
@@ -3348,7 +3348,7 @@ dependencies = [

 [[package]]
 name = "ruff_wasm"
-version = "0.13.1"
+version = "0.13.3"
 dependencies = [
 "console_error_panic_hook",
 "console_log",
@@ -3463,7 +3463,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 [[package]]
 name = "salsa"
 version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=3713cd7eb30821c0c086591832dd6f59f2af7fe7#3713cd7eb30821c0c086591832dd6f59f2af7fe7"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=29ab321b45d00daa4315fa2a06f7207759a8c87e#29ab321b45d00daa4315fa2a06f7207759a8c87e"
 dependencies = [
 "boxcar",
 "compact_str",
@@ -3487,12 +3487,12 @@ dependencies = [
 [[package]]
 name = "salsa-macro-rules"
 version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=3713cd7eb30821c0c086591832dd6f59f2af7fe7#3713cd7eb30821c0c086591832dd6f59f2af7fe7"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=29ab321b45d00daa4315fa2a06f7207759a8c87e#29ab321b45d00daa4315fa2a06f7207759a8c87e"

 [[package]]
 name = "salsa-macros"
 version = "0.23.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=3713cd7eb30821c0c086591832dd6f59f2af7fe7#3713cd7eb30821c0c086591832dd6f59f2af7fe7"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=29ab321b45d00daa4315fa2a06f7207759a8c87e#29ab321b45d00daa4315fa2a06f7207759a8c87e"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4449,6 +4449,7 @@ dependencies = [
 "ruff_source_file",
 "ruff_text_size",
 "serde-wasm-bindgen",
+ "tracing",
 "ty_ide",
 "ty_project",
 "ty_python_semantic",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -144,7 +144,7 @@ regex-automata = { version = "0.4.9" }
 rustc-hash = { version = "2.0.0" }
 rustc-stable-hash = { version = "0.1.2" }
 # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
-salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "3713cd7eb30821c0c086591832dd6f59f2af7fe7", default-features = false, features = [
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "29ab321b45d00daa4315fa2a06f7207759a8c87e", default-features = false, features = [
    "compact_str",
    "macros",
    "salsa_unstable",
--- a/README.md
+++ b/README.md
@@ -148,8 +148,8 @@ curl -LsSf https://astral.sh/ruff/install.sh | sh
 powershell -c "irm https://astral.sh/ruff/install.ps1 | iex"

 # For a specific version.
-curl -LsSf https://astral.sh/ruff/0.13.1/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.13.1/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.13.3/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.13.3/install.ps1 | iex"
 ```

 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -182,7 +182,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
  # Ruff version.
-  rev: v0.13.1
+  rev: v0.13.3
  hooks:
    # Run the linter.
    - id: ruff-check
--- a/_typos.toml
+++ b/_typos.toml
@@ -31,6 +31,7 @@ extend-ignore-re = [
    "typ",
    # TODO: Remove this once the `TYP` redirects are removed from `rule_redirects.rs`
    "TYP",
+    "ntBre"
 ]

 [default.extend-identifiers]
--- a/crates/ruff/Cargo.toml
+++ b/crates/ruff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.13.1"
+version = "0.13.3"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }
--- a/crates/ruff/src/args.rs
+++ b/crates/ruff/src/args.rs
@@ -416,6 +416,7 @@ pub struct CheckCommand {
        conflicts_with = "stdin_filename",
        conflicts_with = "watch",
        conflicts_with = "fix",
+        conflicts_with = "diff",
    )]
    pub add_noqa: bool,
    /// See the files Ruff will be run against with the current settings.
@@ -537,6 +538,14 @@ pub struct FormatCommand {
    /// Exit with a non-zero status code if any files were modified via format, even if all files were formatted successfully.
    #[arg(long, help_heading = "Miscellaneous", alias = "exit-non-zero-on-fix")]
    pub exit_non_zero_on_format: bool,
+
+    /// Output serialization format for violations, when used with `--check`.
+    /// The default serialization format is "full".
+    ///
+    /// Note that this option is currently only respected in preview mode. A warning will be emitted
+    /// if this flag is used on stable.
+    #[arg(long, value_enum, env = "RUFF_OUTPUT_FORMAT")]
+    pub output_format: Option<OutputFormat>,
 }

 #[derive(Copy, Clone, Debug, clap::Parser)]
@@ -784,6 +793,7 @@ impl FormatCommand {
            target_version: self.target_version.map(ast::PythonVersion::from),
            cache_dir: self.cache_dir,
            extension: self.extension,
+            output_format: self.output_format,
            ..ExplicitConfigOverrides::default()
        };

--- a/crates/ruff/src/commands/check.rs
+++ b/crates/ruff/src/commands/check.rs
@@ -9,11 +9,10 @@ use ignore::Error;
 use log::{debug, warn};
 #[cfg(not(target_family = "wasm"))]
 use rayon::prelude::*;
+use ruff_linter::message::create_panic_diagnostic;
 use rustc_hash::FxHashMap;

-use ruff_db::diagnostic::{
-    Annotation, Diagnostic, DiagnosticId, Span, SubDiagnostic, SubDiagnosticSeverity,
-};
+use ruff_db::diagnostic::Diagnostic;
 use ruff_db::panic::catch_unwind;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::registry::Rule;
@@ -195,23 +194,7 @@ fn lint_path(
    match result {
        Ok(inner) => inner,
        Err(error) => {
-            let message = match error.payload.as_str() {
-                Some(summary) => format!("Fatal error while linting: {summary}"),
-                _ => "Fatal error while linting".to_owned(),
-            };
-            let mut diagnostic = Diagnostic::new(
-                DiagnosticId::Panic,
-                ruff_db::diagnostic::Severity::Fatal,
-                message,
-            );
-            let span = Span::from(SourceFileBuilder::new(path.to_string_lossy(), "").finish());
-            let mut annotation = Annotation::primary(span);
-            annotation.set_file_level(true);
-            diagnostic.annotate(annotation);
-            diagnostic.sub(SubDiagnostic::new(
-                SubDiagnosticSeverity::Info,
-                format!("{error}"),
-            ));
+            let diagnostic = create_panic_diagnostic(&error, Some(path));
            Ok(Diagnostics::new(vec![diagnostic], FxHashMap::default()))
        }
    }
@@ -227,7 +210,8 @@ mod test {
    use rustc_hash::FxHashMap;
    use tempfile::TempDir;

-    use ruff_linter::message::{Emitter, EmitterContext, TextEmitter};
+    use ruff_db::diagnostic::{DiagnosticFormat, DisplayDiagnosticConfig, DisplayDiagnostics};
+    use ruff_linter::message::EmitterContext;
    use ruff_linter::registry::Rule;
    use ruff_linter::settings::types::UnsafeFixes;
    use ruff_linter::settings::{LinterSettings, flags};
@@ -280,19 +264,16 @@ mod test {
            UnsafeFixes::Enabled,
        )
        .unwrap();
-        let mut output = Vec::new();

-        TextEmitter::default()
-            .with_show_fix_status(true)
-            .with_color(false)
-            .emit(
-                &mut output,
-                &diagnostics.inner,
-                &EmitterContext::new(&FxHashMap::default()),
-            )
-            .unwrap();
-
-        let messages = String::from_utf8(output).unwrap();
+        let config = DisplayDiagnosticConfig::default()
+            .format(DiagnosticFormat::Concise)
+            .hide_severity(true);
+        let messages = DisplayDiagnostics::new(
+            &EmitterContext::new(&FxHashMap::default()),
+            &config,
+            &diagnostics.inner,
+        )
+        .to_string();

        insta::with_settings!({
            omit_expression => true,
--- a/crates/ruff/src/commands/format.rs
+++ b/crates/ruff/src/commands/format.rs
@@ -11,13 +11,19 @@ use itertools::Itertools;
 use log::{error, warn};
 use rayon::iter::Either::{Left, Right};
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
+use ruff_db::diagnostic::{
+    Annotation, Diagnostic, DiagnosticId, DisplayDiagnosticConfig, Severity, Span,
+};
+use ruff_linter::message::{EmitterContext, create_panic_diagnostic, render_diagnostics};
+use ruff_linter::settings::types::OutputFormat;
+use ruff_notebook::NotebookIndex;
 use ruff_python_parser::ParseError;
-use rustc_hash::FxHashSet;
+use rustc_hash::{FxHashMap, FxHashSet};
 use thiserror::Error;
 use tracing::debug;

 use ruff_db::panic::{PanicError, catch_unwind};
-use ruff_diagnostics::SourceMap;
+use ruff_diagnostics::{Edit, Fix, SourceMap};
 use ruff_linter::fs;
 use ruff_linter::logging::{DisplayParseError, LogLevel};
 use ruff_linter::package::PackageRoot;
@@ -27,14 +33,15 @@ use ruff_linter::source_kind::{SourceError, SourceKind};
 use ruff_linter::warn_user_once;
 use ruff_python_ast::{PySourceType, SourceType};
 use ruff_python_formatter::{FormatModuleError, QuoteStyle, format_module_source, format_range};
-use ruff_source_file::LineIndex;
+use ruff_source_file::{LineIndex, LineRanges, OneIndexed, SourceFileBuilder};
 use ruff_text_size::{TextLen, TextRange, TextSize};
 use ruff_workspace::FormatterSettings;
-use ruff_workspace::resolver::{ResolvedFile, Resolver, match_exclusion, python_files_in_path};
+use ruff_workspace::resolver::{
+    PyprojectConfig, ResolvedFile, Resolver, match_exclusion, python_files_in_path,
+};

 use crate::args::{ConfigArguments, FormatArguments, FormatRange};
 use crate::cache::{Cache, FileCacheKey, PackageCacheMap, PackageCaches};
-use crate::resolve::resolve;
 use crate::{ExitStatus, resolve_default_files};

 #[derive(Debug, Copy, Clone, is_macro::Is)]
@@ -63,11 +70,14 @@ impl FormatMode {
 pub(crate) fn format(
    cli: FormatArguments,
    config_arguments: &ConfigArguments,
+    pyproject_config: &PyprojectConfig,
 ) -> Result<ExitStatus> {
-    let pyproject_config = resolve(config_arguments, cli.stdin_filename.as_deref())?;
    let mode = FormatMode::from_cli(&cli);
    let files = resolve_default_files(cli.files, false);
-    let (paths, resolver) = python_files_in_path(&files, &pyproject_config, config_arguments)?;
+    let (paths, resolver) = python_files_in_path(&files, pyproject_config, config_arguments)?;
+
+    let output_format = pyproject_config.settings.output_format;
+    let preview = pyproject_config.settings.formatter.preview;

    if paths.is_empty() {
        warn_user_once!("No Python files found under the given path(s)");
@@ -184,17 +194,26 @@ pub(crate) fn format(
    caches.persist()?;

    // Report on any errors.
-    errors.sort_unstable_by(|a, b| a.path().cmp(&b.path()));
+    //
+    // We only convert errors to `Diagnostic`s in `Check` mode with preview enabled, otherwise we
+    // fall back on printing simple messages.
+    if !(preview.is_enabled() && mode.is_check()) {
+        errors.sort_unstable_by(|a, b| a.path().cmp(&b.path()));

-    for error in &errors {
-        error!("{error}");
+        for error in &errors {
+            error!("{error}");
+        }
    }

    let results = FormatResults::new(results.as_slice(), mode);
    match mode {
        FormatMode::Write => {}
        FormatMode::Check => {
-            results.write_changed(&mut stdout().lock())?;
+            if preview.is_enabled() {
+                results.write_changed_preview(&mut stdout().lock(), output_format, &errors)?;
+            } else {
+                results.write_changed(&mut stdout().lock())?;
+            }
        }
        FormatMode::Diff => {
            results.write_diff(&mut stdout().lock())?;
@@ -206,7 +225,7 @@ pub(crate) fn format(
        if mode.is_diff() {
            // Allow piping the diff to e.g. a file by writing the summary to stderr
            results.write_summary(&mut stderr().lock())?;
-        } else {
+        } else if !preview.is_enabled() || output_format.is_human_readable() {
            results.write_summary(&mut stdout().lock())?;
        }
    }
@@ -295,8 +314,7 @@ pub(crate) fn format_path(

                FormatResult::Formatted
            }
-            FormatMode::Check => FormatResult::Formatted,
-            FormatMode::Diff => FormatResult::Diff {
+            FormatMode::Check | FormatMode::Diff => FormatResult::Diff {
                unformatted,
                formatted,
            },
@@ -329,7 +347,7 @@ pub(crate) enum FormattedSource {
 impl From<FormattedSource> for FormatResult {
    fn from(value: FormattedSource) -> Self {
        match value {
-            FormattedSource::Formatted(_) => FormatResult::Formatted,
+            FormattedSource::Formatted { .. } => FormatResult::Formatted,
            FormattedSource::Unchanged => FormatResult::Unchanged,
        }
    }
@@ -477,10 +495,10 @@ pub(crate) fn format_source(
 /// The result of an individual formatting operation.
 #[derive(Debug, Clone, is_macro::Is)]
 pub(crate) enum FormatResult {
-    /// The file was formatted.
+    /// The file was formatted and written back to disk.
    Formatted,

-    /// The file was formatted, [`SourceKind`] contains the formatted code
+    /// The file needs to be formatted, as the `formatted` and `unformatted` contents differ.
    Diff {
        unformatted: SourceKind,
        formatted: SourceKind,
@@ -552,7 +570,7 @@ impl<'a> FormatResults<'a> {
            .results
            .iter()
            .filter_map(|result| {
-                if result.result.is_formatted() {
+                if result.result.is_diff() {
                    Some(result.path.as_path())
                } else {
                    None
@@ -566,6 +584,30 @@ impl<'a> FormatResults<'a> {
        Ok(())
    }

+    /// Write a list of the files that would be changed and any errors to the given writer.
+    fn write_changed_preview(
+        &self,
+        f: &mut impl Write,
+        output_format: OutputFormat,
+        errors: &[FormatCommandError],
+    ) -> io::Result<()> {
+        let mut notebook_index = FxHashMap::default();
+        let diagnostics: Vec<_> = errors
+            .iter()
+            .map(Diagnostic::from)
+            .chain(self.to_diagnostics(&mut notebook_index))
+            .sorted_unstable_by(Diagnostic::ruff_start_ordering)
+            .collect();
+
+        let context = EmitterContext::new(&notebook_index);
+        let config = DisplayDiagnosticConfig::default()
+            .hide_severity(true)
+            .show_fix_diff(true)
+            .color(!cfg!(test) && colored::control::SHOULD_COLORIZE.should_colorize());
+
+        render_diagnostics(f, output_format, config, &context, &diagnostics)
+    }
+
    /// Write a summary of the formatting results to the given writer.
    fn write_summary(&self, f: &mut impl Write) -> io::Result<()> {
        // Compute the number of changed and unchanged files.
@@ -628,6 +670,155 @@ impl<'a> FormatResults<'a> {
            Ok(())
        }
    }
+
+    /// Convert formatted files into [`Diagnostic`]s.
+    fn to_diagnostics(
+        &self,
+        notebook_index: &mut FxHashMap<String, NotebookIndex>,
+    ) -> impl Iterator<Item = Diagnostic> {
+        /// The number of unmodified context lines rendered in diffs.
+        ///
+        /// Note that this should be kept in sync with the argument to `TextDiff::grouped_ops` in
+        /// the diff rendering in `ruff_db` (currently 3). The `similar` crate uses two times that
+        /// argument as a cutoff for rendering unmodified lines.
+        const CONTEXT_LINES: u32 = 6;
+
+        self.results.iter().filter_map(|result| {
+            let (unformatted, formatted) = match &result.result {
+                FormatResult::Skipped | FormatResult::Unchanged => return None,
+                FormatResult::Diff {
+                    unformatted,
+                    formatted,
+                } => (unformatted, formatted),
+                FormatResult::Formatted => {
+                    debug_assert!(
+                        false,
+                        "Expected `FormatResult::Diff` for changed files in check mode"
+                    );
+                    return None;
+                }
+            };
+
+            let mut diagnostic = Diagnostic::new(
+                DiagnosticId::Unformatted,
+                Severity::Error,
+                "File would be reformatted",
+            );
+
+            // Locate the first and last characters that differ to use as the diagnostic
+            // range and to narrow the `Edit` range.
+            let modified_range = ModifiedRange::new(unformatted, formatted);
+
+            let path = result.path.to_string_lossy();
+            // For scripts, this is a single `Edit` using the `ModifiedRange` above, but notebook
+            // edits must be split by cell in order to render them as diffs.
+            //
+            // We also attempt to estimate the line number width for aligning the
+            // annotate-snippets header. This is only an estimate because we don't actually know
+            // if the maximum line number present in the document will be rendered as part of
+            // the diff, either as a changed line or as an unchanged context line. For
+            // notebooks, we refine our estimate by checking the number of lines in each cell
+            // individually, otherwise we could use `formatted.source_code().count_lines(...)`
+            // in both cases.
+            let (fix, line_count) = if let SourceKind::IpyNotebook(formatted) = formatted
+                && let SourceKind::IpyNotebook(unformatted) = unformatted
+            {
+                notebook_index.insert(path.to_string(), unformatted.index().clone());
+
+                let mut edits = formatted
+                    .cell_offsets()
+                    .ranges()
+                    .zip(unformatted.cell_offsets().ranges())
+                    .filter_map(|(formatted_range, unformatted_range)| {
+                        // Filter out cells that weren't modified. We use `intersect` instead of
+                        // `contains_range` because the full modified range might start or end in
+                        // the middle of a cell:
+                        //
+                        // ```
+                        // | cell 1 | cell 2 | cell 3 |
+                        //     |----------------| modified range
+                        // ```
+                        //
+                        // The intersection will be `Some` for all three cells in this case.
+                        if modified_range
+                            .unformatted
+                            .intersect(unformatted_range)
+                            .is_some()
+                        {
+                            let formatted = &formatted.source_code()[formatted_range];
+                            let edit = if formatted.is_empty() {
+                                Edit::range_deletion(unformatted_range)
+                            } else {
+                                Edit::range_replacement(formatted.to_string(), unformatted_range)
+                            };
+                            Some(edit)
+                        } else {
+                            None
+                        }
+                    });
+
+                let fix = Fix::safe_edits(
+                    edits
+                        .next()
+                        .expect("Formatted files must have at least one edit"),
+                    edits,
+                );
+                let source = formatted.source_code();
+                let line_count = formatted
+                    .cell_offsets()
+                    .ranges()
+                    .filter_map(|range| {
+                        if modified_range.formatted.contains_range(range) {
+                            Some(source.count_lines(range))
+                        } else {
+                            None
+                        }
+                    })
+                    .max()
+                    .unwrap_or_default();
+                (fix, line_count)
+            } else {
+                let formatted_code = &formatted.source_code()[modified_range.formatted];
+                let edit = if formatted_code.is_empty() {
+                    Edit::range_deletion(modified_range.unformatted)
+                } else {
+                    Edit::range_replacement(formatted_code.to_string(), modified_range.unformatted)
+                };
+                let fix = Fix::safe_edit(edit);
+                let line_count = formatted
+                    .source_code()
+                    .count_lines(TextRange::up_to(modified_range.formatted.end()));
+                (fix, line_count)
+            };
+
+            let source_file = SourceFileBuilder::new(path, unformatted.source_code()).finish();
+            let span = Span::from(source_file).with_range(modified_range.unformatted);
+            let mut annotation = Annotation::primary(span);
+            annotation.hide_snippet(true);
+            diagnostic.annotate(annotation);
+            diagnostic.set_fix(fix);
+
+            // TODO(brent) this offset is a hack to get the header of the diagnostic message, which
+            // is rendered by our fork of `annotate-snippets`, to align with our manually-rendered
+            // diff. `annotate-snippets` computes the alignment of the arrow in the header based on
+            // the maximum line number width in its rendered snippet. However, we don't have a
+            // reasonable range to underline in an annotation, so we don't send `annotate-snippets`
+            // a snippet to measure. If we commit to staying on our fork, a more robust way of
+            // handling this would be to move the diff rendering in
+            // `ruff_db::diagnostic::render::full` into `annotate-snippets`, likely as another
+            // `DisplayLine` variant and update the `lineno_width` calculation in
+            // `DisplayList::fmt`. That would handle this offset "automatically."
+            let line_count = (line_count + CONTEXT_LINES).min(
+                formatted
+                    .source_code()
+                    .count_lines(TextRange::up_to(formatted.source_code().text_len())),
+            );
+            let lines = OneIndexed::new(line_count as usize).unwrap_or_default();
+            diagnostic.set_header_offset(lines.digits().get());
+
+            Some(diagnostic)
+        })
+    }
 }

 /// An error that can occur while formatting a set of files.
@@ -639,7 +830,6 @@ pub(crate) enum FormatCommandError {
    Read(Option<PathBuf>, SourceError),
    Format(Option<PathBuf>, FormatModuleError),
    Write(Option<PathBuf>, SourceError),
-    Diff(Option<PathBuf>, io::Error),
    RangeFormatNotebook(Option<PathBuf>),
 }

@@ -658,12 +848,65 @@ impl FormatCommandError {
            | Self::Read(path, _)
            | Self::Format(path, _)
            | Self::Write(path, _)
-            | Self::Diff(path, _)
            | Self::RangeFormatNotebook(path) => path.as_deref(),
        }
    }
 }

+impl From<&FormatCommandError> for Diagnostic {
+    fn from(error: &FormatCommandError) -> Self {
+        let annotation = error.path().map(|path| {
+            let file = SourceFileBuilder::new(path.to_string_lossy(), "").finish();
+            let span = Span::from(file);
+            let mut annotation = Annotation::primary(span);
+            annotation.hide_snippet(true);
+            annotation
+        });
+
+        let mut diagnostic = match error {
+            FormatCommandError::Ignore(error) => {
+                Diagnostic::new(DiagnosticId::Io, Severity::Error, error)
+            }
+            FormatCommandError::Parse(display_parse_error) => Diagnostic::new(
+                DiagnosticId::InvalidSyntax,
+                Severity::Error,
+                &display_parse_error.error().error,
+            ),
+            FormatCommandError::Panic(path, panic_error) => {
+                return create_panic_diagnostic(panic_error, path.as_deref());
+            }
+            FormatCommandError::Read(_, source_error)
+            | FormatCommandError::Write(_, source_error) => {
+                Diagnostic::new(DiagnosticId::Io, Severity::Error, source_error)
+            }
+            FormatCommandError::Format(_, format_module_error) => match format_module_error {
+                FormatModuleError::ParseError(parse_error) => Diagnostic::new(
+                    DiagnosticId::InternalError,
+                    Severity::Error,
+                    &parse_error.error,
+                ),
+                FormatModuleError::FormatError(format_error) => {
+                    Diagnostic::new(DiagnosticId::InternalError, Severity::Error, format_error)
+                }
+                FormatModuleError::PrintError(print_error) => {
+                    Diagnostic::new(DiagnosticId::InternalError, Severity::Error, print_error)
+                }
+            },
+            FormatCommandError::RangeFormatNotebook(_) => Diagnostic::new(
+                DiagnosticId::InvalidCliOption,
+                Severity::Error,
+                "Range formatting isn't supported for notebooks.",
+            ),
+        };
+
+        if let Some(annotation) = annotation {
+            diagnostic.annotate(annotation);
+        }
+
+        diagnostic
+    }
+}
+
 impl Display for FormatCommandError {
    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
        match self {
@@ -731,23 +974,6 @@ impl Display for FormatCommandError {
                    write!(f, "{header} {err}", header = "Failed to format:".bold())
                }
            }
-            Self::Diff(path, err) => {
-                if let Some(path) = path {
-                    write!(
-                        f,
-                        "{}{}{} {err}",
-                        "Failed to generate diff for ".bold(),
-                        fs::relativize_path(path).bold(),
-                        ":".bold()
-                    )
-                } else {
-                    write!(
-                        f,
-                        "{header} {err}",
-                        header = "Failed to generate diff:".bold(),
-                    )
-                }
-            }
            Self::RangeFormatNotebook(path) => {
                if let Some(path) = path {
                    write!(
@@ -792,6 +1018,54 @@ impl Display for FormatCommandError {
    }
 }

+#[derive(Debug)]
+struct ModifiedRange {
+    unformatted: TextRange,
+    formatted: TextRange,
+}
+
+impl ModifiedRange {
+    /// Determine the range that differs between `unformatted` and `formatted`.
+    ///
+    /// If the two inputs are equal, the returned ranges will be empty.
+    fn new(unformatted: &SourceKind, formatted: &SourceKind) -> Self {
+        let unformatted = unformatted.source_code();
+        let formatted = formatted.source_code();
+
+        let mut prefix_length = TextSize::ZERO;
+        for (unformatted, formatted) in unformatted.chars().zip(formatted.chars()) {
+            if unformatted != formatted {
+                break;
+            }
+            prefix_length += unformatted.text_len();
+        }
+
+        // For the ends of the ranges, track the length of the common suffix and then subtract that
+        // from each total text length. Unlike for `start`, the character offsets are very unlikely
+        // to be equal, so they need to be treated separately.
+        let mut suffix_length = TextSize::ZERO;
+        for (old, new) in unformatted[prefix_length.to_usize()..]
+            .chars()
+            .rev()
+            .zip(formatted[prefix_length.to_usize()..].chars().rev())
+        {
+            if old != new {
+                break;
+            }
+            suffix_length += old.text_len();
+        }
+
+        let unformatted_range =
+            TextRange::new(prefix_length, unformatted.text_len() - suffix_length);
+        let formatted_range = TextRange::new(prefix_length, formatted.text_len() - suffix_length);
+
+        Self {
+            unformatted: unformatted_range,
+            formatted: formatted_range,
+        }
+    }
+}
+
 pub(super) fn warn_incompatible_formatter_settings(resolver: &Resolver) {
    // First, collect all rules that are incompatible regardless of the linter-specific settings.
    let mut incompatible_rules = FxHashSet::default();
@@ -963,3 +1237,144 @@ pub(super) fn warn_incompatible_formatter_settings(resolver: &Resolver) {
        }
    }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::io;
+    use std::ops::Range;
+    use std::path::PathBuf;
+
+    use ignore::Error;
+    use insta::assert_snapshot;
+
+    use ruff_db::panic::catch_unwind;
+    use ruff_linter::logging::DisplayParseError;
+    use ruff_linter::source_kind::{SourceError, SourceKind};
+    use ruff_python_formatter::FormatModuleError;
+    use ruff_python_parser::{ParseError, ParseErrorType};
+    use ruff_text_size::{TextRange, TextSize};
+    use test_case::test_case;
+
+    use crate::commands::format::{FormatCommandError, FormatMode, FormatResults, ModifiedRange};
+
+    #[test]
+    fn error_diagnostics() -> anyhow::Result<()> {
+        let path = PathBuf::from("test.py");
+        let source_kind = SourceKind::Python("1".to_string());
+
+        let panic_error = catch_unwind(|| {
+            panic!("Test panic for FormatCommandError");
+        })
+        .unwrap_err();
+
+        let errors = [
+            FormatCommandError::Ignore(Error::WithPath {
+                path: path.clone(),
+                err: Box::new(Error::Io(io::Error::new(
+                    io::ErrorKind::PermissionDenied,
+                    "Permission denied",
+                ))),
+            }),
+            FormatCommandError::Parse(DisplayParseError::from_source_kind(
+                ParseError {
+                    error: ParseErrorType::UnexpectedIndentation,
+                    location: TextRange::default(),
+                },
+                Some(path.clone()),
+                &source_kind,
+            )),
+            FormatCommandError::Panic(Some(path.clone()), Box::new(panic_error)),
+            FormatCommandError::Read(
+                Some(path.clone()),
+                SourceError::Io(io::Error::new(io::ErrorKind::NotFound, "File not found")),
+            ),
+            FormatCommandError::Format(
+                Some(path.clone()),
+                FormatModuleError::ParseError(ParseError {
+                    error: ParseErrorType::EmptySlice,
+                    location: TextRange::default(),
+                }),
+            ),
+            FormatCommandError::Write(
+                Some(path.clone()),
+                SourceError::Io(io::Error::new(
+                    io::ErrorKind::PermissionDenied,
+                    "Cannot write to file",
+                )),
+            ),
+            FormatCommandError::RangeFormatNotebook(Some(path)),
+        ];
+
+        let results = FormatResults::new(&[], FormatMode::Check);
+        let mut buf = Vec::new();
+        results.write_changed_preview(
+            &mut buf,
+            ruff_linter::settings::types::OutputFormat::Full,
+            &errors,
+        )?;
+
+        let mut settings = insta::Settings::clone_current();
+        settings.add_filter(r"(Panicked at) [^:]+:\d+:\d+", "$1 <location>");
+        let _s = settings.bind_to_scope();
+
+        assert_snapshot!(str::from_utf8(&buf)?, @r"
+        io: test.py: Permission denied
+        --> test.py:1:1
+
+        invalid-syntax: Unexpected indentation
+        --> test.py:1:1
+
+        io: File not found
+        --> test.py:1:1
+
+        internal-error: Expected index or slice expression
+        --> test.py:1:1
+
+        io: Cannot write to file
+        --> test.py:1:1
+
+        invalid-cli-option: Range formatting isn't supported for notebooks.
+        --> test.py:1:1
+
+        panic: Panicked at <location> when checking `test.py`: `Test panic for FormatCommandError`
+        --> test.py:1:1
+        info: This indicates a bug in Ruff.
+        info: If you could open an issue at https://github.com/astral-sh/ruff/issues/new?title=%5Bpanic%5D, we'd be very appreciative!
+        info: run with `RUST_BACKTRACE=1` environment variable to show the full backtrace information
+        ");
+
+        Ok(())
+    }
+
+    #[test_case("abcdef", "abcXYdef", 3..3, 3..5; "insertion")]
+    #[test_case("abcXYdef", "abcdef", 3..5, 3..3; "deletion")]
+    #[test_case("abcXdef", "abcYdef", 3..4, 3..4; "modification")]
+    #[test_case("abc", "abcX", 3..3, 3..4; "strict_prefix")]
+    #[test_case("", "", 0..0, 0..0; "empty")]
+    #[test_case("abc", "abc", 3..3, 3..3; "equal")]
+    fn modified_range(
+        unformatted: &str,
+        formatted: &str,
+        expect_unformatted: Range<u32>,
+        expect_formatted: Range<u32>,
+    ) {
+        let mr = ModifiedRange::new(
+            &SourceKind::Python(unformatted.to_string()),
+            &SourceKind::Python(formatted.to_string()),
+        );
+        assert_eq!(
+            mr.unformatted,
+            TextRange::new(
+                TextSize::new(expect_unformatted.start),
+                TextSize::new(expect_unformatted.end)
+            )
+        );
+        assert_eq!(
+            mr.formatted,
+            TextRange::new(
+                TextSize::new(expect_formatted.start),
+                TextSize::new(expect_formatted.end)
+            )
+        );
+    }
+}
--- a/crates/ruff/src/commands/format_stdin.rs
+++ b/crates/ruff/src/commands/format_stdin.rs
@@ -4,10 +4,10 @@ use std::path::Path;
 use anyhow::Result;
 use log::error;

-use ruff_linter::source_kind::SourceKind;
+use ruff_linter::source_kind::{SourceError, SourceKind};
 use ruff_python_ast::{PySourceType, SourceType};
 use ruff_workspace::FormatterSettings;
-use ruff_workspace::resolver::{Resolver, match_exclusion, python_file_at_path};
+use ruff_workspace::resolver::{PyprojectConfig, Resolver, match_exclusion, python_file_at_path};

 use crate::ExitStatus;
 use crate::args::{ConfigArguments, FormatArguments, FormatRange};
@@ -15,17 +15,15 @@ use crate::commands::format::{
    FormatCommandError, FormatMode, FormatResult, FormattedSource, format_source,
    warn_incompatible_formatter_settings,
 };
-use crate::resolve::resolve;
 use crate::stdin::{parrot_stdin, read_from_stdin};

 /// Run the formatter over a single file, read from `stdin`.
 pub(crate) fn format_stdin(
    cli: &FormatArguments,
    config_arguments: &ConfigArguments,
+    pyproject_config: &PyprojectConfig,
 ) -> Result<ExitStatus> {
-    let pyproject_config = resolve(config_arguments, cli.stdin_filename.as_deref())?;
-
-    let mut resolver = Resolver::new(&pyproject_config);
+    let mut resolver = Resolver::new(pyproject_config);
    warn_incompatible_formatter_settings(&resolver);

    let mode = FormatMode::from_cli(cli);
@@ -124,7 +122,9 @@ fn format_source_code(
                    "{}",
                    source_kind.diff(formatted, path).unwrap()
                )
-                .map_err(|err| FormatCommandError::Diff(path.map(Path::to_path_buf), err))?;
+                .map_err(|err| {
+                    FormatCommandError::Write(path.map(Path::to_path_buf), SourceError::Io(err))
+                })?;
            }
        },
        FormattedSource::Unchanged => {
--- a/crates/ruff/src/lib.rs
+++ b/crates/ruff/src/lib.rs
@@ -205,12 +205,18 @@ pub fn run(
 }

 fn format(args: FormatCommand, global_options: GlobalConfigArgs) -> Result<ExitStatus> {
+    let cli_output_format_set = args.output_format.is_some();
    let (cli, config_arguments) = args.partition(global_options)?;
-
+    let pyproject_config = resolve::resolve(&config_arguments, cli.stdin_filename.as_deref())?;
+    if cli_output_format_set && !pyproject_config.settings.formatter.preview.is_enabled() {
+        warn_user_once!(
+            "The --output-format flag for the formatter is unstable and requires preview mode to use."
+        );
+    }
    if is_stdin(&cli.files, cli.stdin_filename.as_deref()) {
-        commands::format_stdin::format_stdin(&cli, &config_arguments)
+        commands::format_stdin::format_stdin(&cli, &config_arguments, &pyproject_config)
    } else {
-        commands::format::format(cli, &config_arguments)
+        commands::format::format(cli, &config_arguments, &pyproject_config)
    }
 }

--- a/crates/ruff/src/main.rs
+++ b/crates/ruff/src/main.rs
@@ -1,6 +1,7 @@
 use std::io::Write;
 use std::process::ExitCode;

+use anyhow::Context;
 use clap::Parser;
 use colored::Colorize;

@@ -39,39 +40,46 @@ pub fn main() -> ExitCode {
    }

    let args = wild::args_os();
-    let args = argfile::expand_args_from(args, argfile::parse_fromfile, argfile::PREFIX).unwrap();
+    let args = match argfile::expand_args_from(args, argfile::parse_fromfile, argfile::PREFIX)
+        .context("Failed to read CLI arguments from files")
+    {
+        Ok(args) => args,
+        Err(err) => return report_error(&err),
+    };

    let args = Args::parse_from(args);

    match run(args) {
        Ok(code) => code.into(),
-        Err(err) => {
-            {
-                // Exit "gracefully" on broken pipe errors.
-                //
-                // See: https://github.com/BurntSushi/ripgrep/blob/bf63fe8f258afc09bae6caa48f0ae35eaf115005/crates/core/main.rs#L47C1-L61C14
-                for cause in err.chain() {
-                    if let Some(ioerr) = cause.downcast_ref::<std::io::Error>() {
-                        if ioerr.kind() == std::io::ErrorKind::BrokenPipe {
-                            return ExitCode::from(0);
-                        }
-                    }
-                }
-
-                // Use `writeln` instead of `eprintln` to avoid panicking when the stderr pipe is broken.
-                let mut stderr = std::io::stderr().lock();
-
-                // This communicates that this isn't a linter error but ruff itself hard-errored for
-                // some reason (e.g. failed to resolve the configuration)
-                writeln!(stderr, "{}", "ruff failed".red().bold()).ok();
-                // Currently we generally only see one error, but e.g. with io errors when resolving
-                // the configuration it is help to chain errors ("resolving configuration failed" ->
-                // "failed to read file: subdir/pyproject.toml")
-                for cause in err.chain() {
-                    writeln!(stderr, "  {} {cause}", "Cause:".bold()).ok();
-                }
-            }
-            ExitStatus::Error.into()
-        }
+        Err(err) => report_error(&err),
    }
 }
+
+fn report_error(err: &anyhow::Error) -> ExitCode {
+    {
+        // Exit "gracefully" on broken pipe errors.
+        //
+        // See: https://github.com/BurntSushi/ripgrep/blob/bf63fe8f258afc09bae6caa48f0ae35eaf115005/crates/core/main.rs#L47C1-L61C14
+        for cause in err.chain() {
+            if let Some(ioerr) = cause.downcast_ref::<std::io::Error>() {
+                if ioerr.kind() == std::io::ErrorKind::BrokenPipe {
+                    return ExitCode::from(0);
+                }
+            }
+        }
+
+        // Use `writeln` instead of `eprintln` to avoid panicking when the stderr pipe is broken.
+        let mut stderr = std::io::stderr().lock();
+
+        // This communicates that this isn't a linter error but ruff itself hard-errored for
+        // some reason (e.g. failed to resolve the configuration)
+        writeln!(stderr, "{}", "ruff failed".red().bold()).ok();
+        // Currently we generally only see one error, but e.g. with io errors when resolving
+        // the configuration it is help to chain errors ("resolving configuration failed" ->
+        // "failed to read file: subdir/pyproject.toml")
+        for cause in err.chain() {
+            writeln!(stderr, "  {} {cause}", "Cause:".bold()).ok();
+        }
+    }
+    ExitStatus::Error.into()
+}
--- a/crates/ruff/src/printer.rs
+++ b/crates/ruff/src/printer.rs
@@ -10,12 +10,11 @@ use ruff_linter::linter::FixTable;
 use serde::Serialize;

 use ruff_db::diagnostic::{
-    Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig, DisplayDiagnostics,
-    DisplayGithubDiagnostics, GithubRenderer, SecondaryCode,
+    Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig, DisplayDiagnostics, SecondaryCode,
 };
 use ruff_linter::fs::relativize_path;
 use ruff_linter::logging::LogLevel;
-use ruff_linter::message::{Emitter, EmitterContext, GroupedEmitter, SarifEmitter, TextEmitter};
+use ruff_linter::message::{EmitterContext, render_diagnostics};
 use ruff_linter::notify_user;
 use ruff_linter::settings::flags::{self};
 use ruff_linter::settings::types::{OutputFormat, UnsafeFixes};
@@ -225,86 +224,28 @@ impl Printer {
        let context = EmitterContext::new(&diagnostics.notebook_indexes);
        let fixables = FixableStatistics::try_from(diagnostics, self.unsafe_fixes);

-        let config = DisplayDiagnosticConfig::default().preview(preview);
+        let config = DisplayDiagnosticConfig::default()
+            .preview(preview)
+            .hide_severity(true)
+            .color(!cfg!(test) && colored::control::SHOULD_COLORIZE.should_colorize())
+            .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
+            .with_fix_applicability(self.unsafe_fixes.required_applicability())
+            .show_fix_diff(preview);

-        match self.format {
-            OutputFormat::Json => {
-                let config = config.format(DiagnosticFormat::Json);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
-            }
-            OutputFormat::Rdjson => {
-                let config = config.format(DiagnosticFormat::Rdjson);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
-            }
-            OutputFormat::JsonLines => {
-                let config = config.format(DiagnosticFormat::JsonLines);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
-            }
-            OutputFormat::Junit => {
-                let config = config.format(DiagnosticFormat::Junit);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
-            }
-            OutputFormat::Concise | OutputFormat::Full => {
-                TextEmitter::default()
-                    .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
-                    .with_show_fix_diff(self.format == OutputFormat::Full && preview)
-                    .with_show_source(self.format == OutputFormat::Full)
-                    .with_fix_applicability(self.unsafe_fixes.required_applicability())
-                    .with_preview(preview)
-                    .emit(writer, &diagnostics.inner, &context)?;
+        render_diagnostics(writer, self.format, config, &context, &diagnostics.inner)?;

-                if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
-                    if !diagnostics.fixed.is_empty() {
-                        writeln!(writer)?;
-                        print_fix_summary(writer, &diagnostics.fixed)?;
-                        writeln!(writer)?;
-                    }
+        if matches!(
+            self.format,
+            OutputFormat::Full | OutputFormat::Concise | OutputFormat::Grouped
+        ) {
+            if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
+                if !diagnostics.fixed.is_empty() {
+                    writeln!(writer)?;
+                    print_fix_summary(writer, &diagnostics.fixed)?;
+                    writeln!(writer)?;
                }
-
-                self.write_summary_text(writer, diagnostics)?;
-            }
-            OutputFormat::Grouped => {
-                GroupedEmitter::default()
-                    .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
-                    .with_unsafe_fixes(self.unsafe_fixes)
-                    .emit(writer, &diagnostics.inner, &context)?;
-
-                if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
-                    if !diagnostics.fixed.is_empty() {
-                        writeln!(writer)?;
-                        print_fix_summary(writer, &diagnostics.fixed)?;
-                        writeln!(writer)?;
-                    }
-                }
-                self.write_summary_text(writer, diagnostics)?;
-            }
-            OutputFormat::Github => {
-                let renderer = GithubRenderer::new(&context, "Ruff");
-                let value = DisplayGithubDiagnostics::new(&renderer, &diagnostics.inner);
-                write!(writer, "{value}")?;
-            }
-            OutputFormat::Gitlab => {
-                let config = config.format(DiagnosticFormat::Gitlab);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
-            }
-            OutputFormat::Pylint => {
-                let config = config.format(DiagnosticFormat::Pylint);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
-            }
-            OutputFormat::Azure => {
-                let config = config.format(DiagnosticFormat::Azure);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
-            }
-            OutputFormat::Sarif => {
-                SarifEmitter.emit(writer, &diagnostics.inner, &context)?;
            }
+            self.write_summary_text(writer, diagnostics)?;
        }

        writer.flush()?;
@@ -448,11 +389,22 @@ impl Printer {
            }

            let context = EmitterContext::new(&diagnostics.notebook_indexes);
-            TextEmitter::default()
+            let format = if preview {
+                DiagnosticFormat::Full
+            } else {
+                DiagnosticFormat::Concise
+            };
+            let config = DisplayDiagnosticConfig::default()
+                .hide_severity(true)
+                .color(!cfg!(test) && colored::control::SHOULD_COLORIZE.should_colorize())
                .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
-                .with_show_source(preview)
-                .with_fix_applicability(self.unsafe_fixes.required_applicability())
-                .emit(writer, &diagnostics.inner, &context)?;
+                .format(format)
+                .with_fix_applicability(self.unsafe_fixes.required_applicability());
+            write!(
+                writer,
+                "{}",
+                DisplayDiagnostics::new(&context, &config, &diagnostics.inner)
+            )?;
        }
        writer.flush()?;

--- a/crates/ruff/tests/format.rs
+++ b/crates/ruff/tests/format.rs
@@ -12,8 +12,8 @@ use tempfile::TempDir;

 const BIN_NAME: &str = "ruff";

-fn tempdir_filter(tempdir: &TempDir) -> String {
-    format!(r"{}\\?/?", escape(tempdir.path().to_str().unwrap()))
+fn tempdir_filter(path: impl AsRef<Path>) -> String {
+    format!(r"{}\\?/?", escape(path.as_ref().to_str().unwrap()))
 }

 #[test]
@@ -609,6 +609,112 @@ if __name__ == "__main__":
    Ok(())
 }

+#[test_case::test_case("concise")]
+#[test_case::test_case("full")]
+#[test_case::test_case("json")]
+#[test_case::test_case("json-lines")]
+#[test_case::test_case("junit")]
+#[test_case::test_case("grouped")]
+#[test_case::test_case("github")]
+#[test_case::test_case("gitlab")]
+#[test_case::test_case("pylint")]
+#[test_case::test_case("rdjson")]
+#[test_case::test_case("azure")]
+#[test_case::test_case("sarif")]
+fn output_format(output_format: &str) -> Result<()> {
+    const CONTENT: &str = r#"
+from test import say_hy
+
+if __name__ == "__main__":
+    say_hy("dear Ruff contributor")
+"#;
+
+    let tempdir = TempDir::new()?;
+    let input = tempdir.path().join("input.py");
+    fs::write(&input, CONTENT)?;
+
+    let snapshot = format!("output_format_{output_format}");
+
+    let project_dir = dunce::canonicalize(tempdir.path())?;
+
+    insta::with_settings!({
+        filters => vec![
+            (tempdir_filter(&project_dir).as_str(), "[TMP]/"),
+            (tempdir_filter(&tempdir).as_str(), "[TMP]/"),
+            (r#""[^"]+\\?/?input.py"#, r#""[TMP]/input.py"#),
+            (ruff_linter::VERSION, "[VERSION]"),
+        ]
+    }, {
+        assert_cmd_snapshot!(
+            snapshot,
+            Command::new(get_cargo_bin(BIN_NAME))
+                .args([
+                    "format",
+                    "--no-cache",
+                    "--output-format",
+                    output_format,
+                    "--preview",
+                    "--check",
+                    "input.py",
+                ])
+                .current_dir(&tempdir),
+        );
+    });
+
+    Ok(())
+}
+
+#[test]
+fn output_format_notebook() {
+    let args = ["format", "--no-cache", "--isolated", "--preview", "--check"];
+    let fixtures = Path::new("resources").join("test").join("fixtures");
+    let path = fixtures.join("unformatted.ipynb");
+    insta::with_settings!({filters => vec![
+        // Replace windows paths
+        (r"\\", "/"),
+    ]}, {
+        assert_cmd_snapshot!(
+            Command::new(get_cargo_bin(BIN_NAME)).args(args).arg(path),
+            @r"
+        success: false
+        exit_code: 1
+        ----- stdout -----
+        unformatted: File would be reformatted
+          --> resources/test/fixtures/unformatted.ipynb:cell 1:1:1
+         ::: cell 1
+        1 | import numpy
+          - maths = (numpy.arange(100)**2).sum()
+          - stats= numpy.asarray([1,2,3,4]).median()
+        2 + 
+        3 + maths = (numpy.arange(100) ** 2).sum()
+        4 + stats = numpy.asarray([1, 2, 3, 4]).median()
+         ::: cell 3
+        1 | # A cell with IPython escape command
+        2 | def some_function(foo, bar):
+        3 |     pass
+        4 + 
+        5 + 
+        6 | %matplotlib inline
+          ::: cell 4
+        1  | foo = %pwd
+           - def some_function(foo,bar,):
+        2  + 
+        3  + 
+        4  + def some_function(
+        5  +     foo,
+        6  +     bar,
+        7  + ):
+        8  |     # Another cell with IPython escape command
+        9  |     foo = %pwd
+        10 |     print(foo)
+
+        1 file would be reformatted
+
+        ----- stderr -----
+        ");
+    });
+}
+
 #[test]
 fn exit_non_zero_on_format() -> Result<()> {
    let tempdir = TempDir::new()?;
@@ -2355,3 +2461,21 @@ fn cookiecutter_globbing() -> Result<()> {

    Ok(())
 }
+
+#[test]
+fn stable_output_format_warning() {
+    assert_cmd_snapshot!(
+        Command::new(get_cargo_bin(BIN_NAME))
+            .args(["format", "--output-format=full", "-"])
+            .pass_stdin("1"),
+        @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    1
+
+    ----- stderr -----
+    warning: The --output-format flag for the formatter is unstable and requires preview mode to use.
+    ",
+    );
+}
--- a/crates/ruff/tests/integration_test.rs
+++ b/crates/ruff/tests/integration_test.rs
@@ -1688,6 +1688,27 @@ fn check_input_from_argfile() -> Result<()> {
    Ok(())
 }

+#[test]
+// Regression test for https://github.com/astral-sh/ruff/issues/20655
+fn missing_argfile_reports_error() {
+    let mut cmd = RuffCheck::default().filename("@!.txt").build();
+    insta::with_settings!({filters => vec![
+        ("The system cannot find the file specified.", "No such file or directory")
+    ]}, {
+        assert_cmd_snapshot!(cmd, @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Failed to read CLI arguments from files
+      Cause: failed to open file `!.txt`
+      Cause: No such file or directory (os error 2)
+    ");
+    });
+}
+
 #[test]
 fn check_hints_hidden_unsafe_fixes() {
    let mut cmd = RuffCheck::default()
--- a/crates/ruff/tests/lint.rs
+++ b/crates/ruff/tests/lint.rs
@@ -2445,6 +2445,7 @@ requires-python = ">= 3.11"
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
+        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -2476,6 +2477,320 @@ requires-python = ">= 3.11"
    Ok(())
 }

+/// ```
+/// tmp
+/// ├── pyproject.toml #<--- no `[tool.ruff]`
+/// └── test.py
+/// ```
+#[test]
+fn requires_python_no_tool_preview_enabled() -> Result<()> {
+    let tempdir = TempDir::new()?;
+    let project_dir = dunce::canonicalize(tempdir.path())?;
+    let ruff_toml = tempdir.path().join("pyproject.toml");
+    fs::write(
+        &ruff_toml,
+        r#"[project]
+requires-python = ">= 3.11"
+"#,
+    )?;
+
+    let testpy = tempdir.path().join("test.py");
+    fs::write(
+        &testpy,
+        r#"from typing import Union;foo: Union[int, str] = 1"#,
+    )?;
+    insta::with_settings!({
+        filters => vec![(tempdir_filter(&project_dir).as_str(), "[TMP]/")]
+    }, {
+        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+            .args(STDIN_BASE_OPTIONS)
+            .arg("--preview")
+            .arg("--show-settings")
+            .args(["--select","UP007"])
+            .arg("test.py")
+            .arg("-")
+            .current_dir(project_dir)
+            , @r#"
+        success: true
+        exit_code: 0
+        ----- stdout -----
+        Resolved settings for: "[TMP]/test.py"
+
+        # General Settings
+        cache_dir = "[TMP]/.ruff_cache"
+        fix = false
+        fix_only = false
+        output_format = concise
+        show_fixes = false
+        unsafe_fixes = hint
+
+        # File Resolver Settings
+        file_resolver.exclude = [
+        	".bzr",
+        	".direnv",
+        	".eggs",
+        	".git",
+        	".git-rewrite",
+        	".hg",
+        	".ipynb_checkpoints",
+        	".mypy_cache",
+        	".nox",
+        	".pants.d",
+        	".pyenv",
+        	".pytest_cache",
+        	".pytype",
+        	".ruff_cache",
+        	".svn",
+        	".tox",
+        	".venv",
+        	".vscode",
+        	"__pypackages__",
+        	"_build",
+        	"buck-out",
+        	"dist",
+        	"node_modules",
+        	"site-packages",
+        	"venv",
+        ]
+        file_resolver.extend_exclude = []
+        file_resolver.force_exclude = false
+        file_resolver.include = [
+        	"*.py",
+        	"*.pyi",
+        	"*.pyw",
+        	"*.ipynb",
+        	"**/pyproject.toml",
+        ]
+        file_resolver.extend_include = []
+        file_resolver.respect_gitignore = true
+        file_resolver.project_root = "[TMP]/"
+
+        # Linter Settings
+        linter.exclude = []
+        linter.project_root = "[TMP]/"
+        linter.rules.enabled = [
+        	non-pep604-annotation-union (UP007),
+        ]
+        linter.rules.should_fix = [
+        	non-pep604-annotation-union (UP007),
+        ]
+        linter.per_file_ignores = {}
+        linter.safety_table.forced_safe = []
+        linter.safety_table.forced_unsafe = []
+        linter.unresolved_target_version = 3.11
+        linter.per_file_target_version = {}
+        linter.preview = enabled
+        linter.explicit_preview_rules = false
+        linter.extension = ExtensionMapping({})
+        linter.allowed_confusables = []
+        linter.builtins = []
+        linter.dummy_variable_rgx = ^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$
+        linter.external = []
+        linter.ignore_init_module_imports = true
+        linter.logger_objects = []
+        linter.namespace_packages = []
+        linter.src = [
+        	"[TMP]/",
+        	"[TMP]/src",
+        ]
+        linter.tab_size = 4
+        linter.line_length = 88
+        linter.task_tags = [
+        	TODO,
+        	FIXME,
+        	XXX,
+        ]
+        linter.typing_modules = []
+        linter.typing_extensions = true
+
+        # Linter Plugins
+        linter.flake8_annotations.mypy_init_return = false
+        linter.flake8_annotations.suppress_dummy_args = false
+        linter.flake8_annotations.suppress_none_returning = false
+        linter.flake8_annotations.allow_star_arg_any = false
+        linter.flake8_annotations.ignore_fully_untyped = false
+        linter.flake8_bandit.hardcoded_tmp_directory = [
+        	/tmp,
+        	/var/tmp,
+        	/dev/shm,
+        ]
+        linter.flake8_bandit.check_typed_exception = false
+        linter.flake8_bandit.extend_markup_names = []
+        linter.flake8_bandit.allowed_markup_calls = []
+        linter.flake8_bugbear.extend_immutable_calls = []
+        linter.flake8_builtins.allowed_modules = []
+        linter.flake8_builtins.ignorelist = []
+        linter.flake8_builtins.strict_checking = false
+        linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
+        linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
+        linter.flake8_copyright.author = none
+        linter.flake8_copyright.min_file_size = 0
+        linter.flake8_errmsg.max_string_length = 0
+        linter.flake8_gettext.functions_names = [
+        	_,
+        	gettext,
+        	ngettext,
+        ]
+        linter.flake8_implicit_str_concat.allow_multiline = true
+        linter.flake8_import_conventions.aliases = {
+        	altair = alt,
+        	holoviews = hv,
+        	matplotlib = mpl,
+        	matplotlib.pyplot = plt,
+        	networkx = nx,
+        	numpy = np,
+        	numpy.typing = npt,
+        	pandas = pd,
+        	panel = pn,
+        	plotly.express = px,
+        	polars = pl,
+        	pyarrow = pa,
+        	seaborn = sns,
+        	tensorflow = tf,
+        	tkinter = tk,
+        	xml.etree.ElementTree = ET,
+        }
+        linter.flake8_import_conventions.banned_aliases = {}
+        linter.flake8_import_conventions.banned_from = []
+        linter.flake8_pytest_style.fixture_parentheses = false
+        linter.flake8_pytest_style.parametrize_names_type = tuple
+        linter.flake8_pytest_style.parametrize_values_type = list
+        linter.flake8_pytest_style.parametrize_values_row_type = tuple
+        linter.flake8_pytest_style.raises_require_match_for = [
+        	BaseException,
+        	Exception,
+        	ValueError,
+        	OSError,
+        	IOError,
+        	EnvironmentError,
+        	socket.error,
+        ]
+        linter.flake8_pytest_style.raises_extend_require_match_for = []
+        linter.flake8_pytest_style.mark_parentheses = false
+        linter.flake8_quotes.inline_quotes = double
+        linter.flake8_quotes.multiline_quotes = double
+        linter.flake8_quotes.docstring_quotes = double
+        linter.flake8_quotes.avoid_escape = true
+        linter.flake8_self.ignore_names = [
+        	_make,
+        	_asdict,
+        	_replace,
+        	_fields,
+        	_field_defaults,
+        	_name_,
+        	_value_,
+        ]
+        linter.flake8_tidy_imports.ban_relative_imports = "parents"
+        linter.flake8_tidy_imports.banned_api = {}
+        linter.flake8_tidy_imports.banned_module_level_imports = []
+        linter.flake8_type_checking.strict = false
+        linter.flake8_type_checking.exempt_modules = [
+        	typing,
+        	typing_extensions,
+        ]
+        linter.flake8_type_checking.runtime_required_base_classes = []
+        linter.flake8_type_checking.runtime_required_decorators = []
+        linter.flake8_type_checking.quote_annotations = false
+        linter.flake8_unused_arguments.ignore_variadic_names = false
+        linter.isort.required_imports = []
+        linter.isort.combine_as_imports = false
+        linter.isort.force_single_line = false
+        linter.isort.force_sort_within_sections = false
+        linter.isort.detect_same_package = true
+        linter.isort.case_sensitive = false
+        linter.isort.force_wrap_aliases = false
+        linter.isort.force_to_top = []
+        linter.isort.known_modules = {}
+        linter.isort.order_by_type = true
+        linter.isort.relative_imports_order = furthest_to_closest
+        linter.isort.single_line_exclusions = []
+        linter.isort.split_on_trailing_comma = true
+        linter.isort.classes = []
+        linter.isort.constants = []
+        linter.isort.variables = []
+        linter.isort.no_lines_before = []
+        linter.isort.lines_after_imports = -1
+        linter.isort.lines_between_types = 0
+        linter.isort.forced_separate = []
+        linter.isort.section_order = [
+        	known { type = future },
+        	known { type = standard_library },
+        	known { type = third_party },
+        	known { type = first_party },
+        	known { type = local_folder },
+        ]
+        linter.isort.default_section = known { type = third_party }
+        linter.isort.no_sections = false
+        linter.isort.from_first = false
+        linter.isort.length_sort = false
+        linter.isort.length_sort_straight = false
+        linter.mccabe.max_complexity = 10
+        linter.pep8_naming.ignore_names = [
+        	setUp,
+        	tearDown,
+        	setUpClass,
+        	tearDownClass,
+        	setUpModule,
+        	tearDownModule,
+        	asyncSetUp,
+        	asyncTearDown,
+        	setUpTestData,
+        	failureException,
+        	longMessage,
+        	maxDiff,
+        ]
+        linter.pep8_naming.classmethod_decorators = []
+        linter.pep8_naming.staticmethod_decorators = []
+        linter.pycodestyle.max_line_length = 88
+        linter.pycodestyle.max_doc_length = none
+        linter.pycodestyle.ignore_overlong_task_comments = false
+        linter.pyflakes.extend_generics = []
+        linter.pyflakes.allowed_unused_imports = []
+        linter.pylint.allow_magic_value_types = [
+        	str,
+        	bytes,
+        ]
+        linter.pylint.allow_dunder_method_names = []
+        linter.pylint.max_args = 5
+        linter.pylint.max_positional_args = 5
+        linter.pylint.max_returns = 6
+        linter.pylint.max_bool_expr = 5
+        linter.pylint.max_branches = 12
+        linter.pylint.max_statements = 50
+        linter.pylint.max_public_methods = 20
+        linter.pylint.max_locals = 15
+        linter.pylint.max_nested_blocks = 5
+        linter.pyupgrade.keep_runtime_typing = false
+        linter.ruff.parenthesize_tuple_in_subscript = false
+
+        # Formatter Settings
+        formatter.exclude = []
+        formatter.unresolved_target_version = 3.11
+        formatter.per_file_target_version = {}
+        formatter.preview = enabled
+        formatter.line_width = 88
+        formatter.line_ending = auto
+        formatter.indent_style = space
+        formatter.indent_width = 4
+        formatter.quote_style = double
+        formatter.magic_trailing_comma = respect
+        formatter.docstring_code_format = disabled
+        formatter.docstring_code_line_width = dynamic
+
+        # Analyze Settings
+        analyze.exclude = []
+        analyze.preview = enabled
+        analyze.target_version = 3.11
+        analyze.string_imports = disabled
+        analyze.extension = ExtensionMapping({})
+        analyze.include_dependencies = {}
+
+        ----- stderr -----
+        "#);
+    });
+    Ok(())
+}
+
 /// ```
 /// tmp
 /// ├── pyproject.toml #<--- no `[tool.ruff]`
@@ -2757,6 +3072,7 @@ requires-python = ">= 3.11"
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
+        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -3121,6 +3437,7 @@ from typing import Union;foo: Union[int, str] = 1
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
+        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -3501,6 +3818,7 @@ from typing import Union;foo: Union[int, str] = 1
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
+        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -3829,6 +4147,7 @@ from typing import Union;foo: Union[int, str] = 1
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
+        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -4157,6 +4476,7 @@ from typing import Union;foo: Union[int, str] = 1
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
+        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -4442,6 +4762,7 @@ from typing import Union;foo: Union[int, str] = 1
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
+        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -4780,6 +5101,7 @@ from typing import Union;foo: Union[int, str] = 1
        linter.pylint.max_statements = 50
        linter.pylint.max_public_methods = 20
        linter.pylint.max_locals = 15
+        linter.pylint.max_nested_blocks = 5
        linter.pyupgrade.keep_runtime_typing = false
        linter.ruff.parenthesize_tuple_in_subscript = false

@@ -5877,6 +6199,36 @@ match 42:  # invalid-syntax
    Ok(())
 }

+#[test_case::test_case("concise"; "concise_show_fixes")]
+#[test_case::test_case("full"; "full_show_fixes")]
+#[test_case::test_case("grouped"; "grouped_show_fixes")]
+fn output_format_show_fixes(output_format: &str) -> Result<()> {
+    let tempdir = TempDir::new()?;
+    let input = tempdir.path().join("input.py");
+    fs::write(&input, "import os  # F401")?;
+
+    let snapshot = format!("output_format_show_fixes_{output_format}");
+
+    assert_cmd_snapshot!(
+        snapshot,
+        Command::new(get_cargo_bin(BIN_NAME))
+            .args([
+                "check",
+                "--no-cache",
+                "--output-format",
+                output_format,
+                "--select",
+                "F401",
+                "--fix",
+                "--show-fixes",
+                "input.py",
+            ])
+            .current_dir(&tempdir),
+    );
+
+    Ok(())
+}
+
 #[test]
 fn up045_nested_optional_flatten_all() {
    let contents = "\
@@ -5950,6 +6302,7 @@ fn rule_panic_mixed_results_concise() -> Result<()> {
        filters => vec![
            (tempdir_filter(&tempdir).as_str(), "[TMP]/"),
            (r"\\", r"/"),
+            (r"(Panicked at) [^:]+:\d+:\d+", "$1 <location>")
        ]
    }, {
    assert_cmd_snapshot!(
@@ -5966,7 +6319,7 @@ fn rule_panic_mixed_results_concise() -> Result<()> {
    [TMP]/normal.py:1:1: RUF903 Hey this is a stable test rule with a display only fix.
    [TMP]/normal.py:1:1: RUF911 Hey this is a preview test rule.
    [TMP]/normal.py:1:1: RUF950 Hey this is a test rule that was redirected from another.
-    [TMP]/panic.py: panic: Fatal error while linting: This is a fake panic for testing.
+    [TMP]/panic.py: panic: Panicked at <location> when checking `[TMP]/panic.py`: `This is a fake panic for testing.`
    Found 7 errors.
    [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).

@@ -5995,6 +6348,7 @@ fn rule_panic_mixed_results_full() -> Result<()> {
        filters => vec![
            (tempdir_filter(&tempdir).as_str(), "[TMP]/"),
            (r"\\", r"/"),
+            (r"(Panicked at) [^:]+:\d+:\d+", "$1 <location>"),
        ]
    }, {
    assert_cmd_snapshot!(
@@ -6025,12 +6379,11 @@ fn rule_panic_mixed_results_full() -> Result<()> {
    RUF950 Hey this is a test rule that was redirected from another.
    --> [TMP]/normal.py:1:1

-    panic: Fatal error while linting: This is a fake panic for testing.
+    panic: Panicked at <location> when checking `[TMP]/panic.py`: `This is a fake panic for testing.`
    --> [TMP]/panic.py:1:1
-    info: panicked at crates/ruff_linter/src/rules/ruff/rules/test_rules.rs:511:9:
-    This is a fake panic for testing.
-    run with `RUST_BACKTRACE=1` environment variable to display a backtrace
-
+    info: This indicates a bug in Ruff.
+    info: If you could open an issue at https://github.com/astral-sh/ruff/issues/new?title=%5Bpanic%5D, we'd be very appreciative!
+    info: run with `RUST_BACKTRACE=1` environment variable to show the full backtrace information

    Found 7 errors.
    [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).
@@ -6045,3 +6398,200 @@ fn rule_panic_mixed_results_full() -> Result<()> {
    });
    Ok(())
 }
+
+/// Test that the same rule fires across all supported extensions, but not on unsupported files
+#[test]
+fn supported_file_extensions() -> Result<()> {
+    let tempdir = TempDir::new()?;
+    let inner_dir = tempdir.path().join("src");
+    fs::create_dir(&inner_dir)?;
+
+    // Create files of various types
+    // text file
+    fs::write(inner_dir.join("thing.txt"), b"hello world\n")?;
+    // regular python
+    fs::write(
+        inner_dir.join("thing.py"),
+        b"import os\nprint('hello world')\n",
+    )?;
+    // python typestub
+    fs::write(
+        inner_dir.join("thing.pyi"),
+        b"import os\nclass foo:\n  ...\n",
+    )?;
+    // windows gui
+    fs::write(
+        inner_dir.join("thing.pyw"),
+        b"import os\nprint('hello world')\n",
+    )?;
+    // cython
+    fs::write(
+        inner_dir.join("thing.pyx"),
+        b"import os\ncdef int add(int a, int b):\n  return a + b\n",
+    )?;
+    // notebook
+    fs::write(
+        inner_dir.join("thing.ipynb"),
+        r#"
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "ad6f36d9-4b7d-4562-8d00-f15a0f1fbb6d",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import os"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.12.0"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
+"#,
+    )?;
+
+    insta::with_settings!({
+        filters => vec![
+            (tempdir_filter(&tempdir).as_str(), "[TMP]/"),
+            (r"\\", r"/"),
+        ]
+    }, {
+    assert_cmd_snapshot!(
+        Command::new(get_cargo_bin(BIN_NAME))
+            .args(["check", "--select", "F401", "--output-format=concise", "--no-cache"])
+            .args([inner_dir]),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    [TMP]/src/thing.ipynb:cell 1:1:8: F401 [*] `os` imported but unused
+    [TMP]/src/thing.py:1:8: F401 [*] `os` imported but unused
+    [TMP]/src/thing.pyi:1:8: F401 [*] `os` imported but unused
+    Found 3 errors.
+    [*] 3 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+    });
+    Ok(())
+}
+
+/// Test that the same rule fires across all supported extensions, but not on unsupported files
+#[test]
+fn supported_file_extensions_preview_enabled() -> Result<()> {
+    let tempdir = TempDir::new()?;
+    let inner_dir = tempdir.path().join("src");
+    fs::create_dir(&inner_dir)?;
+
+    // Create files of various types
+    // text file
+    fs::write(inner_dir.join("thing.txt"), b"hello world\n")?;
+    // regular python
+    fs::write(
+        inner_dir.join("thing.py"),
+        b"import os\nprint('hello world')\n",
+    )?;
+    // python typestub
+    fs::write(
+        inner_dir.join("thing.pyi"),
+        b"import os\nclass foo:\n  ...\n",
+    )?;
+    // windows gui
+    fs::write(
+        inner_dir.join("thing.pyw"),
+        b"import os\nprint('hello world')\n",
+    )?;
+    // cython
+    fs::write(
+        inner_dir.join("thing.pyx"),
+        b"import os\ncdef int add(int a, int b):\n  return a + b\n",
+    )?;
+    // notebook
+    fs::write(
+        inner_dir.join("thing.ipynb"),
+        r#"
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "ad6f36d9-4b7d-4562-8d00-f15a0f1fbb6d",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import os"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.12.0"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
+"#,
+    )?;
+
+    insta::with_settings!({
+        filters => vec![
+            (tempdir_filter(&tempdir).as_str(), "[TMP]/"),
+            (r"\\", r"/"),
+        ]
+    }, {
+    assert_cmd_snapshot!(
+        Command::new(get_cargo_bin(BIN_NAME))
+            .args(["check", "--select", "F401", "--preview", "--output-format=concise", "--no-cache"])
+            .args([inner_dir]),
+        @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    [TMP]/src/thing.ipynb:cell 1:1:8: F401 [*] `os` imported but unused
+    [TMP]/src/thing.py:1:8: F401 [*] `os` imported but unused
+    [TMP]/src/thing.pyi:1:8: F401 [*] `os` imported but unused
+    [TMP]/src/thing.pyw:1:8: F401 [*] `os` imported but unused
+    Found 4 errors.
+    [*] 4 fixable with the `--fix` option.
+
+    ----- stderr -----
+    ");
+    });
+    Ok(())
+}
--- a/crates/ruff/tests/snapshots/format__output_format_azure.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_azure.snap
@@ -0,0 +1,19 @@
+---
+source: crates/ruff/tests/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - azure
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+##vso[task.logissue type=error;sourcepath=[TMP]/input.py;linenumber=1;columnnumber=1;code=unformatted;]File would be reformatted
+
+----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_concise.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_concise.snap
@@ -0,0 +1,20 @@
+---
+source: crates/ruff/tests/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - concise
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+input.py:1:1: unformatted: File would be reformatted
+1 file would be reformatted
+
+----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_full.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_full.snap
@@ -0,0 +1,26 @@
+---
+source: crates/ruff/tests/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - full
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+unformatted: File would be reformatted
+ --> input.py:1:1
+  - 
+1 | from test import say_hy
+2 | 
+3 | if __name__ == "__main__":
+
+1 file would be reformatted
+
+----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_github.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_github.snap
@@ -0,0 +1,19 @@
+---
+source: crates/ruff/tests/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - github
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+::error title=Ruff (unformatted),file=[TMP]/input.py,line=1,col=1,endLine=2,endColumn=1::input.py:1:1: unformatted: File would be reformatted
+
+----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_gitlab.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_gitlab.snap
@@ -0,0 +1,38 @@
+---
+source: crates/ruff/tests/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - gitlab
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+[
+  {
+    "check_name": "unformatted",
+    "description": "unformatted: File would be reformatted",
+    "severity": "major",
+    "fingerprint": "d868d7da11a65fcf",
+    "location": {
+      "path": "input.py",
+      "positions": {
+        "begin": {
+          "line": 1,
+          "column": 1
+        },
+        "end": {
+          "line": 2,
+          "column": 1
+        }
+      }
+    }
+  }
+]
+----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_grouped.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_grouped.snap
@@ -0,0 +1,21 @@
+---
+source: crates/ruff/tests/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - grouped
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+input.py:
+  1:1 unformatted: File would be reformatted
+
+1 file would be reformatted
+
+----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_json-lines.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_json-lines.snap
@@ -0,0 +1,19 @@
+---
+source: crates/ruff/tests/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - json-lines
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+{"cell":null,"code":"unformatted","end_location":{"column":1,"row":2},"filename":"[TMP]/input.py","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":1,"row":2},"location":{"column":1,"row":1}}],"message":null},"location":{"column":1,"row":1},"message":"File would be reformatted","noqa_row":null,"url":null}
+
+----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_json.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_json.snap
@@ -0,0 +1,52 @@
+---
+source: crates/ruff/tests/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - json
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+[
+  {
+    "cell": null,
+    "code": "unformatted",
+    "end_location": {
+      "column": 1,
+      "row": 2
+    },
+    "filename": "[TMP]/input.py",
+    "fix": {
+      "applicability": "safe",
+      "edits": [
+        {
+          "content": "",
+          "end_location": {
+            "column": 1,
+            "row": 2
+          },
+          "location": {
+            "column": 1,
+            "row": 1
+          }
+        }
+      ],
+      "message": null
+    },
+    "location": {
+      "column": 1,
+      "row": 1
+    },
+    "message": "File would be reformatted",
+    "noqa_row": null,
+    "url": null
+  }
+]
+----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_junit.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_junit.snap
@@ -0,0 +1,26 @@
+---
+source: crates/ruff/tests/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - junit
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites name="ruff" tests="1" failures="1" errors="0">
+    <testsuite name="[TMP]/input.py" tests="1" disabled="0" errors="0" failures="1" package="org.ruff">
+        <testcase name="org.ruff.unformatted" classname="[TMP]/input" line="1" column="1">
+            <failure message="File would be reformatted">line 1, col 1, File would be reformatted</failure>
+        </testcase>
+    </testsuite>
+</testsuites>
+
+----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_pylint.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_pylint.snap
@@ -0,0 +1,18 @@
+---
+source: crates/ruff/tests/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - pylint
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+input.py:1: [unformatted] File would be reformatted
+
+----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_rdjson.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_rdjson.snap
@@ -0,0 +1,60 @@
+---
+source: crates/ruff/tests/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - rdjson
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+{
+  "diagnostics": [
+    {
+      "code": {
+        "value": "unformatted"
+      },
+      "location": {
+        "path": "[TMP]/input.py",
+        "range": {
+          "end": {
+            "column": 1,
+            "line": 2
+          },
+          "start": {
+            "column": 1,
+            "line": 1
+          }
+        }
+      },
+      "message": "File would be reformatted",
+      "suggestions": [
+        {
+          "range": {
+            "end": {
+              "column": 1,
+              "line": 2
+            },
+            "start": {
+              "column": 1,
+              "line": 1
+            }
+          },
+          "text": ""
+        }
+      ]
+    }
+  ],
+  "severity": "WARNING",
+  "source": {
+    "name": "ruff",
+    "url": "https://docs.astral.sh/ruff"
+  }
+}
+----- stderr -----
--- a/crates/ruff/tests/snapshots/format__output_format_sarif.snap
+++ b/crates/ruff/tests/snapshots/format__output_format_sarif.snap
@@ -0,0 +1,81 @@
+---
+source: crates/ruff/tests/format.rs
+info:
+  program: ruff
+  args:
+    - format
+    - "--no-cache"
+    - "--output-format"
+    - sarif
+    - "--preview"
+    - "--check"
+    - input.py
+---
+success: false
+exit_code: 1
+----- stdout -----
+{
+  "$schema": "https://json.schemastore.org/sarif-2.1.0.json",
+  "runs": [
+    {
+      "results": [
+        {
+          "fixes": [
+            {
+              "artifactChanges": [
+                {
+                  "artifactLocation": {
+                    "uri": "[TMP]/input.py"
+                  },
+                  "replacements": [
+                    {
+                      "deletedRegion": {
+                        "endColumn": 1,
+                        "endLine": 2,
+                        "startColumn": 1,
+                        "startLine": 1
+                      }
+                    }
+                  ]
+                }
+              ],
+              "description": {
+                "text": null
+              }
+            }
+          ],
+          "level": "error",
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "[TMP]/input.py"
+                },
+                "region": {
+                  "endColumn": 1,
+                  "endLine": 2,
+                  "startColumn": 1,
+                  "startLine": 1
+                }
+              }
+            }
+          ],
+          "message": {
+            "text": "File would be reformatted"
+          },
+          "ruleId": "unformatted"
+        }
+      ],
+      "tool": {
+        "driver": {
+          "informationUri": "https://github.com/astral-sh/ruff",
+          "name": "ruff",
+          "rules": [],
+          "version": "[VERSION]"
+        }
+      }
+    }
+  ],
+  "version": "2.1.0"
+}
+----- stderr -----
--- a/crates/ruff/tests/snapshots/integration_test__rule_f401.snap
+++ b/crates/ruff/tests/snapshots/integration_test__rule_f401.snap
@@ -44,6 +44,43 @@ import some_module
 __all__ = ["some_module"]
 ```

+## Preview
+When [preview] is enabled (and certain simplifying assumptions
+are met), we analyze all import statements for a given module
+when determining whether an import is used, rather than simply
+the last of these statements. This can result in both different and
+more import statements being marked as unused.
+
+For example, if a module consists of
+
+```python
+import a
+import a.b
+```
+
+then both statements are marked as unused under [preview], whereas
+only the second is marked as unused under stable behavior.
+
+As another example, if a module consists of
+
+```python
+import a.b
+import a
+
+a.b.foo()
+```
+
+then a diagnostic will only be emitted for the first line under [preview],
+whereas a diagnostic would only be emitted for the second line under
+stable behavior.
+
+Note that this behavior is somewhat subjective and is designed
+to conform to the developer's intuition rather than Python's actual
+execution. To wit, the statement `import a.b` automatically executes
+`import a`, so in some sense `import a` is _always_ redundant
+in the presence of `import a.b`.
+
+
 ## Fix safety

 Fixes to remove unused imports are safe, except in `__init__.py` files.
@@ -96,4 +133,6 @@ else:
 - [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)
 - [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)

+[preview]: https://docs.astral.sh/ruff/preview/
+
 ----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_sarif.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_sarif.snap
@@ -119,7 +119,7 @@ exit_code: 1
          "rules": [
            {
              "fullDescription": {
-                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\nSee [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc)\nfor more details on how Ruff\ndetermines whether an import is first or third-party.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)\n"
+                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Preview\nWhen [preview] is enabled (and certain simplifying assumptions\nare met), we analyze all import statements for a given module\nwhen determining whether an import is used, rather than simply\nthe last of these statements. This can result in both different and\nmore import statements being marked as unused.\n\nFor example, if a module consists of\n\n```python\nimport a\nimport a.b\n```\n\nthen both statements are marked as unused under [preview], whereas\nonly the second is marked as unused under stable behavior.\n\nAs another example, if a module consists of\n\n```python\nimport a.b\nimport a\n\na.b.foo()\n```\n\nthen a diagnostic will only be emitted for the first line under [preview],\nwhereas a diagnostic would only be emitted for the second line under\nstable behavior.\n\nNote that this behavior is somewhat subjective and is designed\nto conform to the developer's intuition rather than Python's actual\nexecution. To wit, the statement `import a.b` automatically executes\n`import a`, so in some sense `import a` is _always_ redundant\nin the presence of `import a.b`.\n\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\nSee [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc)\nfor more details on how Ruff\ndetermines whether an import is first or third-party.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)\n\n[preview]: https://docs.astral.sh/ruff/preview/\n"
              },
              "help": {
                "text": "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability"
--- a/crates/ruff/tests/snapshots/lint__output_format_show_fixes_concise.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_show_fixes_concise.snap
@@ -0,0 +1,26 @@
+---
+source: crates/ruff/tests/lint.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--no-cache"
+    - "--output-format"
+    - concise
+    - "--select"
+    - F401
+    - "--fix"
+    - "--show-fixes"
+    - input.py
+---
+success: true
+exit_code: 0
+----- stdout -----
+
+Fixed 1 error:
+- input.py:
+    1 × F401 (unused-import)
+
+Found 1 error (1 fixed, 0 remaining).
+
+----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_show_fixes_full.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_show_fixes_full.snap
@@ -0,0 +1,26 @@
+---
+source: crates/ruff/tests/lint.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--no-cache"
+    - "--output-format"
+    - full
+    - "--select"
+    - F401
+    - "--fix"
+    - "--show-fixes"
+    - input.py
+---
+success: true
+exit_code: 0
+----- stdout -----
+
+Fixed 1 error:
+- input.py:
+    1 × F401 (unused-import)
+
+Found 1 error (1 fixed, 0 remaining).
+
+----- stderr -----
--- a/crates/ruff/tests/snapshots/lint__output_format_show_fixes_grouped.snap
+++ b/crates/ruff/tests/snapshots/lint__output_format_show_fixes_grouped.snap
@@ -0,0 +1,26 @@
+---
+source: crates/ruff/tests/lint.rs
+info:
+  program: ruff
+  args:
+    - check
+    - "--no-cache"
+    - "--output-format"
+    - grouped
+    - "--select"
+    - F401
+    - "--fix"
+    - "--show-fixes"
+    - input.py
+---
+success: true
+exit_code: 0
+----- stdout -----
+
+Fixed 1 error:
+- input.py:
+    1 × F401 (unused-import)
+
+Found 1 error (1 fixed, 0 remaining).
+
+----- stderr -----
--- a/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
+++ b/crates/ruff/tests/snapshots/show_settings__display_default_settings.snap
@@ -371,6 +371,7 @@ linter.pylint.max_branches = 12
 linter.pylint.max_statements = 50
 linter.pylint.max_public_methods = 20
 linter.pylint.max_locals = 15
+linter.pylint.max_nested_blocks = 5
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false

--- a/crates/ruff_annotate_snippets/src/renderer/display_list.rs
+++ b/crates/ruff_annotate_snippets/src/renderer/display_list.rs
@@ -56,6 +56,7 @@ pub(crate) struct DisplayList<'a> {
    pub(crate) stylesheet: &'a Stylesheet,
    pub(crate) anonymized_line_numbers: bool,
    pub(crate) cut_indicator: &'static str,
+    pub(crate) lineno_offset: usize,
 }

 impl PartialEq for DisplayList<'_> {
@@ -81,13 +82,14 @@ impl Display for DisplayList<'_> {
                _ => max,
            })
        });
-        let lineno_width = if lineno_width == 0 {
-            lineno_width
-        } else if self.anonymized_line_numbers {
-            ANONYMIZED_LINE_NUM.len()
-        } else {
-            ((lineno_width as f64).log10().floor() as usize) + 1
-        };
+        let lineno_width = self.lineno_offset
+            + if lineno_width == 0 {
+                lineno_width
+            } else if self.anonymized_line_numbers {
+                ANONYMIZED_LINE_NUM.len()
+            } else {
+                ((lineno_width as f64).log10().floor() as usize) + 1
+            };

        let multiline_depth = self.body.iter().fold(0, |max, set| {
            set.display_lines.iter().fold(max, |max2, line| match line {
@@ -124,6 +126,7 @@ impl<'a> DisplayList<'a> {
        term_width: usize,
        cut_indicator: &'static str,
    ) -> DisplayList<'a> {
+        let lineno_offset = message.lineno_offset;
        let body = format_message(
            message,
            term_width,
@@ -137,6 +140,7 @@ impl<'a> DisplayList<'a> {
            stylesheet,
            anonymized_line_numbers,
            cut_indicator,
+            lineno_offset,
        }
    }

@@ -1088,6 +1092,7 @@ fn format_message<'m>(
        footer,
        snippets,
        is_fixable,
+        lineno_offset: _,
    } = message;

    let mut sets = vec![];
--- a/crates/ruff_annotate_snippets/src/snippet.rs
+++ b/crates/ruff_annotate_snippets/src/snippet.rs
@@ -23,6 +23,7 @@ pub struct Message<'a> {
    pub(crate) snippets: Vec<Snippet<'a>>,
    pub(crate) footer: Vec<Message<'a>>,
    pub(crate) is_fixable: bool,
+    pub(crate) lineno_offset: usize,
 }

 impl<'a> Message<'a> {
@@ -59,6 +60,16 @@ impl<'a> Message<'a> {
        self.is_fixable = yes;
        self
    }
+
+    /// Add an offset used for aligning the header sigil (`-->`) with the line number separators.
+    ///
+    /// For normal diagnostics this is computed automatically based on the lines to be rendered.
+    /// This is intended only for use in the formatter, where we don't render a snippet directly but
+    /// still want the header to align with the diff.
+    pub fn lineno_offset(mut self, offset: usize) -> Self {
+        self.lineno_offset = offset;
+        self
+    }
 }

 /// Structure containing the slice of text to be annotated and
@@ -144,7 +155,7 @@ impl<'a> Annotation<'a> {
        self
    }

-    pub fn is_file_level(mut self, yes: bool) -> Self {
+    pub fn hide_snippet(mut self, yes: bool) -> Self {
        self.is_file_level = yes;
        self
    }
@@ -173,6 +184,7 @@ impl Level {
            snippets: vec![],
            footer: vec![],
            is_fixable: false,
+            lineno_offset: 0,
        }
    }

--- a/crates/ruff_benchmark/benches/ty.rs
+++ b/crates/ruff_benchmark/benches/ty.rs
@@ -444,7 +444,7 @@ fn benchmark_complex_constrained_attributes_2(criterion: &mut Criterion) {
    criterion.bench_function("ty_micro[complex_constrained_attributes_2]", |b| {
        b.iter_batched_ref(
            || {
-                // This is is similar to the case above, but now the attributes are actually defined.
+                // This is similar to the case above, but now the attributes are actually defined.
                // https://github.com/astral-sh/ty/issues/711
                setup_micro_case(
                    r#"
--- a/crates/ruff_benchmark/benches/ty_walltime.rs
+++ b/crates/ruff_benchmark/benches/ty_walltime.rs
@@ -117,7 +117,7 @@ static COLOUR_SCIENCE: std::sync::LazyLock<Benchmark<'static>> = std::sync::Lazy
            max_dep_date: "2025-06-17",
            python_version: PythonVersion::PY310,
        },
-        477,
+        600,
    )
 });

--- a/crates/ruff_db/src/diagnostic/mod.rs
+++ b/crates/ruff_db/src/diagnostic/mod.rs
@@ -69,6 +69,7 @@ impl Diagnostic {
            parent: None,
            noqa_offset: None,
            secondary_code: None,
+            header_offset: 0,
        });
        Diagnostic { inner }
    }
@@ -432,14 +433,23 @@ impl Diagnostic {

    /// Returns the URL for the rule documentation, if it exists.
    pub fn to_ruff_url(&self) -> Option<String> {
-        if self.is_invalid_syntax() {
-            None
-        } else {
-            Some(format!(
-                "{}/rules/{}",
-                env!("CARGO_PKG_HOMEPAGE"),
-                self.name()
-            ))
+        match self.id() {
+            DiagnosticId::Panic
+            | DiagnosticId::Io
+            | DiagnosticId::InvalidSyntax
+            | DiagnosticId::RevealedType
+            | DiagnosticId::UnknownRule
+            | DiagnosticId::InvalidGlob
+            | DiagnosticId::EmptyInclude
+            | DiagnosticId::UnnecessaryOverridesSection
+            | DiagnosticId::UselessOverridesSection
+            | DiagnosticId::DeprecatedSetting
+            | DiagnosticId::Unformatted
+            | DiagnosticId::InvalidCliOption
+            | DiagnosticId::InternalError => None,
+            DiagnosticId::Lint(lint_name) => {
+                Some(format!("{}/rules/{lint_name}", env!("CARGO_PKG_HOMEPAGE")))
+            }
        }
    }

@@ -512,6 +522,11 @@ impl Diagnostic {

        a.cmp(&b)
    }
+
+    /// Add an offset for aligning the header sigil with the line number separators in a diff.
+    pub fn set_header_offset(&mut self, offset: usize) {
+        Arc::make_mut(&mut self.inner).header_offset = offset;
+    }
 }

 #[derive(Debug, Clone, Eq, PartialEq, Hash, get_size2::GetSize)]
@@ -525,6 +540,7 @@ struct DiagnosticInner {
    parent: Option<TextSize>,
    noqa_offset: Option<TextSize>,
    secondary_code: Option<SecondaryCode>,
+    header_offset: usize,
 }

 struct RenderingSortKey<'a> {
@@ -742,11 +758,11 @@ pub struct Annotation {
    is_primary: bool,
    /// The diagnostic tags associated with this annotation.
    tags: Vec<DiagnosticTag>,
-    /// Whether this annotation is a file-level or full-file annotation.
+    /// Whether the snippet for this annotation should be hidden.
    ///
    /// When set, rendering will only include the file's name and (optional) range. Everything else
    /// is omitted, including any file snippet or message.
-    is_file_level: bool,
+    hide_snippet: bool,
 }

 impl Annotation {
@@ -765,7 +781,7 @@ impl Annotation {
            message: None,
            is_primary: true,
            tags: Vec::new(),
-            is_file_level: false,
+            hide_snippet: false,
        }
    }

@@ -782,7 +798,7 @@ impl Annotation {
            message: None,
            is_primary: false,
            tags: Vec::new(),
-            is_file_level: false,
+            hide_snippet: false,
        }
    }

@@ -849,19 +865,20 @@ impl Annotation {
        self.tags.push(tag);
    }

-    /// Set whether or not this annotation is file-level.
+    /// Set whether or not the snippet on this annotation should be suppressed when rendering.
    ///
-    /// File-level annotations are only rendered with their file name and range, if available. This
-    /// is intended for backwards compatibility with Ruff diagnostics, which historically used
+    /// Such annotations are only rendered with their file name and range, if available. This is
+    /// intended for backwards compatibility with Ruff diagnostics, which historically used
    /// `TextRange::default` to indicate a file-level diagnostic. In the new diagnostic model, a
    /// [`Span`] with a range of `None` should be used instead, as mentioned in the `Span`
    /// documentation.
    ///
    /// TODO(brent) update this usage in Ruff and remove `is_file_level` entirely. See
    /// <https://github.com/astral-sh/ruff/issues/19688>, especially my first comment, for more
-    /// details.
-    pub fn set_file_level(&mut self, yes: bool) {
-        self.is_file_level = yes;
+    /// details. As of 2025-09-26 we also use this to suppress snippet rendering for formatter
+    /// diagnostics, which also need to have a range, so we probably can't eliminate this entirely.
+    pub fn hide_snippet(&mut self, yes: bool) {
+        self.hide_snippet = yes;
    }
 }

@@ -1016,6 +1033,17 @@ pub enum DiagnosticId {

    /// Use of a deprecated setting.
    DeprecatedSetting,
+
+    /// The code needs to be formatted.
+    Unformatted,
+
+    /// Use of an invalid command-line option.
+    InvalidCliOption,
+
+    /// An internal assumption was violated.
+    ///
+    /// This indicates a bug in the program rather than a user error.
+    InternalError,
 }

 impl DiagnosticId {
@@ -1055,6 +1083,9 @@ impl DiagnosticId {
            DiagnosticId::UnnecessaryOverridesSection => "unnecessary-overrides-section",
            DiagnosticId::UselessOverridesSection => "useless-overrides-section",
            DiagnosticId::DeprecatedSetting => "deprecated-setting",
+            DiagnosticId::Unformatted => "unformatted",
+            DiagnosticId::InvalidCliOption => "invalid-cli-option",
+            DiagnosticId::InternalError => "internal-error",
        }
    }

@@ -1353,7 +1384,7 @@ impl DisplayDiagnosticConfig {
    }

    /// Whether to show a fix's availability or not.
-    pub fn show_fix_status(self, yes: bool) -> DisplayDiagnosticConfig {
+    pub fn with_show_fix_status(self, yes: bool) -> DisplayDiagnosticConfig {
        DisplayDiagnosticConfig {
            show_fix_status: yes,
            ..self
@@ -1374,12 +1405,20 @@ impl DisplayDiagnosticConfig {
    /// availability for unsafe or display-only fixes.
    ///
    /// Note that this option is currently ignored when `hide_severity` is false.
-    pub fn fix_applicability(self, applicability: Applicability) -> DisplayDiagnosticConfig {
+    pub fn with_fix_applicability(self, applicability: Applicability) -> DisplayDiagnosticConfig {
        DisplayDiagnosticConfig {
            fix_applicability: applicability,
            ..self
        }
    }
+
+    pub fn show_fix_status(&self) -> bool {
+        self.show_fix_status
+    }
+
+    pub fn fix_applicability(&self) -> Applicability {
+        self.fix_applicability
+    }
 }

 impl Default for DisplayDiagnosticConfig {
--- a/crates/ruff_db/src/diagnostic/render.rs
+++ b/crates/ruff_db/src/diagnostic/render.rs
@@ -15,7 +15,6 @@ use crate::{
    Db,
    files::File,
    source::{SourceText, line_index, source_text},
-    system::SystemPath,
 };

 use super::{
@@ -209,6 +208,7 @@ struct ResolvedDiagnostic<'a> {
    message: String,
    annotations: Vec<ResolvedAnnotation<'a>>,
    is_fixable: bool,
+    header_offset: usize,
 }

 impl<'a> ResolvedDiagnostic<'a> {
@@ -259,7 +259,8 @@ impl<'a> ResolvedDiagnostic<'a> {
            id,
            message: diag.inner.message.as_str().to_string(),
            annotations,
-            is_fixable: diag.has_applicable_fix(config),
+            is_fixable: config.show_fix_status && diag.has_applicable_fix(config),
+            header_offset: diag.inner.header_offset,
        }
    }

@@ -289,6 +290,7 @@ impl<'a> ResolvedDiagnostic<'a> {
            message: diag.inner.message.as_str().to_string(),
            annotations,
            is_fixable: false,
+            header_offset: 0,
        }
    }

@@ -386,6 +388,7 @@ impl<'a> ResolvedDiagnostic<'a> {
            message: &self.message,
            snippets_by_input,
            is_fixable: self.is_fixable,
+            header_offset: self.header_offset,
        }
    }
 }
@@ -405,7 +408,7 @@ struct ResolvedAnnotation<'a> {
    line_end: OneIndexed,
    message: Option<&'a str>,
    is_primary: bool,
-    is_file_level: bool,
+    hide_snippet: bool,
    notebook_index: Option<NotebookIndex>,
 }

@@ -453,7 +456,7 @@ impl<'a> ResolvedAnnotation<'a> {
            line_end,
            message: ann.get_message(),
            is_primary: ann.is_primary,
-            is_file_level: ann.is_file_level,
+            hide_snippet: ann.hide_snippet,
            notebook_index: resolver.notebook_index(&ann.span.file),
        })
    }
@@ -493,6 +496,11 @@ struct RenderableDiagnostic<'r> {
    ///
    /// This is rendered as a `[*]` indicator after the diagnostic ID.
    is_fixable: bool,
+    /// Offset to align the header sigil (`-->`) with the subsequent line number separators.
+    ///
+    /// This is only needed for formatter diagnostics where we don't render a snippet via
+    /// `annotate-snippets` and thus the alignment isn't computed automatically.
+    header_offset: usize,
 }

 impl RenderableDiagnostic<'_> {
@@ -505,7 +513,11 @@ impl RenderableDiagnostic<'_> {
                .iter()
                .map(|snippet| snippet.to_annotate(path))
        });
-        let mut message = self.level.title(self.message).is_fixable(self.is_fixable);
+        let mut message = self
+            .level
+            .title(self.message)
+            .is_fixable(self.is_fixable)
+            .lineno_offset(self.header_offset);
        if let Some(id) = self.id {
            message = message.id(id);
        }
@@ -710,8 +722,8 @@ struct RenderableAnnotation<'r> {
    message: Option<&'r str>,
    /// Whether this annotation is considered "primary" or not.
    is_primary: bool,
-    /// Whether this annotation applies to an entire file, rather than a snippet within it.
-    is_file_level: bool,
+    /// Whether the snippet for this annotation should be hidden instead of rendered.
+    hide_snippet: bool,
 }

 impl<'r> RenderableAnnotation<'r> {
@@ -733,7 +745,7 @@ impl<'r> RenderableAnnotation<'r> {
            range,
            message: ann.message,
            is_primary: ann.is_primary,
-            is_file_level: ann.is_file_level,
+            hide_snippet: ann.hide_snippet,
        }
    }

@@ -759,7 +771,7 @@ impl<'r> RenderableAnnotation<'r> {
        if let Some(message) = self.message {
            ann = ann.label(message);
        }
-        ann.is_file_level(self.is_file_level)
+        ann.hide_snippet(self.hide_snippet)
    }
 }

@@ -800,7 +812,7 @@ where
    T: Db,
 {
    fn path(&self, file: File) -> &str {
-        relativize_path(self.system().current_directory(), file.path(self).as_str())
+        file.path(self).as_str()
    }

    fn input(&self, file: File) -> Input {
@@ -836,7 +848,7 @@ where

 impl FileResolver for &dyn Db {
    fn path(&self, file: File) -> &str {
-        relativize_path(self.system().current_directory(), file.path(*self).as_str())
+        file.path(*self).as_str()
    }

    fn input(&self, file: File) -> Input {
@@ -955,14 +967,6 @@ fn context_after(
    line
 }

-/// Convert an absolute path to be relative to the current working directory.
-fn relativize_path<'p>(cwd: &SystemPath, path: &'p str) -> &'p str {
-    if let Ok(path) = SystemPath::new(path).strip_prefix(cwd) {
-        return path.as_str();
-    }
-    path
-}
-
 /// Given some source code and annotation ranges, this routine replaces
 /// unprintable characters with printable representations of them.
 ///
@@ -2627,7 +2631,7 @@ watermelon
        /// Show fix availability when rendering.
        pub(super) fn show_fix_status(&mut self, yes: bool) {
            let mut config = std::mem::take(&mut self.config);
-            config = config.show_fix_status(yes);
+            config = config.with_show_fix_status(yes);
            self.config = config;
        }

@@ -2641,7 +2645,7 @@ watermelon
        /// The lowest fix applicability to show when rendering.
        pub(super) fn fix_applicability(&mut self, applicability: Applicability) {
            let mut config = std::mem::take(&mut self.config);
-            config = config.fix_applicability(applicability);
+            config = config.with_fix_applicability(applicability);
            self.config = config;
        }

--- a/crates/ruff_db/src/diagnostic/render/full.rs
+++ b/crates/ruff_db/src/diagnostic/render/full.rs
@@ -366,6 +366,7 @@ mod tests {
    fn hide_severity_output() {
        let (mut env, diagnostics) = create_diagnostics(DiagnosticFormat::Full);
        env.hide_severity(true);
+        env.show_fix_status(true);
        env.fix_applicability(Applicability::DisplayOnly);

        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r#"
@@ -572,7 +573,7 @@ print()
        let mut diagnostic = env.err().build();
        let span = env.path("example.py").with_range(TextRange::default());
        let mut annotation = Annotation::primary(span);
-        annotation.set_file_level(true);
+        annotation.hide_snippet(true);
        diagnostic.annotate(annotation);

        insta::assert_snapshot!(env.render(&diagnostic), @r"
@@ -584,7 +585,8 @@ print()
    /// Check that ranges in notebooks are remapped relative to the cells.
    #[test]
    fn notebook_output() {
-        let (env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
+        let (mut env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
+        env.show_fix_status(true);
        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
        error[unused-import][*]: `os` imported but unused
         --> notebook.ipynb:cell 1:2:8
@@ -698,6 +700,7 @@ print()
    fn notebook_output_with_diff() {
        let (mut env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
        env.show_fix_diff(true);
+        env.show_fix_status(true);
        env.fix_applicability(Applicability::DisplayOnly);

        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
@@ -752,6 +755,7 @@ print()
    fn notebook_output_with_diff_spanning_cells() {
        let (mut env, mut diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
        env.show_fix_diff(true);
+        env.show_fix_status(true);
        env.fix_applicability(Applicability::DisplayOnly);

        // Move all of the edits from the later diagnostics to the first diagnostic to simulate a
@@ -928,6 +932,7 @@ line 10
        env.add("example.py", contents);
        env.format(DiagnosticFormat::Full);
        env.show_fix_diff(true);
+        env.show_fix_status(true);
        env.fix_applicability(Applicability::DisplayOnly);

        let mut diagnostic = env.err().primary("example.py", "3", "3", "label").build();
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__output.snap
@@ -2,6 +2,6 @@
 source: crates/ruff_db/src/diagnostic/render/azure.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-##vso[task.logissue type=error;sourcepath=fib.py;linenumber=1;columnnumber=8;code=F401;]`os` imported but unused
-##vso[task.logissue type=error;sourcepath=fib.py;linenumber=6;columnnumber=5;code=F841;]Local variable `x` is assigned to but never used
-##vso[task.logissue type=error;sourcepath=undef.py;linenumber=1;columnnumber=4;code=F821;]Undefined name `a`
+##vso[task.logissue type=error;sourcepath=/fib.py;linenumber=1;columnnumber=8;code=F401;]`os` imported but unused
+##vso[task.logissue type=error;sourcepath=/fib.py;linenumber=6;columnnumber=5;code=F841;]Local variable `x` is assigned to but never used
+##vso[task.logissue type=error;sourcepath=/undef.py;linenumber=1;columnnumber=4;code=F821;]Undefined name `a`
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderazuretests__syntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/azure.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=1;columnnumber=15;code=invalid-syntax;]Expected one or more symbol names after import
-##vso[task.logissue type=error;sourcepath=syntax_errors.py;linenumber=3;columnnumber=12;code=invalid-syntax;]Expected ')', found newline
+##vso[task.logissue type=error;sourcepath=/syntax_errors.py;linenumber=1;columnnumber=15;code=invalid-syntax;]Expected one or more symbol names after import
+##vso[task.logissue type=error;sourcepath=/syntax_errors.py;linenumber=3;columnnumber=12;code=invalid-syntax;]Expected ')', found newline
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergithubtests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergithubtests__output.snap
@@ -2,6 +2,6 @@
 source: crates/ruff_db/src/diagnostic/render/github.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-::error title=ty (F401),file=fib.py,line=1,col=8,endLine=1,endColumn=10::fib.py:1:8: F401 `os` imported but unused
-::error title=ty (F841),file=fib.py,line=6,col=5,endLine=6,endColumn=6::fib.py:6:5: F841 Local variable `x` is assigned to but never used
-::error title=ty (F821),file=undef.py,line=1,col=4,endLine=1,endColumn=5::undef.py:1:4: F821 Undefined name `a`
+::error title=ty (F401),file=/fib.py,line=1,col=8,endLine=1,endColumn=10::fib.py:1:8: F401 `os` imported but unused
+::error title=ty (F841),file=/fib.py,line=6,col=5,endLine=6,endColumn=6::fib.py:6:5: F841 Local variable `x` is assigned to but never used
+::error title=ty (F821),file=/undef.py,line=1,col=4,endLine=1,endColumn=5::undef.py:1:4: F821 Undefined name `a`
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergithubtests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergithubtests__syntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/github.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-::error title=ty (invalid-syntax),file=syntax_errors.py,line=1,col=15,endLine=2,endColumn=1::syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
-::error title=ty (invalid-syntax),file=syntax_errors.py,line=3,col=12,endLine=4,endColumn=1::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
+::error title=ty (invalid-syntax),file=/syntax_errors.py,line=1,col=15,endLine=2,endColumn=1::syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
+::error title=ty (invalid-syntax),file=/syntax_errors.py,line=3,col=12,endLine=4,endColumn=1::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__notebook_output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__notebook_output.snap
@@ -10,7 +10,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 10,
      "row": 2
    },
-    "filename": "notebook.ipynb",
+    "filename": "/notebook.ipynb",
    "fix": {
      "applicability": "safe",
      "edits": [
@@ -43,7 +43,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 12,
      "row": 2
    },
-    "filename": "notebook.ipynb",
+    "filename": "/notebook.ipynb",
    "fix": {
      "applicability": "safe",
      "edits": [
@@ -76,7 +76,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 6,
      "row": 4
    },
-    "filename": "notebook.ipynb",
+    "filename": "/notebook.ipynb",
    "fix": {
      "applicability": "unsafe",
      "edits": [
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__output.snap
@@ -10,7 +10,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 10,
      "row": 1
    },
-    "filename": "fib.py",
+    "filename": "/fib.py",
    "fix": {
      "applicability": "unsafe",
      "edits": [
@@ -43,7 +43,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 6,
      "row": 6
    },
-    "filename": "fib.py",
+    "filename": "/fib.py",
    "fix": {
      "applicability": "unsafe",
      "edits": [
@@ -76,7 +76,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 5,
      "row": 1
    },
-    "filename": "undef.py",
+    "filename": "/undef.py",
    "fix": null,
    "location": {
      "column": 4,
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjsontests__syntax_errors.snap
@@ -10,7 +10,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 1,
      "row": 2
    },
-    "filename": "syntax_errors.py",
+    "filename": "/syntax_errors.py",
    "fix": null,
    "location": {
      "column": 15,
@@ -27,7 +27,7 @@ expression: env.render_diagnostics(&diagnostics)
      "column": 1,
      "row": 4
    },
-    "filename": "syntax_errors.py",
+    "filename": "/syntax_errors.py",
    "fix": null,
    "location": {
      "column": 12,
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestsnotebook_output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestsnotebook_output.snap
@@ -2,6 +2,6 @@
 source: crates/ruff_db/src/diagnostic/render/json_lines.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-{"cell":1,"code":"F401","end_location":{"column":10,"row":2},"filename":"notebook.ipynb","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":10,"row":2},"location":{"column":1,"row":2}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":2},"message":"`os` imported but unused","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
-{"cell":2,"code":"F401","end_location":{"column":12,"row":2},"filename":"notebook.ipynb","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":1,"row":3},"location":{"column":1,"row":2}}],"message":"Remove unused import: `math`"},"location":{"column":8,"row":2},"message":"`math` imported but unused","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
-{"cell":3,"code":"F841","end_location":{"column":6,"row":4},"filename":"notebook.ipynb","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":1,"row":5},"location":{"column":1,"row":4}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":4},"message":"Local variable `x` is assigned to but never used","noqa_row":4,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
+{"cell":1,"code":"F401","end_location":{"column":10,"row":2},"filename":"/notebook.ipynb","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":10,"row":2},"location":{"column":1,"row":2}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":2},"message":"`os` imported but unused","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
+{"cell":2,"code":"F401","end_location":{"column":12,"row":2},"filename":"/notebook.ipynb","fix":{"applicability":"safe","edits":[{"content":"","end_location":{"column":1,"row":3},"location":{"column":1,"row":2}}],"message":"Remove unused import: `math`"},"location":{"column":8,"row":2},"message":"`math` imported but unused","noqa_row":2,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
+{"cell":3,"code":"F841","end_location":{"column":6,"row":4},"filename":"/notebook.ipynb","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":1,"row":5},"location":{"column":1,"row":4}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":4},"message":"Local variable `x` is assigned to but never used","noqa_row":4,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestsoutput.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestsoutput.snap
@@ -2,6 +2,6 @@
 source: crates/ruff_db/src/diagnostic/render/json_lines.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-{"cell":null,"code":"F401","end_location":{"column":10,"row":1},"filename":"fib.py","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":1,"row":2},"location":{"column":1,"row":1}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":1},"message":"`os` imported but unused","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
-{"cell":null,"code":"F841","end_location":{"column":6,"row":6},"filename":"fib.py","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":10,"row":6},"location":{"column":5,"row":6}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":6},"message":"Local variable `x` is assigned to but never used","noqa_row":6,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
-{"cell":null,"code":"F821","end_location":{"column":5,"row":1},"filename":"undef.py","fix":null,"location":{"column":4,"row":1},"message":"Undefined name `a`","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/undefined-name"}
+{"cell":null,"code":"F401","end_location":{"column":10,"row":1},"filename":"/fib.py","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":1,"row":2},"location":{"column":1,"row":1}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":1},"message":"`os` imported but unused","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
+{"cell":null,"code":"F841","end_location":{"column":6,"row":6},"filename":"/fib.py","fix":{"applicability":"unsafe","edits":[{"content":"","end_location":{"column":10,"row":6},"location":{"column":5,"row":6}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":6},"message":"Local variable `x` is assigned to but never used","noqa_row":6,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
+{"cell":null,"code":"F821","end_location":{"column":5,"row":1},"filename":"/undef.py","fix":null,"location":{"column":4,"row":1},"message":"Undefined name `a`","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/undefined-name"}
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestssyntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrender__json_linestestssyntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/json_lines.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":2},"filename":"syntax_errors.py","fix":null,"location":{"column":15,"row":1},"message":"Expected one or more symbol names after import","noqa_row":null,"url":null}
-{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":4},"filename":"syntax_errors.py","fix":null,"location":{"column":12,"row":3},"message":"Expected ')', found newline","noqa_row":null,"url":null}
+{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":2},"filename":"/syntax_errors.py","fix":null,"location":{"column":15,"row":1},"message":"Expected one or more symbol names after import","noqa_row":null,"url":null}
+{"cell":null,"code":"invalid-syntax","end_location":{"column":1,"row":4},"filename":"/syntax_errors.py","fix":null,"location":{"column":12,"row":3},"message":"Expected ')', found newline","noqa_row":null,"url":null}
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjunittests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjunittests__output.snap
@@ -4,16 +4,16 @@ expression: env.render_diagnostics(&diagnostics)
 ---
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites name="ruff" tests="3" failures="3" errors="0">
-    <testsuite name="fib.py" tests="2" disabled="0" errors="0" failures="2" package="org.ruff">
-        <testcase name="org.ruff.F401" classname="fib" line="1" column="8">
+    <testsuite name="/fib.py" tests="2" disabled="0" errors="0" failures="2" package="org.ruff">
+        <testcase name="org.ruff.F401" classname="/fib" line="1" column="8">
            <failure message="`os` imported but unused">line 1, col 8, `os` imported but unused</failure>
        </testcase>
-        <testcase name="org.ruff.F841" classname="fib" line="6" column="5">
+        <testcase name="org.ruff.F841" classname="/fib" line="6" column="5">
            <failure message="Local variable `x` is assigned to but never used">line 6, col 5, Local variable `x` is assigned to but never used</failure>
        </testcase>
    </testsuite>
-    <testsuite name="undef.py" tests="1" disabled="0" errors="0" failures="1" package="org.ruff">
-        <testcase name="org.ruff.F821" classname="undef" line="1" column="4">
+    <testsuite name="/undef.py" tests="1" disabled="0" errors="0" failures="1" package="org.ruff">
+        <testcase name="org.ruff.F821" classname="/undef" line="1" column="4">
            <failure message="Undefined name `a`">line 1, col 4, Undefined name `a`</failure>
        </testcase>
    </testsuite>
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjunittests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderjunittests__syntax_errors.snap
@@ -4,11 +4,11 @@ expression: env.render_diagnostics(&diagnostics)
 ---
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites name="ruff" tests="2" failures="2" errors="0">
-    <testsuite name="syntax_errors.py" tests="2" disabled="0" errors="0" failures="2" package="org.ruff">
-        <testcase name="org.ruff.invalid-syntax" classname="syntax_errors" line="1" column="15">
+    <testsuite name="/syntax_errors.py" tests="2" disabled="0" errors="0" failures="2" package="org.ruff">
+        <testcase name="org.ruff.invalid-syntax" classname="/syntax_errors" line="1" column="15">
            <failure message="Expected one or more symbol names after import">line 1, col 15, Expected one or more symbol names after import</failure>
        </testcase>
-        <testcase name="org.ruff.invalid-syntax" classname="syntax_errors" line="3" column="12">
+        <testcase name="org.ruff.invalid-syntax" classname="/syntax_errors" line="3" column="12">
            <failure message="Expected &apos;)&apos;, found newline">line 3, col 12, Expected &apos;)&apos;, found newline</failure>
        </testcase>
    </testsuite>
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderrdjsontests__output.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderrdjsontests__output.snap
@@ -10,7 +10,7 @@ expression: env.render_diagnostics(&diagnostics)
        "value": "F401"
      },
      "location": {
-        "path": "fib.py",
+        "path": "/fib.py",
        "range": {
          "end": {
            "column": 10,
@@ -45,7 +45,7 @@ expression: env.render_diagnostics(&diagnostics)
        "value": "F841"
      },
      "location": {
-        "path": "fib.py",
+        "path": "/fib.py",
        "range": {
          "end": {
            "column": 6,
@@ -80,7 +80,7 @@ expression: env.render_diagnostics(&diagnostics)
        "value": "F821"
      },
      "location": {
-        "path": "undef.py",
+        "path": "/undef.py",
        "range": {
          "end": {
            "column": 5,
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderrdjsontests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrenderrdjsontests__syntax_errors.snap
@@ -9,7 +9,7 @@ expression: env.render_diagnostics(&diagnostics)
        "value": "invalid-syntax"
      },
      "location": {
-        "path": "syntax_errors.py",
+        "path": "/syntax_errors.py",
        "range": {
          "end": {
            "column": 1,
@@ -28,7 +28,7 @@ expression: env.render_diagnostics(&diagnostics)
        "value": "invalid-syntax"
      },
      "location": {
-        "path": "syntax_errors.py",
+        "path": "/syntax_errors.py",
        "range": {
          "end": {
            "column": 1,
--- a/crates/ruff_db/src/files/file_root.rs
+++ b/crates/ruff_db/src/files/file_root.rs
@@ -95,7 +95,10 @@ impl FileRoots {
        self.by_path.insert(route.clone(), root).unwrap();

        // Insert a path that matches all subdirectories and files
-        route.push_str("/{*filepath}");
+        if !route.ends_with("/") {
+            route.push('/');
+        }
+        route.push_str("{*filepath}");

        self.by_path.insert(route, root).unwrap();
        self.roots.push(root);
--- a/crates/ruff_db/src/panic.rs
+++ b/crates/ruff_db/src/panic.rs
@@ -31,6 +31,29 @@ impl Payload {
    }
 }

+impl PanicError {
+    pub fn to_diagnostic_message(&self, path: Option<impl std::fmt::Display>) -> String {
+        use std::fmt::Write;
+
+        let mut message = String::new();
+        message.push_str("Panicked");
+
+        if let Some(location) = &self.location {
+            let _ = write!(&mut message, " at {location}");
+        }
+
+        if let Some(path) = path {
+            let _ = write!(&mut message, " when checking `{path}`");
+        }
+
+        if let Some(payload) = self.payload.as_str() {
+            let _ = write!(&mut message, ": `{payload}`");
+        }
+
+        message
+    }
+}
+
 impl std::fmt::Display for PanicError {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        write!(f, "panicked at")?;
--- a/crates/ruff_formatter/src/diagnostics.rs
+++ b/crates/ruff_formatter/src/diagnostics.rs
@@ -38,12 +38,12 @@ impl std::fmt::Display for FormatError {
            ),
            FormatError::InvalidDocument(error) => std::write!(
                fmt,
-                "Invalid document: {error}\n\n This is an internal Rome error. Please report if necessary."
+                "Invalid document: {error}\n\n This is an internal Ruff error. Please report if necessary."
            ),
            FormatError::PoorLayout => {
                std::write!(
                    fmt,
-                    "Poor layout: The formatter wasn't able to pick a good layout for your document. This is an internal Rome error. Please report if necessary."
+                    "Poor layout: The formatter wasn't able to pick a good layout for your document. This is an internal Ruff error. Please report if necessary."
                )
            }
        }
--- a/crates/ruff_linter/Cargo.toml
+++ b/crates/ruff_linter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.13.1"
+version = "0.13.3"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
--- a/crates/ruff_linter/resources/test/fixtures/flake8_annotations/shadowed_builtins.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_annotations/shadowed_builtins.py
@@ -0,0 +1,21 @@
+from collections import UserString as str
+from typing import override
+
+def foo():
+    return "!"
+
+def _foo():
+    return "!"
+
+class C:
+    @override
+    def __str__(self):
+        return "!"
+    
+    @staticmethod
+    def foo():
+        return "!"
+    
+    @classmethod
+    def bar(cls):
+        return "!"
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B006_9.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B006_9.py
@@ -0,0 +1,26 @@
+def f1(x=([],)):
+    print(x)
+
+
+def f2(x=(x for x in "x")):
+    print(x)
+
+
+def f3(x=((x for x in "x"),)):
+    print(x)
+
+
+def f4(x=(z := [1, ])):
+    print(x)
+
+
+def f5(x=([1, ])):
+    print(x)
+
+
+def w1(x=(1,)):
+    print(x)
+
+
+def w2(x=(z := 3)):
+    print(x)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_future_annotations/no_future_import_uses_preview_generics.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_future_annotations/no_future_import_uses_preview_generics.py
@@ -0,0 +1,91 @@
+import asyncio
+import collections
+import contextlib
+import dataclasses
+import functools
+import os
+import queue
+import re
+import shelve
+import types
+import weakref
+from collections.abc import (
+    AsyncGenerator,
+    AsyncIterable,
+    AsyncIterator,
+    Awaitable,
+    ByteString,
+    Callable,
+    Collection,
+    Container,
+    Coroutine,
+    Generator,
+    Iterable,
+    Iterator,
+    ItemsView,
+    KeysView,
+    Mapping,
+    MappingView,
+    MutableMapping,
+    MutableSequence,
+    MutableSet,
+    Reversible,
+    Sequence,
+    Set,
+    ValuesView,
+)
+
+
+def takes_preview_generics(
+    future: asyncio.Future[int],
+    task: asyncio.Task[str],
+    deque_object: collections.deque[int],
+    defaultdict_object: collections.defaultdict[str, int],
+    ordered_dict: collections.OrderedDict[str, int],
+    counter_obj: collections.Counter[str],
+    chain_map: collections.ChainMap[str, int],
+    context_manager: contextlib.AbstractContextManager[str],
+    async_context_manager: contextlib.AbstractAsyncContextManager[int],
+    dataclass_field: dataclasses.Field[int],
+    cached_prop: functools.cached_property[int],
+    partial_method: functools.partialmethod[int],
+    path_like: os.PathLike[str],
+    lifo_queue: queue.LifoQueue[int],
+    regular_queue: queue.Queue[int],
+    priority_queue: queue.PriorityQueue[int],
+    simple_queue: queue.SimpleQueue[int],
+    regex_pattern: re.Pattern[str],
+    regex_match: re.Match[str],
+    bsd_db_shelf: shelve.BsdDbShelf[str, int],
+    db_filename_shelf: shelve.DbfilenameShelf[str, int],
+    shelf_obj: shelve.Shelf[str, int],
+    mapping_proxy: types.MappingProxyType[str, int],
+    weak_key_dict: weakref.WeakKeyDictionary[object, int],
+    weak_method: weakref.WeakMethod[int],
+    weak_set: weakref.WeakSet[int],
+    weak_value_dict: weakref.WeakValueDictionary[object, int],
+    awaitable: Awaitable[int],
+    coroutine: Coroutine[int, None, str],
+    async_iterable: AsyncIterable[int],
+    async_iterator: AsyncIterator[int],
+    async_generator: AsyncGenerator[int, None],
+    iterable: Iterable[int],
+    iterator: Iterator[int],
+    generator: Generator[int, None, None],
+    reversible: Reversible[int],
+    container: Container[int],
+    collection: Collection[int],
+    callable_obj: Callable[[int], str],
+    set_obj: Set[int],
+    mutable_set: MutableSet[int],
+    mapping: Mapping[str, int],
+    mutable_mapping: MutableMapping[str, int],
+    sequence: Sequence[int],
+    mutable_sequence: MutableSequence[int],
+    byte_string: ByteString[int],
+    mapping_view: MappingView[str, int],
+    keys_view: KeysView[str],
+    items_view: ItemsView[str, int],
+    values_view: ValuesView[int],
+) -> None:
+    ...
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI021_1.pyi
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI021_1.pyi
@@ -0,0 +1,18 @@
+from contextlib import nullcontext
+
+
+def check_isolation_level(mode: int) -> None:
+    """Will report both, but only fix the first."""  # ERROR PYI021
+    ...  # ERROR PIE790
+
+
+with nullcontext():
+    """Should not report."""
+    # add something thats not a pass here
+    # to not get a remove unnecessary pass err
+    x = 0
+
+if True:
+    """Should not report."""
+    # same as above
+    y = 1
--- a/crates/ruff_linter/resources/test/fixtures/flynt/FLY002.py
+++ b/crates/ruff_linter/resources/test/fixtures/flynt/FLY002.py
@@ -23,3 +23,9 @@ nok9 = '\n'.join([r"raw string", '<""">', "<'''>"])  # Not OK (both triple-quote
 # Regression test for: https://github.com/astral-sh/ruff/issues/7197
 def create_file_public_url(url, filename):
    return''.join([url, filename])
+
+# Regression test for: https://github.com/astral-sh/ruff/issues/19837
+nok10 = "".join((foo, '"'))
+nok11 = ''.join((foo, "'"))
+nok12 = ''.join([foo, "'", '"'])
+nok13 = "".join([foo, "'", '"'])
--- a/crates/ruff_linter/resources/test/fixtures/isort/required_imports/plr0402_skip.py
+++ b/crates/ruff_linter/resources/test/fixtures/isort/required_imports/plr0402_skip.py
@@ -0,0 +1,3 @@
+import concurrent.futures as futures
+
+1
--- a/crates/ruff_linter/resources/test/fixtures/isort/required_imports/plr0402_skips_required_import.py
+++ b/crates/ruff_linter/resources/test/fixtures/isort/required_imports/plr0402_skips_required_import.py
@@ -0,0 +1,3 @@
+import concurrent.futures as futures
+
+1
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP029_0.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP029_0.py
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP029_1.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP029_1.py
@@ -0,0 +1 @@
+from builtins import str, int
--- a/crates/ruff_linter/resources/test/fixtures/ruff/RUF065.py
+++ b/crates/ruff_linter/resources/test/fixtures/ruff/RUF065.py
@@ -37,3 +37,9 @@ log(logging.INFO, "Hello %r", repr("World!"))
 def str(s): return f"str = {s}"
 # Don't flag this
 logging.info("Hello %s", str("World!"))
+
+logging.info("Debug info: %r", repr("test\nstring"))
+logging.warning("Value: %r", repr(42))
+logging.error("Error: %r", repr([1, 2, 3]))
+logging.info("Debug info: %s", repr("test\nstring"))
+logging.warning("Value: %s", repr(42))
--- a/crates/ruff_linter/src/checkers/ast/analyze/definitions.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/definitions.rs
@@ -145,9 +145,6 @@ pub(crate) fn definitions(checker: &mut Checker) {
        }

        // flake8-pyi
-        if enforce_stubs {
-            flake8_pyi::rules::docstring_in_stubs(checker, definition, docstring);
-        }
        if enforce_stubs_and_runtime {
            flake8_pyi::rules::iter_method_return_iterable(checker, definition);
        }
--- a/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
@@ -8,7 +8,8 @@ use ruff_text_size::Ranged;

 use crate::checkers::ast::Checker;
 use crate::preview::{
-    is_optional_as_none_in_union_enabled, is_unnecessary_default_type_args_stubs_enabled,
+    is_future_required_preview_generics_enabled, is_optional_as_none_in_union_enabled,
+    is_unnecessary_default_type_args_stubs_enabled,
 };
 use crate::registry::Rule;
 use crate::rules::{
@@ -69,7 +70,11 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                    && checker.semantic.in_annotation()
                    && checker.semantic.in_runtime_evaluated_annotation()
                    && !checker.semantic.in_string_type_definition()
-                    && typing::is_pep585_generic(value, &checker.semantic)
+                    && typing::is_pep585_generic(
+                        value,
+                        &checker.semantic,
+                        is_future_required_preview_generics_enabled(checker.settings()),
+                    )
                {
                    flake8_future_annotations::rules::future_required_type_annotation(
                        checker,
@@ -212,13 +217,10 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
            if ctx.is_store() {
                let check_too_many_expressions =
                    checker.is_rule_enabled(Rule::ExpressionsInStarAssignment);
-                let check_two_starred_expressions =
-                    checker.is_rule_enabled(Rule::MultipleStarredExpressions);
                pyflakes::rules::starred_expressions(
                    checker,
                    elts,
                    check_too_many_expressions,
-                    check_two_starred_expressions,
                    expr.range(),
                );
            }
--- a/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
@@ -803,11 +803,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                }
            }
            for alias in names {
-                if let Some("__future__") = module {
-                    if checker.is_rule_enabled(Rule::FutureFeatureNotDefined) {
-                        pyflakes::rules::future_feature_not_defined(checker, alias);
-                    }
-                } else if &alias.name == "*" {
+                if module != Some("__future__") && &alias.name == "*" {
                    // F403
                    checker.report_diagnostic_if_enabled(
                        pyflakes::rules::UndefinedLocalWithImportStar {
--- a/crates/ruff_linter/src/checkers/ast/analyze/suite.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/suite.rs
@@ -2,14 +2,17 @@ use ruff_python_ast::Stmt;

 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
-use crate::rules::flake8_pie;
 use crate::rules::refurb;
+use crate::rules::{flake8_pie, flake8_pyi};

 /// Run lint rules over a suite of [`Stmt`] syntax nodes.
 pub(crate) fn suite(suite: &[Stmt], checker: &Checker) {
    if checker.is_rule_enabled(Rule::UnnecessaryPlaceholder) {
        flake8_pie::rules::unnecessary_placeholder(checker, suite);
    }
+    if checker.source_type.is_stub() && checker.is_rule_enabled(Rule::DocstringInStub) {
+        flake8_pyi::rules::docstring_in_stubs(checker, suite);
+    }
    if checker.is_rule_enabled(Rule::RepeatedGlobal) {
        refurb::rules::repeated_global(checker, suite);
    }
--- a/crates/ruff_linter/src/checkers/ast/mod.rs
+++ b/crates/ruff_linter/src/checkers/ast/mod.rs
@@ -28,7 +28,7 @@ use itertools::Itertools;
 use log::debug;
 use rustc_hash::{FxHashMap, FxHashSet};

-use ruff_db::diagnostic::{Annotation, Diagnostic, IntoDiagnosticMessage, Span};
+use ruff_db::diagnostic::{Annotation, Diagnostic, DiagnosticTag, IntoDiagnosticMessage, Span};
 use ruff_diagnostics::{Applicability, Fix, IsolationLevel};
 use ruff_notebook::{CellOffsets, NotebookIndex};
 use ruff_python_ast::helpers::{collect_import_from_member, is_docstring_stmt, to_module_path};
@@ -69,8 +69,8 @@ use crate::package::PackageRoot;
 use crate::preview::is_undefined_export_in_dunder_init_enabled;
 use crate::registry::Rule;
 use crate::rules::pyflakes::rules::{
-    LateFutureImport, ReturnOutsideFunction, UndefinedLocalWithNestedImportStarUsage,
-    YieldOutsideFunction,
+    LateFutureImport, MultipleStarredExpressions, ReturnOutsideFunction,
+    UndefinedLocalWithNestedImportStarUsage, YieldOutsideFunction,
 };
 use crate::rules::pylint::rules::{
    AwaitOutsideAsync, LoadBeforeGlobalDeclaration, YieldFromInAsyncFunction,
@@ -87,7 +87,7 @@ mod deferred;

 /// State representing whether a docstring is expected or not for the next statement.
 #[derive(Debug, Copy, Clone, PartialEq)]
-enum DocstringState {
+pub(crate) enum DocstringState {
    /// The next statement is expected to be a docstring, but not necessarily so.
    ///
    /// For example, in the following code:
@@ -128,7 +128,7 @@ impl DocstringState {

 /// The kind of an expected docstring.
 #[derive(Debug, Copy, Clone, PartialEq)]
-enum ExpectedDocstringKind {
+pub(crate) enum ExpectedDocstringKind {
    /// A module-level docstring.
    ///
    /// For example,
@@ -603,6 +603,11 @@ impl<'a> Checker<'a> {
    pub(crate) const fn context(&self) -> &'a LintContext<'a> {
        self.context
    }
+
+    /// Return the current [`DocstringState`].
+    pub(crate) fn docstring_state(&self) -> DocstringState {
+        self.docstring_state
+    }
 }

 pub(crate) struct TypingImporter<'a, 'b> {
@@ -685,6 +690,20 @@ impl SemanticSyntaxContext for Checker<'_> {
                    self.report_diagnostic(YieldFromInAsyncFunction, error.range);
                }
            }
+            SemanticSyntaxErrorKind::MultipleStarredExpressions => {
+                // F622
+                if self.is_rule_enabled(Rule::MultipleStarredExpressions) {
+                    self.report_diagnostic(MultipleStarredExpressions, error.range);
+                }
+            }
+            SemanticSyntaxErrorKind::FutureFeatureNotDefined(name) => {
+                if self.is_rule_enabled(Rule::FutureFeatureNotDefined) {
+                    self.report_diagnostic(
+                        pyflakes::rules::FutureFeatureNotDefined { name },
+                        error.range,
+                    );
+                }
+            }
            SemanticSyntaxErrorKind::ReboundComprehensionVariable
            | SemanticSyntaxErrorKind::DuplicateTypeParameter
            | SemanticSyntaxErrorKind::MultipleCaseAssignment(_)
@@ -2341,7 +2360,7 @@ impl<'a> Checker<'a> {
        }
    }

-    /// Visit an body of [`Stmt`] nodes within a type-checking block.
+    /// Visit a body of [`Stmt`] nodes within a type-checking block.
    fn visit_type_checking_block(&mut self, body: &'a [Stmt]) {
        let snapshot = self.semantic.flags;
        self.semantic.flags |= SemanticModelFlags::TYPE_CHECKING_BLOCK;
@@ -3307,6 +3326,56 @@ impl DiagnosticGuard<'_, '_> {
    pub(crate) fn defuse(mut self) {
        self.diagnostic = None;
    }
+
+    /// Set the message on the primary annotation for this diagnostic.
+    ///
+    /// If a message already exists on the primary annotation, then this
+    /// overwrites the existing message.
+    ///
+    /// This message is associated with the primary annotation created
+    /// for every `Diagnostic` that uses the `DiagnosticGuard` API.
+    /// Specifically, the annotation is derived from the `TextRange` given to
+    /// the `LintContext::report_diagnostic` API.
+    ///
+    /// Callers can add additional primary or secondary annotations via the
+    /// `DerefMut` trait implementation to a `Diagnostic`.
+    pub(crate) fn set_primary_message(&mut self, message: impl IntoDiagnosticMessage) {
+        // N.B. It is normally bad juju to define `self` methods
+        // on types that implement `Deref`. Instead, it's idiomatic
+        // to do `fn foo(this: &mut LintDiagnosticGuard)`, which in
+        // turn forces callers to use
+        // `LintDiagnosticGuard(&mut guard, message)`. But this is
+        // supremely annoying for what is expected to be a common
+        // case.
+        //
+        // Moreover, most of the downside that comes from these sorts
+        // of methods is a semver hazard. Because the deref target type
+        // could also define a method by the same name, and that leads
+        // to confusion. But we own all the code involved here and
+        // there is no semver boundary. So... ¯\_(ツ)_/¯ ---AG
+
+        // OK because we know the diagnostic was constructed with a single
+        // primary annotation that will always come before any other annotation
+        // in the diagnostic. (This relies on the `Diagnostic` API not exposing
+        // any methods for removing annotations or re-ordering them, which is
+        // true as of 2025-04-11.)
+        let ann = self.primary_annotation_mut().unwrap();
+        ann.set_message(message);
+    }
+
+    /// Adds a tag on the primary annotation for this diagnostic.
+    ///
+    /// This tag is associated with the primary annotation created
+    /// for every `Diagnostic` that uses the `DiagnosticGuard` API.
+    /// Specifically, the annotation is derived from the `TextRange` given to
+    /// the `LintContext::report_diagnostic` API.
+    ///
+    /// Callers can add additional primary or secondary annotations via the
+    /// `DerefMut` trait implementation to a `Diagnostic`.
+    pub(crate) fn add_primary_tag(&mut self, tag: DiagnosticTag) {
+        let ann = self.primary_annotation_mut().unwrap();
+        ann.push_tag(tag);
+    }
 }

 impl DiagnosticGuard<'_, '_> {
--- a/crates/ruff_linter/src/logging.rs
+++ b/crates/ruff_linter/src/logging.rs
@@ -223,6 +223,11 @@ impl DisplayParseError {
    pub fn path(&self) -> Option<&Path> {
        self.path.as_deref()
    }
+
+    /// Return the underlying [`ParseError`].
+    pub fn error(&self) -> &ParseError {
+        &self.error
+    }
 }

 impl std::error::Error for DisplayParseError {}
--- a/crates/ruff_linter/src/message/grouped.rs
+++ b/crates/ruff_linter/src/message/grouped.rs
@@ -6,17 +6,25 @@ use std::num::NonZeroUsize;
 use colored::Colorize;

 use ruff_db::diagnostic::Diagnostic;
+use ruff_diagnostics::Applicability;
 use ruff_notebook::NotebookIndex;
 use ruff_source_file::{LineColumn, OneIndexed};

 use crate::fs::relativize_path;
 use crate::message::{Emitter, EmitterContext};
-use crate::settings::types::UnsafeFixes;

-#[derive(Default)]
 pub struct GroupedEmitter {
    show_fix_status: bool,
-    unsafe_fixes: UnsafeFixes,
+    applicability: Applicability,
+}
+
+impl Default for GroupedEmitter {
+    fn default() -> Self {
+        Self {
+            show_fix_status: false,
+            applicability: Applicability::Safe,
+        }
+    }
 }

 impl GroupedEmitter {
@@ -27,8 +35,8 @@ impl GroupedEmitter {
    }

    #[must_use]
-    pub fn with_unsafe_fixes(mut self, unsafe_fixes: UnsafeFixes) -> Self {
-        self.unsafe_fixes = unsafe_fixes;
+    pub fn with_applicability(mut self, applicability: Applicability) -> Self {
+        self.applicability = applicability;
        self
    }
 }
@@ -67,7 +75,7 @@ impl Emitter for GroupedEmitter {
                        notebook_index: context.notebook_index(&message.expect_ruff_filename()),
                        message,
                        show_fix_status: self.show_fix_status,
-                        unsafe_fixes: self.unsafe_fixes,
+                        applicability: self.applicability,
                        row_length,
                        column_length,
                    }
@@ -114,7 +122,7 @@ fn group_diagnostics_by_filename(
 struct DisplayGroupedMessage<'a> {
    message: MessageWithLocation<'a>,
    show_fix_status: bool,
-    unsafe_fixes: UnsafeFixes,
+    applicability: Applicability,
    row_length: NonZeroUsize,
    column_length: NonZeroUsize,
    notebook_index: Option<&'a NotebookIndex>,
@@ -162,7 +170,7 @@ impl Display for DisplayGroupedMessage<'_> {
            code_and_body = RuleCodeAndBody {
                message,
                show_fix_status: self.show_fix_status,
-                unsafe_fixes: self.unsafe_fixes
+                applicability: self.applicability
            },
        )?;

@@ -173,7 +181,7 @@ impl Display for DisplayGroupedMessage<'_> {
 pub(super) struct RuleCodeAndBody<'a> {
    pub(crate) message: &'a Diagnostic,
    pub(crate) show_fix_status: bool,
-    pub(crate) unsafe_fixes: UnsafeFixes,
+    pub(crate) applicability: Applicability,
 }

 impl Display for RuleCodeAndBody<'_> {
@@ -181,7 +189,7 @@ impl Display for RuleCodeAndBody<'_> {
        if self.show_fix_status {
            if let Some(fix) = self.message.fix() {
                // Do not display an indicator for inapplicable fixes
-                if fix.applies(self.unsafe_fixes.required_applicability()) {
+                if fix.applies(self.applicability) {
                    if let Some(code) = self.message.secondary_code() {
                        write!(f, "{} ", code.red().bold())?;
                    }
@@ -217,11 +225,12 @@ impl Display for RuleCodeAndBody<'_> {
 mod tests {
    use insta::assert_snapshot;

+    use ruff_diagnostics::Applicability;
+
    use crate::message::GroupedEmitter;
    use crate::message::tests::{
        capture_emitter_output, create_diagnostics, create_syntax_error_diagnostics,
    };
-    use crate::settings::types::UnsafeFixes;

    #[test]
    fn default() {
@@ -251,7 +260,7 @@ mod tests {
    fn fix_status_unsafe() {
        let mut emitter = GroupedEmitter::default()
            .with_show_fix_status(true)
-            .with_unsafe_fixes(UnsafeFixes::Enabled);
+            .with_applicability(Applicability::Unsafe);
        let content = capture_emitter_output(&mut emitter, &create_diagnostics());

        assert_snapshot!(content);
--- a/crates/ruff_linter/src/message/mod.rs
+++ b/crates/ruff_linter/src/message/mod.rs
@@ -1,27 +1,30 @@
+use std::backtrace::BacktraceStatus;
 use std::fmt::Display;
 use std::io::Write;
+use std::path::Path;

+use ruff_db::panic::PanicError;
 use rustc_hash::FxHashMap;

 use ruff_db::diagnostic::{
-    Annotation, Diagnostic, DiagnosticId, FileResolver, Input, LintName, SecondaryCode, Severity,
-    Span, UnifiedFile,
+    Annotation, Diagnostic, DiagnosticFormat, DiagnosticId, DisplayDiagnosticConfig,
+    DisplayDiagnostics, DisplayGithubDiagnostics, FileResolver, GithubRenderer, Input, LintName,
+    SecondaryCode, Severity, Span, SubDiagnostic, SubDiagnosticSeverity, UnifiedFile,
 };
 use ruff_db::files::File;

 pub use grouped::GroupedEmitter;
 use ruff_notebook::NotebookIndex;
-use ruff_source_file::SourceFile;
+use ruff_source_file::{SourceFile, SourceFileBuilder};
 use ruff_text_size::{Ranged, TextRange, TextSize};
 pub use sarif::SarifEmitter;
-pub use text::TextEmitter;

 use crate::Fix;
 use crate::registry::Rule;
+use crate::settings::types::{OutputFormat, RuffOutputFormat};

 mod grouped;
 mod sarif;
-mod text;

 /// Creates a `Diagnostic` from a syntax error, with the format expected by Ruff.
 ///
@@ -41,6 +44,55 @@ pub fn create_syntax_error_diagnostic(
    diag
 }

+/// Create a `Diagnostic` from a panic.
+pub fn create_panic_diagnostic(error: &PanicError, path: Option<&Path>) -> Diagnostic {
+    let mut diagnostic = Diagnostic::new(
+        DiagnosticId::Panic,
+        Severity::Fatal,
+        error.to_diagnostic_message(path.as_ref().map(|path| path.display())),
+    );
+
+    diagnostic.sub(SubDiagnostic::new(
+        SubDiagnosticSeverity::Info,
+        "This indicates a bug in Ruff.",
+    ));
+    let report_message = "If you could open an issue at \
+                            https://github.com/astral-sh/ruff/issues/new?title=%5Bpanic%5D, \
+                            we'd be very appreciative!";
+    diagnostic.sub(SubDiagnostic::new(
+        SubDiagnosticSeverity::Info,
+        report_message,
+    ));
+
+    if let Some(backtrace) = &error.backtrace {
+        match backtrace.status() {
+            BacktraceStatus::Disabled => {
+                diagnostic.sub(SubDiagnostic::new(
+                            SubDiagnosticSeverity::Info,
+                            "run with `RUST_BACKTRACE=1` environment variable to show the full backtrace information",
+                        ));
+            }
+            BacktraceStatus::Captured => {
+                diagnostic.sub(SubDiagnostic::new(
+                    SubDiagnosticSeverity::Info,
+                    format!("Backtrace:\n{backtrace}"),
+                ));
+            }
+            _ => {}
+        }
+    }
+
+    if let Some(path) = path {
+        let file = SourceFileBuilder::new(path.to_string_lossy(), "").finish();
+        let span = Span::from(file);
+        let mut annotation = Annotation::primary(span);
+        annotation.hide_snippet(true);
+        diagnostic.annotate(annotation);
+    }
+
+    diagnostic
+}
+
 #[expect(clippy::too_many_arguments)]
 pub fn create_lint_diagnostic<B, S>(
    body: B,
@@ -70,7 +122,7 @@ where
    // actually need it, but we need to be able to cache the new diagnostic model first. See
    // https://github.com/astral-sh/ruff/issues/19688.
    if range == TextRange::default() {
-        annotation.set_file_level(true);
+        annotation.hide_snippet(true);
    }
    diagnostic.annotate(annotation);

@@ -160,14 +212,48 @@ impl<'a> EmitterContext<'a> {
    }
 }

+pub fn render_diagnostics(
+    writer: &mut dyn Write,
+    format: OutputFormat,
+    config: DisplayDiagnosticConfig,
+    context: &EmitterContext<'_>,
+    diagnostics: &[Diagnostic],
+) -> std::io::Result<()> {
+    match DiagnosticFormat::try_from(format) {
+        Ok(format) => {
+            let config = config.format(format);
+            let value = DisplayDiagnostics::new(context, &config, diagnostics);
+            write!(writer, "{value}")?;
+        }
+        Err(RuffOutputFormat::Github) => {
+            let renderer = GithubRenderer::new(context, "Ruff");
+            let value = DisplayGithubDiagnostics::new(&renderer, diagnostics);
+            write!(writer, "{value}")?;
+        }
+        Err(RuffOutputFormat::Grouped) => {
+            GroupedEmitter::default()
+                .with_show_fix_status(config.show_fix_status())
+                .with_applicability(config.fix_applicability())
+                .emit(writer, diagnostics, context)
+                .map_err(std::io::Error::other)?;
+        }
+        Err(RuffOutputFormat::Sarif) => {
+            SarifEmitter
+                .emit(writer, diagnostics, context)
+                .map_err(std::io::Error::other)?;
+        }
+    }
+
+    Ok(())
+}
+
 #[cfg(test)]
 mod tests {
    use rustc_hash::FxHashMap;

    use ruff_db::diagnostic::Diagnostic;
-    use ruff_notebook::NotebookIndex;
    use ruff_python_parser::{Mode, ParseOptions, parse_unchecked};
-    use ruff_source_file::{OneIndexed, SourceFileBuilder};
+    use ruff_source_file::SourceFileBuilder;
    use ruff_text_size::{TextRange, TextSize};

    use crate::codes::Rule;
@@ -257,104 +343,6 @@ def fibonacci(n):
        vec![unused_import, unused_variable, undefined_name]
    }

-    pub(super) fn create_notebook_diagnostics()
-    -> (Vec<Diagnostic>, FxHashMap<String, NotebookIndex>) {
-        let notebook = r"# cell 1
-import os
-# cell 2
-import math
-
-print('hello world')
-# cell 3
-def foo():
-    print()
-    x = 1
-";
-
-        let notebook_source = SourceFileBuilder::new("notebook.ipynb", notebook).finish();
-
-        let unused_import_os_start = TextSize::from(16);
-        let unused_import_os = create_lint_diagnostic(
-            "`os` imported but unused",
-            Some("Remove unused import: `os`"),
-            TextRange::new(unused_import_os_start, TextSize::from(18)),
-            Some(Fix::safe_edit(Edit::range_deletion(TextRange::new(
-                TextSize::from(9),
-                TextSize::from(19),
-            )))),
-            None,
-            notebook_source.clone(),
-            Some(unused_import_os_start),
-            Rule::UnusedImport,
-        );
-
-        let unused_import_math_start = TextSize::from(35);
-        let unused_import_math = create_lint_diagnostic(
-            "`math` imported but unused",
-            Some("Remove unused import: `math`"),
-            TextRange::new(unused_import_math_start, TextSize::from(39)),
-            Some(Fix::safe_edit(Edit::range_deletion(TextRange::new(
-                TextSize::from(28),
-                TextSize::from(40),
-            )))),
-            None,
-            notebook_source.clone(),
-            Some(unused_import_math_start),
-            Rule::UnusedImport,
-        );
-
-        let unused_variable_start = TextSize::from(98);
-        let unused_variable = create_lint_diagnostic(
-            "Local variable `x` is assigned to but never used",
-            Some("Remove assignment to unused variable `x`"),
-            TextRange::new(unused_variable_start, TextSize::from(99)),
-            Some(Fix::unsafe_edit(Edit::deletion(
-                TextSize::from(94),
-                TextSize::from(104),
-            ))),
-            None,
-            notebook_source,
-            Some(unused_variable_start),
-            Rule::UnusedVariable,
-        );
-
-        let mut notebook_indexes = FxHashMap::default();
-        notebook_indexes.insert(
-            "notebook.ipynb".to_string(),
-            NotebookIndex::new(
-                vec![
-                    OneIndexed::from_zero_indexed(0),
-                    OneIndexed::from_zero_indexed(0),
-                    OneIndexed::from_zero_indexed(1),
-                    OneIndexed::from_zero_indexed(1),
-                    OneIndexed::from_zero_indexed(1),
-                    OneIndexed::from_zero_indexed(1),
-                    OneIndexed::from_zero_indexed(2),
-                    OneIndexed::from_zero_indexed(2),
-                    OneIndexed::from_zero_indexed(2),
-                    OneIndexed::from_zero_indexed(2),
-                ],
-                vec![
-                    OneIndexed::from_zero_indexed(0),
-                    OneIndexed::from_zero_indexed(1),
-                    OneIndexed::from_zero_indexed(0),
-                    OneIndexed::from_zero_indexed(1),
-                    OneIndexed::from_zero_indexed(2),
-                    OneIndexed::from_zero_indexed(3),
-                    OneIndexed::from_zero_indexed(0),
-                    OneIndexed::from_zero_indexed(1),
-                    OneIndexed::from_zero_indexed(2),
-                    OneIndexed::from_zero_indexed(3),
-                ],
-            ),
-        );
-
-        (
-            vec![unused_import_os, unused_import_math, unused_variable],
-            notebook_indexes,
-        )
-    }
-
    pub(super) fn capture_emitter_output(
        emitter: &mut dyn Emitter,
        diagnostics: &[Diagnostic],
@@ -366,16 +354,4 @@ def foo():

        String::from_utf8(output).expect("Output to be valid UTF-8")
    }
-
-    pub(super) fn capture_emitter_notebook_output(
-        emitter: &mut dyn Emitter,
-        diagnostics: &[Diagnostic],
-        notebook_indexes: &FxHashMap<String, NotebookIndex>,
-    ) -> String {
-        let context = EmitterContext::new(notebook_indexes);
-        let mut output: Vec<u8> = Vec::new();
-        emitter.emit(&mut output, diagnostics, &context).unwrap();
-
-        String::from_utf8(output).expect("Output to be valid UTF-8")
-    }
 }
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagesariftestsresults.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagesariftestsresults.snap
@@ -129,7 +129,7 @@ expression: value
          "rules": [
            {
              "fullDescription": {
-                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\nSee [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc)\nfor more details on how Ruff\ndetermines whether an import is first or third-party.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)\n"
+                "text": "## What it does\nChecks for unused imports.\n\n## Why is this bad?\nUnused imports add a performance overhead at runtime, and risk creating\nimport cycles. They also increase the cognitive load of reading the code.\n\nIf an import statement is used to check for the availability or existence\nof a module, consider using `importlib.util.find_spec` instead.\n\nIf an import statement is used to re-export a symbol as part of a module's\npublic interface, consider using a \"redundant\" import alias, which\ninstructs Ruff (and other tools) to respect the re-export, and avoid\nmarking it as unused, as in:\n\n```python\nfrom module import member as member\n```\n\nAlternatively, you can use `__all__` to declare a symbol as part of the module's\ninterface, as in:\n\n```python\n# __init__.py\nimport some_module\n\n__all__ = [\"some_module\"]\n```\n\n## Preview\nWhen [preview] is enabled (and certain simplifying assumptions\nare met), we analyze all import statements for a given module\nwhen determining whether an import is used, rather than simply\nthe last of these statements. This can result in both different and\nmore import statements being marked as unused.\n\nFor example, if a module consists of\n\n```python\nimport a\nimport a.b\n```\n\nthen both statements are marked as unused under [preview], whereas\nonly the second is marked as unused under stable behavior.\n\nAs another example, if a module consists of\n\n```python\nimport a.b\nimport a\n\na.b.foo()\n```\n\nthen a diagnostic will only be emitted for the first line under [preview],\nwhereas a diagnostic would only be emitted for the second line under\nstable behavior.\n\nNote that this behavior is somewhat subjective and is designed\nto conform to the developer's intuition rather than Python's actual\nexecution. To wit, the statement `import a.b` automatically executes\n`import a`, so in some sense `import a` is _always_ redundant\nin the presence of `import a.b`.\n\n\n## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\nSee [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc)\nfor more details on how Ruff\ndetermines whether an import is first or third-party.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)\n\n[preview]: https://docs.astral.sh/ruff/preview/\n"
              },
              "help": {
                "text": "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability"
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestsdefault.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestsdefault.snap
@@ -1,30 +0,0 @@
---
-source: crates/ruff_linter/src/message/text.rs
-expression: content
---
-F401 `os` imported but unused
- --> fib.py:1:8
-  |
-1 | import os
-  |        ^^
-  |
-help: Remove unused import: `os`
-
-F841 Local variable `x` is assigned to but never used
- --> fib.py:6:5
-  |
-4 | def fibonacci(n):
-5 |     """Compute the nth number in the Fibonacci sequence."""
-6 |     x = 1
-  |     ^
-7 |     if n == 0:
-8 |         return 0
-  |
-help: Remove assignment to unused variable `x`
-
-F821 Undefined name `a`
- --> undef.py:1:4
-  |
-1 | if a == 1: pass
-  |    ^
-  |
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestsfix_status.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestsfix_status.snap
@@ -1,30 +0,0 @@
---
-source: crates/ruff_linter/src/message/text.rs
-expression: content
---
-F401 `os` imported but unused
- --> fib.py:1:8
-  |
-1 | import os
-  |        ^^
-  |
-help: Remove unused import: `os`
-
-F841 Local variable `x` is assigned to but never used
- --> fib.py:6:5
-  |
-4 | def fibonacci(n):
-5 |     """Compute the nth number in the Fibonacci sequence."""
-6 |     x = 1
-  |     ^
-7 |     if n == 0:
-8 |         return 0
-  |
-help: Remove assignment to unused variable `x`
-
-F821 Undefined name `a`
- --> undef.py:1:4
-  |
-1 | if a == 1: pass
-  |    ^
-  |
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestsfix_status_unsafe.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestsfix_status_unsafe.snap
@@ -1,30 +0,0 @@
---
-source: crates/ruff_linter/src/message/text.rs
-expression: content
---
-F401 [*] `os` imported but unused
- --> fib.py:1:8
-  |
-1 | import os
-  |        ^^
-  |
-help: Remove unused import: `os`
-
-F841 [*] Local variable `x` is assigned to but never used
- --> fib.py:6:5
-  |
-4 | def fibonacci(n):
-5 |     """Compute the nth number in the Fibonacci sequence."""
-6 |     x = 1
-  |     ^
-7 |     if n == 0:
-8 |         return 0
-  |
-help: Remove assignment to unused variable `x`
-
-F821 Undefined name `a`
- --> undef.py:1:4
-  |
-1 | if a == 1: pass
-  |    ^
-  |
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestsnotebook_output.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestsnotebook_output.snap
@@ -1,33 +0,0 @@
---
-source: crates/ruff_linter/src/message/text.rs
-expression: content
---
-F401 [*] `os` imported but unused
- --> notebook.ipynb:cell 1:2:8
-  |
-1 | # cell 1
-2 | import os
-  |        ^^
-  |
-help: Remove unused import: `os`
-
-F401 [*] `math` imported but unused
- --> notebook.ipynb:cell 2:2:8
-  |
-1 | # cell 2
-2 | import math
-  |        ^^^^
-3 |
-4 | print('hello world')
-  |
-help: Remove unused import: `math`
-
-F841 [*] Local variable `x` is assigned to but never used
- --> notebook.ipynb:cell 3:4:5
-  |
-2 | def foo():
-3 |     print()
-4 |     x = 1
-  |     ^
-  |
-help: Remove assignment to unused variable `x`
--- a/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestssyntax_errors.snap
+++ b/crates/ruff_linter/src/message/snapshots/ruff_lintermessagetexttestssyntax_errors.snap
@@ -1,23 +0,0 @@
---
-source: crates/ruff_linter/src/message/text.rs
-expression: content
---
-invalid-syntax: Expected one or more symbol names after import
- --> syntax_errors.py:1:15
-  |
-1 | from os import
-  |               ^
-2 |
-3 | if call(foo
-  |
-
-invalid-syntax: Expected ')', found newline
- --> syntax_errors.py:3:12
-  |
-1 | from os import
-2 |
-3 | if call(foo
-  |            ^
-4 |     def bar():
-5 |         pass
-  |
--- a/crates/ruff_linter/src/message/text.rs
+++ b/crates/ruff_linter/src/message/text.rs
@@ -1,143 +0,0 @@
-use std::io::Write;
-
-use ruff_db::diagnostic::{
-    Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig, DisplayDiagnostics,
-};
-use ruff_diagnostics::Applicability;
-
-use crate::message::{Emitter, EmitterContext};
-
-pub struct TextEmitter {
-    config: DisplayDiagnosticConfig,
-}
-
-impl Default for TextEmitter {
-    fn default() -> Self {
-        Self {
-            config: DisplayDiagnosticConfig::default()
-                .format(DiagnosticFormat::Concise)
-                .hide_severity(true)
-                .color(!cfg!(test) && colored::control::SHOULD_COLORIZE.should_colorize()),
-        }
-    }
-}
-
-impl TextEmitter {
-    #[must_use]
-    pub fn with_show_fix_status(mut self, show_fix_status: bool) -> Self {
-        self.config = self.config.show_fix_status(show_fix_status);
-        self
-    }
-
-    #[must_use]
-    pub fn with_show_fix_diff(mut self, show_fix_diff: bool) -> Self {
-        self.config = self.config.show_fix_diff(show_fix_diff);
-        self
-    }
-
-    #[must_use]
-    pub fn with_show_source(mut self, show_source: bool) -> Self {
-        self.config = self.config.format(if show_source {
-            DiagnosticFormat::Full
-        } else {
-            DiagnosticFormat::Concise
-        });
-        self
-    }
-
-    #[must_use]
-    pub fn with_fix_applicability(mut self, applicability: Applicability) -> Self {
-        self.config = self.config.fix_applicability(applicability);
-        self
-    }
-
-    #[must_use]
-    pub fn with_preview(mut self, preview: bool) -> Self {
-        self.config = self.config.preview(preview);
-        self
-    }
-
-    #[must_use]
-    pub fn with_color(mut self, color: bool) -> Self {
-        self.config = self.config.color(color);
-        self
-    }
-}
-
-impl Emitter for TextEmitter {
-    fn emit(
-        &mut self,
-        writer: &mut dyn Write,
-        diagnostics: &[Diagnostic],
-        context: &EmitterContext,
-    ) -> anyhow::Result<()> {
-        write!(
-            writer,
-            "{}",
-            DisplayDiagnostics::new(context, &self.config, diagnostics)
-        )?;
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use insta::assert_snapshot;
-    use ruff_diagnostics::Applicability;
-
-    use crate::message::TextEmitter;
-    use crate::message::tests::{
-        capture_emitter_notebook_output, capture_emitter_output, create_diagnostics,
-        create_notebook_diagnostics, create_syntax_error_diagnostics,
-    };
-
-    #[test]
-    fn default() {
-        let mut emitter = TextEmitter::default().with_show_source(true);
-        let content = capture_emitter_output(&mut emitter, &create_diagnostics());
-
-        assert_snapshot!(content);
-    }
-
-    #[test]
-    fn fix_status() {
-        let mut emitter = TextEmitter::default()
-            .with_show_fix_status(true)
-            .with_show_source(true);
-        let content = capture_emitter_output(&mut emitter, &create_diagnostics());
-
-        assert_snapshot!(content);
-    }
-
-    #[test]
-    fn fix_status_unsafe() {
-        let mut emitter = TextEmitter::default()
-            .with_show_fix_status(true)
-            .with_show_source(true)
-            .with_fix_applicability(Applicability::Unsafe);
-        let content = capture_emitter_output(&mut emitter, &create_diagnostics());
-
-        assert_snapshot!(content);
-    }
-
-    #[test]
-    fn notebook_output() {
-        let mut emitter = TextEmitter::default()
-            .with_show_fix_status(true)
-            .with_show_source(true)
-            .with_fix_applicability(Applicability::Unsafe);
-        let (messages, notebook_indexes) = create_notebook_diagnostics();
-        let content = capture_emitter_notebook_output(&mut emitter, &messages, &notebook_indexes);
-
-        assert_snapshot!(content);
-    }
-
-    #[test]
-    fn syntax_errors() {
-        let mut emitter = TextEmitter::default().with_show_source(true);
-        let content = capture_emitter_output(&mut emitter, &create_syntax_error_diagnostics());
-
-        assert_snapshot!(content);
-    }
-}
--- a/crates/ruff_linter/src/preview.rs
+++ b/crates/ruff_linter/src/preview.rs
@@ -200,6 +200,11 @@ pub(crate) const fn is_optional_as_none_in_union_enabled(settings: &LinterSettin
    settings.preview.is_enabled()
 }

+// https://github.com/astral-sh/ruff/pull/20659
+pub(crate) const fn is_future_required_preview_generics_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}
+
 // https://github.com/astral-sh/ruff/pull/18683
 pub(crate) const fn is_safe_super_call_with_parameters_fix_enabled(
    settings: &LinterSettings,
@@ -235,3 +240,22 @@ pub(crate) const fn is_a003_class_scope_shadowing_expansion_enabled(
 ) -> bool {
    settings.preview.is_enabled()
 }
+
+// https://github.com/astral-sh/ruff/pull/20200
+pub(crate) const fn is_refined_submodule_import_match_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}
+
+// github.com/astral-sh/ruff/issues/20004
+pub(crate) const fn is_b006_check_guaranteed_mutable_expr_enabled(
+    settings: &LinterSettings,
+) -> bool {
+    settings.preview.is_enabled()
+}
+
+// github.com/astral-sh/ruff/issues/20004
+pub(crate) const fn is_b006_unsafe_fix_preserve_assignment_expr_enabled(
+    settings: &LinterSettings,
+) -> bool {
+    settings.preview.is_enabled()
+}
--- a/crates/ruff_linter/src/rules/airflow/helpers.rs
+++ b/crates/ruff_linter/src/rules/airflow/helpers.rs
@@ -17,13 +17,13 @@ use ruff_text_size::TextRange;
 pub(crate) enum Replacement {
    // There's no replacement or suggestion other than removal
    None,
+    // Additional information. Used when there's no direct maaping replacement.
+    Message(&'static str),
    // The attribute name of a class has been changed.
    AttrName(&'static str),
-    // Additional information. Used when there's replacement but they're not direct mapping.
-    Message(&'static str),
    // Symbols updated in Airflow 3 with replacement
    // e.g., `airflow.datasets.Dataset` to `airflow.sdk.Asset`
-    AutoImport {
+    Rename {
        module: &'static str,
        name: &'static str,
    },
@@ -37,7 +37,7 @@ pub(crate) enum Replacement {

 #[derive(Clone, Debug, Eq, PartialEq)]
 pub(crate) enum ProviderReplacement {
-    AutoImport {
+    Rename {
        module: &'static str,
        name: &'static str,
        provider: &'static str,
--- a/crates/ruff_linter/src/rules/airflow/rules/moved_to_provider_in_3.rs
+++ b/crates/ruff_linter/src/rules/airflow/rules/moved_to_provider_in_3.rs
@@ -50,7 +50,7 @@ impl Violation for Airflow3MovedToProvider<'_> {
            replacement,
        } = self;
        match replacement {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                name: _,
                module: _,
                provider,
@@ -70,7 +70,7 @@ impl Violation for Airflow3MovedToProvider<'_> {
    fn fix_title(&self) -> Option<String> {
        let Airflow3MovedToProvider { replacement, .. } = self;
        if let Some((module, name, provider, version)) = match &replacement {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                module,
                name,
                provider,
@@ -125,20 +125,18 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            provider: "amazon",
            version: "1.0.0",
        },
-        ["airflow", "operators", "gcs_to_s3", "GCSToS3Operator"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.amazon.aws.transfers.gcs_to_s3",
-                name: "GCSToS3Operator",
-                provider: "amazon",
-                version: "1.0.0",
-            }
-        }
+        ["airflow", "operators", "gcs_to_s3", "GCSToS3Operator"] => ProviderReplacement::Rename {
+            module: "airflow.providers.amazon.aws.transfers.gcs_to_s3",
+            name: "GCSToS3Operator",
+            provider: "amazon",
+            version: "1.0.0",
+        },
        [
            "airflow",
            "operators",
            "google_api_to_s3_transfer",
            "GoogleApiToS3Operator" | "GoogleApiToS3Transfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.amazon.aws.transfers.google_api_to_s3",
            name: "GoogleApiToS3Operator",
            provider: "amazon",
@@ -149,7 +147,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "redshift_to_s3_operator",
            "RedshiftToS3Operator" | "RedshiftToS3Transfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.amazon.aws.transfers.redshift_to_s3",
            name: "RedshiftToS3Operator",
            provider: "amazon",
@@ -160,7 +158,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "s3_file_transform_operator",
            "S3FileTransformOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.amazon.aws.operators.s3",
            name: "S3FileTransformOperator",
            provider: "amazon",
@@ -171,13 +169,13 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "s3_to_redshift_operator",
            "S3ToRedshiftOperator" | "S3ToRedshiftTransfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.amazon.aws.transfers.s3_to_redshift",
            name: "S3ToRedshiftOperator",
            provider: "amazon",
            version: "1.0.0",
        },
-        ["airflow", "sensors", "s3_key_sensor", "S3KeySensor"] => ProviderReplacement::AutoImport {
+        ["airflow", "sensors", "s3_key_sensor", "S3KeySensor"] => ProviderReplacement::Rename {
            module: "airflow.providers.amazon.aws.sensors.s3",
            name: "S3KeySensor",
            provider: "amazon",
@@ -190,20 +188,20 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "config_templates",
            "default_celery",
            "DEFAULT_CELERY_CONFIG",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.celery.executors.default_celery",
            name: "DEFAULT_CELERY_CONFIG",
            provider: "celery",
            version: "3.3.0",
        },
        ["airflow", "executors", "celery_executor", rest] => match *rest {
-            "app" => ProviderReplacement::AutoImport {
+            "app" => ProviderReplacement::Rename {
                module: "airflow.providers.celery.executors.celery_executor_utils",
                name: "app",
                provider: "celery",
                version: "3.3.0",
            },
-            "CeleryExecutor" => ProviderReplacement::AutoImport {
+            "CeleryExecutor" => ProviderReplacement::Rename {
                module: "airflow.providers.celery.executors.celery_executor",
                name: "CeleryExecutor",
                provider: "celery",
@@ -216,7 +214,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "executors",
            "celery_kubernetes_executor",
            "CeleryKubernetesExecutor",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.celery.executors.celery_kubernetes_executor",
            name: "CeleryKubernetesExecutor",
            provider: "celery",
@@ -235,7 +233,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            provider: "common-sql",
            version: "1.0.0",
        },
-        ["airflow", "hooks", "dbapi_hook", "DbApiHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "dbapi_hook", "DbApiHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.common.sql.hooks.sql",
            name: "DbApiHook",
            provider: "common-sql",
@@ -252,7 +250,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "check_operator" | "druid_check_operator" | "presto_check_operator",
            "CheckOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.common.sql.operators.sql",
            name: "SQLCheckOperator",
            provider: "common-sql",
@@ -269,7 +267,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "presto_check_operator",
            "PrestoCheckOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.common.sql.operators.sql",
            name: "SQLCheckOperator",
            provider: "common-sql",
@@ -288,7 +286,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "IntervalCheckOperator",
        ]
        | ["airflow", "operators", "sql", "SQLIntervalCheckOperator"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                module: "airflow.providers.common.sql.operators.sql",
                name: "SQLIntervalCheckOperator",
                provider: "common-sql",
@@ -300,7 +298,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "presto_check_operator",
            "PrestoIntervalCheckOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.common.sql.operators.sql",
            name: "SQLIntervalCheckOperator",
            provider: "common-sql",
@@ -313,7 +311,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "SQLThresholdCheckOperator" | "ThresholdCheckOperator",
        ]
        | ["airflow", "operators", "sql", "SQLThresholdCheckOperator"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                module: "airflow.providers.common.sql.operators.sql",
                name: "SQLThresholdCheckOperator",
                provider: "common-sql",
@@ -332,20 +330,18 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "presto_check_operator",
            "ValueCheckOperator",
        ]
-        | ["airflow", "operators", "sql", "SQLValueCheckOperator"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.common.sql.operators.sql",
-                name: "SQLValueCheckOperator",
-                provider: "common-sql",
-                version: "1.1.0",
-            }
-        }
+        | ["airflow", "operators", "sql", "SQLValueCheckOperator"] => ProviderReplacement::Rename {
+            module: "airflow.providers.common.sql.operators.sql",
+            name: "SQLValueCheckOperator",
+            provider: "common-sql",
+            version: "1.1.0",
+        },
        [
            "airflow",
            "operators",
            "presto_check_operator",
            "PrestoValueCheckOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.common.sql.operators.sql",
            name: "SQLValueCheckOperator",
            provider: "common-sql",
@@ -370,14 +366,12 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            }
            _ => return,
        },
-        ["airflow", "sensors", "sql" | "sql_sensor", "SqlSensor"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.common.sql.sensors.sql",
-                name: "SqlSensor",
-                provider: "common-sql",
-                version: "1.0.0",
-            }
-        }
+        ["airflow", "sensors", "sql" | "sql_sensor", "SqlSensor"] => ProviderReplacement::Rename {
+            module: "airflow.providers.common.sql.sensors.sql",
+            name: "SqlSensor",
+            provider: "common-sql",
+            version: "1.0.0",
+        },
        ["airflow", "operators", "jdbc_operator", "JdbcOperator"]
        | ["airflow", "operators", "mssql_operator", "MsSqlOperator"]
        | ["airflow", "operators", "mysql_operator", "MySqlOperator"]
@@ -389,7 +383,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "PostgresOperator",
        ]
        | ["airflow", "operators", "sqlite_operator", "SqliteOperator"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                module: "airflow.providers.common.sql.operators.sql",
                name: "SQLExecuteQueryOperator",
                provider: "common-sql",
@@ -398,24 +392,22 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
        }

        // apache-airflow-providers-daskexecutor
-        ["airflow", "executors", "dask_executor", "DaskExecutor"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.daskexecutor.executors.dask_executor",
-                name: "DaskExecutor",
-                provider: "daskexecutor",
-                version: "1.0.0",
-            }
-        }
+        ["airflow", "executors", "dask_executor", "DaskExecutor"] => ProviderReplacement::Rename {
+            module: "airflow.providers.daskexecutor.executors.dask_executor",
+            name: "DaskExecutor",
+            provider: "daskexecutor",
+            version: "1.0.0",
+        },

        // apache-airflow-providers-docker
-        ["airflow", "hooks", "docker_hook", "DockerHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "docker_hook", "DockerHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.docker.hooks.docker",
            name: "DockerHook",
            provider: "docker",
            version: "1.0.0",
        },
        ["airflow", "operators", "docker_operator", "DockerOperator"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                module: "airflow.providers.docker.operators.docker",
                name: "DockerOperator",
                provider: "docker",
@@ -440,7 +432,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "hive_to_druid",
            "HiveToDruidOperator" | "HiveToDruidTransfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.apache.druid.transfers.hive_to_druid",
            name: "HiveToDruidOperator",
            provider: "apache-druid",
@@ -497,7 +489,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "fab",
            "fab_auth_manager",
            "FabAuthManager",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.fab.auth_manager.fab_auth_manager",
            name: "FabAuthManager",
            provider: "fab",
@@ -511,7 +503,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "security_manager",
            "override",
            "MAX_NUM_DATABASE_USER_SESSIONS",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.fab.auth_manager.security_manager.override",
            name: "MAX_NUM_DATABASE_USER_SESSIONS",
            provider: "fab",
@@ -531,7 +523,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "www",
            "security",
            "FabAirflowSecurityManagerOverride",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.fab.auth_manager.security_manager.override",
            name: "FabAirflowSecurityManagerOverride",
            provider: "fab",
@@ -539,20 +531,18 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
        },

        // apache-airflow-providers-apache-hdfs
-        ["airflow", "hooks", "webhdfs_hook", "WebHDFSHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "webhdfs_hook", "WebHDFSHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.apache.hdfs.hooks.webhdfs",
            name: "WebHDFSHook",
            provider: "apache-hdfs",
            version: "1.0.0",
        },
-        ["airflow", "sensors", "web_hdfs_sensor", "WebHdfsSensor"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.apache.hdfs.sensors.web_hdfs",
-                name: "WebHdfsSensor",
-                provider: "apache-hdfs",
-                version: "1.0.0",
-            }
-        }
+        ["airflow", "sensors", "web_hdfs_sensor", "WebHdfsSensor"] => ProviderReplacement::Rename {
+            module: "airflow.providers.apache.hdfs.sensors.web_hdfs",
+            name: "WebHdfsSensor",
+            provider: "apache-hdfs",
+            version: "1.0.0",
+        },

        // apache-airflow-providers-apache-hive
        [
@@ -580,20 +570,18 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            provider: "apache-hive",
            version: "5.1.0",
        },
-        ["airflow", "operators", "hive_operator", "HiveOperator"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.apache.hive.operators.hive",
-                name: "HiveOperator",
-                provider: "apache-hive",
-                version: "1.0.0",
-            }
-        }
+        ["airflow", "operators", "hive_operator", "HiveOperator"] => ProviderReplacement::Rename {
+            module: "airflow.providers.apache.hive.operators.hive",
+            name: "HiveOperator",
+            provider: "apache-hive",
+            version: "1.0.0",
+        },
        [
            "airflow",
            "operators",
            "hive_stats_operator",
            "HiveStatsCollectionOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.apache.hive.operators.hive_stats",
            name: "HiveStatsCollectionOperator",
            provider: "apache-hive",
@@ -604,7 +592,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "hive_to_mysql",
            "HiveToMySqlOperator" | "HiveToMySqlTransfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.apache.hive.transfers.hive_to_mysql",
            name: "HiveToMySqlOperator",
            provider: "apache-hive",
@@ -615,7 +603,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "hive_to_samba_operator",
            "HiveToSambaOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.apache.hive.transfers.hive_to_samba",
            name: "HiveToSambaOperator",
            provider: "apache-hive",
@@ -626,7 +614,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "mssql_to_hive",
            "MsSqlToHiveOperator" | "MsSqlToHiveTransfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.apache.hive.transfers.mssql_to_hive",
            name: "MsSqlToHiveOperator",
            provider: "apache-hive",
@@ -637,7 +625,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "mysql_to_hive",
            "MySqlToHiveOperator" | "MySqlToHiveTransfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.apache.hive.transfers.mysql_to_hive",
            name: "MySqlToHiveOperator",
            provider: "apache-hive",
@@ -648,7 +636,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "s3_to_hive_operator",
            "S3ToHiveOperator" | "S3ToHiveTransfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.apache.hive.transfers.s3_to_hive",
            name: "S3ToHiveOperator",
            provider: "apache-hive",
@@ -659,7 +647,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "sensors",
            "hive_partition_sensor",
            "HivePartitionSensor",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.apache.hive.sensors.hive_partition",
            name: "HivePartitionSensor",
            provider: "apache-hive",
@@ -670,7 +658,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "sensors",
            "metastore_partition_sensor",
            "MetastorePartitionSensor",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.apache.hive.sensors.metastore_partition",
            name: "MetastorePartitionSensor",
            provider: "apache-hive",
@@ -681,7 +669,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "sensors",
            "named_hive_partition_sensor",
            "NamedHivePartitionSensor",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.apache.hive.sensors.named_hive_partition",
            name: "NamedHivePartitionSensor",
            provider: "apache-hive",
@@ -689,7 +677,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
        },

        // apache-airflow-providers-http
-        ["airflow", "hooks", "http_hook", "HttpHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "http_hook", "HttpHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.http.hooks.http",
            name: "HttpHook",
            provider: "http",
@@ -700,13 +688,13 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "http_operator",
            "SimpleHttpOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.http.operators.http",
            name: "HttpOperator",
            provider: "http",
            version: "5.0.0",
        },
-        ["airflow", "sensors", "http_sensor", "HttpSensor"] => ProviderReplacement::AutoImport {
+        ["airflow", "sensors", "http_sensor", "HttpSensor"] => ProviderReplacement::Rename {
            module: "airflow.providers.http.sensors.http",
            name: "HttpSensor",
            provider: "http",
@@ -765,7 +753,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "kubernetes",
            "kubernetes_helper_functions",
            "add_pod_suffix",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.cncf.kubernetes.kubernetes_helper_functions",
            name: "add_unique_suffix",
            provider: "cncf-kubernetes",
@@ -776,7 +764,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "kubernetes",
            "kubernetes_helper_functions",
            "create_pod_id",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.cncf.kubernetes.kubernetes_helper_functions",
            name: "create_unique_id",
            provider: "cncf-kubernetes",
@@ -797,13 +785,13 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            version: "7.4.0",
        },
        ["airflow", "kubernetes", "pod", rest] => match *rest {
-            "Port" => ProviderReplacement::AutoImport {
+            "Port" => ProviderReplacement::Rename {
                module: "kubernetes.client.models",
                name: "V1ContainerPort",
                provider: "cncf-kubernetes",
                version: "7.4.0",
            },
-            "Resources" => ProviderReplacement::AutoImport {
+            "Resources" => ProviderReplacement::Rename {
                module: "kubernetes.client.models",
                name: "V1ResourceRequirements",
                provider: "cncf-kubernetes",
@@ -823,19 +811,19 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
                provider: "cncf-kubernetes",
                version: "7.4.0",
            },
-            "PodDefaults" => ProviderReplacement::AutoImport {
+            "PodDefaults" => ProviderReplacement::Rename {
                module: "airflow.providers.cncf.kubernetes.utils.xcom_sidecar",
                name: "PodDefaults",
                provider: "cncf-kubernetes",
                version: "7.4.0",
            },
-            "PodGeneratorDeprecated" => ProviderReplacement::AutoImport {
+            "PodGeneratorDeprecated" => ProviderReplacement::Rename {
                module: "airflow.providers.cncf.kubernetes.pod_generator",
                name: "PodGenerator",
                provider: "cncf-kubernetes",
                version: "7.4.0",
            },
-            "add_pod_suffix" => ProviderReplacement::AutoImport {
+            "add_pod_suffix" => ProviderReplacement::Rename {
                module: "airflow.providers.cncf.kubernetes.kubernetes_helper_functions",
                name: "add_unique_suffix",
                provider: "cncf-kubernetes",
@@ -865,7 +853,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "kubernetes",
            "pod_generator_deprecated" | "pod_launcher_deprecated",
            "PodDefaults",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.cncf.kubernetes.utils.xcom_sidecar",
            name: "PodDefaults",
            provider: "cncf-kubernetes",
@@ -876,7 +864,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "kubernetes",
            "pod_launcher_deprecated",
            "get_kube_client",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.cncf.kubernetes.kube_client",
            name: "get_kube_client",
            provider: "cncf-kubernetes",
@@ -887,7 +875,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "kubernetes",
            "pod_launcher" | "pod_launcher_deprecated",
            "PodLauncher",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.cncf.kubernetes.utils.pod_manager",
            name: "PodManager",
            provider: "cncf-kubernetes",
@@ -898,7 +886,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "kubernetes",
            "pod_launcher" | "pod_launcher_deprecated",
            "PodStatus",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: " airflow.providers.cncf.kubernetes.utils.pod_manager",
            name: "PodPhase",
            provider: "cncf-kubernetes",
@@ -909,20 +897,20 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "kubernetes",
            "pod_runtime_info_env",
            "PodRuntimeInfoEnv",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "kubernetes.client.models",
            name: "V1EnvVar",
            provider: "cncf-kubernetes",
            version: "7.4.0",
        },
        ["airflow", "kubernetes", "secret", rest] => match *rest {
-            "K8SModel" => ProviderReplacement::AutoImport {
+            "K8SModel" => ProviderReplacement::Rename {
                module: "airflow.providers.cncf.kubernetes.k8s_model",
                name: "K8SModel",
                provider: "cncf-kubernetes",
                version: "7.4.0",
            },
-            "Secret" => ProviderReplacement::AutoImport {
+            "Secret" => ProviderReplacement::Rename {
                module: "airflow.providers.cncf.kubernetes.secret",
                name: "Secret",
                provider: "cncf-kubernetes",
@@ -930,23 +918,21 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            },
            _ => return,
        },
-        ["airflow", "kubernetes", "volume", "Volume"] => ProviderReplacement::AutoImport {
+        ["airflow", "kubernetes", "volume", "Volume"] => ProviderReplacement::Rename {
            module: "kubernetes.client.models",
            name: "V1Volume",
            provider: "cncf-kubernetes",
            version: "7.4.0",
        },
-        ["airflow", "kubernetes", "volume_mount", "VolumeMount"] => {
-            ProviderReplacement::AutoImport {
-                module: "kubernetes.client.models",
-                name: "V1VolumeMount",
-                provider: "cncf-kubernetes",
-                version: "7.4.0",
-            }
-        }
+        ["airflow", "kubernetes", "volume_mount", "VolumeMount"] => ProviderReplacement::Rename {
+            module: "kubernetes.client.models",
+            name: "V1VolumeMount",
+            provider: "cncf-kubernetes",
+            version: "7.4.0",
+        },

        // apache-airflow-providers-microsoft-mssql
-        ["airflow", "hooks", "mssql_hook", "MsSqlHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "mssql_hook", "MsSqlHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.microsoft.mssql.hooks.mssql",
            name: "MsSqlHook",
            provider: "microsoft-mssql",
@@ -954,7 +940,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
        },

        // apache-airflow-providers-mysql
-        ["airflow", "hooks", "mysql_hook", "MySqlHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "mysql_hook", "MySqlHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.mysql.hooks.mysql",
            name: "MySqlHook",
            provider: "mysql",
@@ -965,7 +951,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "presto_to_mysql",
            "PrestoToMySqlOperator" | "PrestoToMySqlTransfer",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.mysql.transfers.presto_to_mysql",
            name: "PrestoToMySqlOperator",
            provider: "mysql",
@@ -973,7 +959,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
        },

        // apache-airflow-providers-oracle
-        ["airflow", "hooks", "oracle_hook", "OracleHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "oracle_hook", "OracleHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.oracle.hooks.oracle",
            name: "OracleHook",
            provider: "oracle",
@@ -986,7 +972,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "papermill_operator",
            "PapermillOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.papermill.operators.papermill",
            name: "PapermillOperator",
            provider: "papermill",
@@ -994,23 +980,21 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
        },

        // apache-airflow-providers-apache-pig
-        ["airflow", "hooks", "pig_hook", "PigCliHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "pig_hook", "PigCliHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.apache.pig.hooks.pig",
            name: "PigCliHook",
            provider: "apache-pig",
            version: "1.0.0",
        },
-        ["airflow", "operators", "pig_operator", "PigOperator"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.apache.pig.operators.pig",
-                name: "PigOperator",
-                provider: "apache-pig",
-                version: "1.0.0",
-            }
-        }
+        ["airflow", "operators", "pig_operator", "PigOperator"] => ProviderReplacement::Rename {
+            module: "airflow.providers.apache.pig.operators.pig",
+            name: "PigOperator",
+            provider: "apache-pig",
+            version: "1.0.0",
+        },

        // apache-airflow-providers-postgres
-        ["airflow", "hooks", "postgres_hook", "PostgresHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "postgres_hook", "PostgresHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.postgres.hooks.postgres",
            name: "PostgresHook",
            provider: "postgres",
@@ -1018,7 +1002,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
        },

        // apache-airflow-providers-presto
-        ["airflow", "hooks", "presto_hook", "PrestoHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "presto_hook", "PrestoHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.presto.hooks.presto",
            name: "PrestoHook",
            provider: "presto",
@@ -1026,7 +1010,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
        },

        // apache-airflow-providers-samba
-        ["airflow", "hooks", "samba_hook", "SambaHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "samba_hook", "SambaHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.samba.hooks.samba",
            name: "SambaHook",
            provider: "samba",
@@ -1034,7 +1018,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
        },

        // apache-airflow-providers-slack
-        ["airflow", "hooks", "slack_hook", "SlackHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "slack_hook", "SlackHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.slack.hooks.slack",
            name: "SlackHook",
            provider: "slack",
@@ -1058,7 +1042,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "email_operator" | "email",
            "EmailOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.smtp.operators.smtp",
            name: "EmailOperator",
            provider: "smtp",
@@ -1066,7 +1050,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
        },

        // apache-airflow-providers-sqlite
-        ["airflow", "hooks", "sqlite_hook", "SqliteHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "sqlite_hook", "SqliteHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.sqlite.hooks.sqlite",
            name: "SqliteHook",
            provider: "sqlite",
@@ -1074,7 +1058,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
        },

        // apache-airflow-providers-zendesk
-        ["airflow", "hooks", "zendesk_hook", "ZendeskHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "zendesk_hook", "ZendeskHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.zendesk.hooks.zendesk",
            name: "ZendeskHook",
            provider: "zendesk",
@@ -1093,14 +1077,12 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            provider: "standard",
            version: "0.0.3",
        },
-        ["airflow", "operators", "bash_operator", "BashOperator"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.standard.operators.bash",
-                name: "BashOperator",
-                provider: "standard",
-                version: "0.0.1",
-            }
-        }
+        ["airflow", "operators", "bash_operator", "BashOperator"] => ProviderReplacement::Rename {
+            module: "airflow.providers.standard.operators.bash",
+            name: "BashOperator",
+            provider: "standard",
+            version: "0.0.1",
+        },
        [
            "airflow",
            "operators",
@@ -1117,14 +1099,14 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "trigger_dagrun",
            "TriggerDagRunLink",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.standard.operators.trigger_dagrun",
            name: "TriggerDagRunLink",
            provider: "standard",
            version: "0.0.2",
        },
        ["airflow", "operators", "datetime", "target_times_as_dates"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                module: "airflow.providers.standard.operators.datetime",
                name: "target_times_as_dates",
                provider: "standard",
@@ -1136,7 +1118,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "dummy" | "dummy_operator",
            "EmptyOperator" | "DummyOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.standard.operators.empty",
            name: "EmptyOperator",
            provider: "standard",
@@ -1147,7 +1129,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "latest_only_operator",
            "LatestOnlyOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.standard.operators.latest_only",
            name: "LatestOnlyOperator",
            provider: "standard",
@@ -1172,7 +1154,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "sensors",
            "external_task" | "external_task_sensor",
            "ExternalTaskSensorLink",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.standard.sensors.external_task",
            name: "ExternalDagLink",
            provider: "standard",
@@ -1189,7 +1171,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            provider: "standard",
            version: "0.0.3",
        },
-        ["airflow", "sensors", "time_delta", "WaitSensor"] => ProviderReplacement::AutoImport {
+        ["airflow", "sensors", "time_delta", "WaitSensor"] => ProviderReplacement::Rename {
            module: "airflow.providers.standard.sensors.time_delta",
            name: "WaitSensor",
            provider: "standard",
@@ -1200,7 +1182,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
    };

    let (module, name) = match &replacement {
-        ProviderReplacement::AutoImport { module, name, .. } => (module, *name),
+        ProviderReplacement::Rename { module, name, .. } => (module, *name),
        ProviderReplacement::SourceModuleMovedToProvider { module, name, .. } => {
            (module, name.as_str())
        }
--- a/crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs
+++ b/crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs
@@ -59,7 +59,7 @@ impl Violation for Airflow3Removal {
            Replacement::None
            | Replacement::AttrName(_)
            | Replacement::Message(_)
-            | Replacement::AutoImport { module: _, name: _ }
+            | Replacement::Rename { module: _, name: _ }
            | Replacement::SourceModuleMoved { module: _, name: _ } => {
                format!("`{deprecated}` is removed in Airflow 3.0")
            }
@@ -72,7 +72,7 @@ impl Violation for Airflow3Removal {
            Replacement::None => None,
            Replacement::AttrName(name) => Some(format!("Use `{name}` instead")),
            Replacement::Message(message) => Some((*message).to_string()),
-            Replacement::AutoImport { module, name } => {
+            Replacement::Rename { module, name } => {
                Some(format!("Use `{name}` from `{module}` instead."))
            }
            Replacement::SourceModuleMoved { module, name } => {
@@ -593,7 +593,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            "api_connexion",
            "security",
            "requires_access_dataset",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
            module: "airflow.api_fastapi.core_api.security",
            name: "requires_access_asset",
        },
@@ -605,7 +605,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            "managers",
            "base_auth_manager",
            "BaseAuthManager",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
            module: "airflow.api_fastapi.auth.managers.base_auth_manager",
            name: "BaseAuthManager",
        },
@@ -616,7 +616,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            "models",
            "resource_details",
            "DatasetDetails",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
            module: "airflow.api_fastapi.auth.managers.models.resource_details",
            name: "AssetDetails",
        },
@@ -639,15 +639,15 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {

        // airflow.datasets.manager
        ["airflow", "datasets", "manager", rest] => match *rest {
-            "DatasetManager" => Replacement::AutoImport {
+            "DatasetManager" => Replacement::Rename {
                module: "airflow.assets.manager",
                name: "AssetManager",
            },
-            "dataset_manager" => Replacement::AutoImport {
+            "dataset_manager" => Replacement::Rename {
                module: "airflow.assets.manager",
                name: "asset_manager",
            },
-            "resolve_dataset_manager" => Replacement::AutoImport {
+            "resolve_dataset_manager" => Replacement::Rename {
                module: "airflow.assets.manager",
                name: "resolve_asset_manager",
            },
@@ -657,24 +657,24 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
        ["airflow", "datasets", "DatasetAliasEvent"] => Replacement::None,

        // airflow.hooks
-        ["airflow", "hooks", "base_hook", "BaseHook"] => Replacement::AutoImport {
+        ["airflow", "hooks", "base_hook", "BaseHook"] => Replacement::Rename {
            module: "airflow.hooks.base",
            name: "BaseHook",
        },

        // airflow.lineage.hook
-        ["airflow", "lineage", "hook", "DatasetLineageInfo"] => Replacement::AutoImport {
+        ["airflow", "lineage", "hook", "DatasetLineageInfo"] => Replacement::Rename {
            module: "airflow.lineage.hook",
            name: "AssetLineageInfo",
        },

        // airflow.listeners.spec
        ["airflow", "listeners", "spec", "dataset", rest] => match *rest {
-            "on_dataset_created" => Replacement::AutoImport {
+            "on_dataset_created" => Replacement::Rename {
                module: "airflow.listeners.spec.asset",
                name: "on_asset_created",
            },
-            "on_dataset_changed" => Replacement::AutoImport {
+            "on_dataset_changed" => Replacement::Rename {
                module: "airflow.listeners.spec.asset",
                name: "on_asset_changed",
            },
@@ -683,11 +683,11 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {

        // airflow.metrics.validators
        ["airflow", "metrics", "validators", rest] => match *rest {
-            "AllowListValidator" => Replacement::AutoImport {
+            "AllowListValidator" => Replacement::Rename {
                module: "airflow.metrics.validators",
                name: "PatternAllowListValidator",
            },
-            "BlockListValidator" => Replacement::AutoImport {
+            "BlockListValidator" => Replacement::Rename {
                module: "airflow.metrics.validators",
                name: "PatternBlockListValidator",
            },
@@ -695,7 +695,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
        },

        // airflow.notifications
-        ["airflow", "notifications", "basenotifier", "BaseNotifier"] => Replacement::AutoImport {
+        ["airflow", "notifications", "basenotifier", "BaseNotifier"] => Replacement::Rename {
            module: "airflow.sdk.bases.notifier",
            name: "BaseNotifier",
        },
@@ -705,23 +705,23 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            Replacement::Message("The whole `airflow.subdag` module has been removed.")
        }
        ["airflow", "operators", "postgres_operator", "Mapping"] => Replacement::None,
-        ["airflow", "operators", "python", "get_current_context"] => Replacement::AutoImport {
+        ["airflow", "operators", "python", "get_current_context"] => Replacement::Rename {
            module: "airflow.sdk",
            name: "get_current_context",
        },

        // airflow.secrets
-        ["airflow", "secrets", "cache", "SecretCache"] => Replacement::AutoImport {
+        ["airflow", "secrets", "cache", "SecretCache"] => Replacement::Rename {
            module: "airflow.sdk",
            name: "SecretCache",
        },
-        ["airflow", "secrets", "local_filesystem", "load_connections"] => Replacement::AutoImport {
+        ["airflow", "secrets", "local_filesystem", "load_connections"] => Replacement::Rename {
            module: "airflow.secrets.local_filesystem",
            name: "load_connections_dict",
        },

        // airflow.security
-        ["airflow", "security", "permissions", "RESOURCE_DATASET"] => Replacement::AutoImport {
+        ["airflow", "security", "permissions", "RESOURCE_DATASET"] => Replacement::Rename {
            module: "airflow.security.permissions",
            name: "RESOURCE_ASSET",
        },
@@ -732,7 +732,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            "sensors",
            "base_sensor_operator",
            "BaseSensorOperator",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
            module: "airflow.sdk.bases.sensor",
            name: "BaseSensorOperator",
        },
@@ -743,7 +743,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            "timetables",
            "simple",
            "DatasetTriggeredTimetable",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
            module: "airflow.timetables.simple",
            name: "AssetTriggeredTimetable",
        },
@@ -775,25 +775,25 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            ] => Replacement::None,

            // airflow.utils.file
-            ["file", "TemporaryDirectory"] => Replacement::AutoImport {
+            ["file", "TemporaryDirectory"] => Replacement::Rename {
                module: "tempfile",
                name: "TemporaryDirectory",
            },
            ["file", "mkdirs"] => Replacement::Message("Use `pathlib.Path({path}).mkdir` instead"),

            // airflow.utils.helpers
-            ["helpers", "chain"] => Replacement::AutoImport {
+            ["helpers", "chain"] => Replacement::Rename {
                module: "airflow.sdk",
                name: "chain",
            },
-            ["helpers", "cross_downstream"] => Replacement::AutoImport {
+            ["helpers", "cross_downstream"] => Replacement::Rename {
                module: "airflow.sdk",
                name: "cross_downstream",
            },

            // TODO: update it as SourceModuleMoved
            // airflow.utils.log.secrets_masker
-            ["log", "secrets_masker"] => Replacement::AutoImport {
+            ["log", "secrets_masker"] => Replacement::Rename {
                module: "airflow.sdk.execution_time",
                name: "secrets_masker",
            },
@@ -834,15 +834,15 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            "s3",
            rest,
        ] => match *rest {
-            "create_dataset" => Replacement::AutoImport {
+            "create_dataset" => Replacement::Rename {
                module: "airflow.providers.amazon.aws.assets.s3",
                name: "create_asset",
            },
-            "convert_dataset_to_openlineage" => Replacement::AutoImport {
+            "convert_dataset_to_openlineage" => Replacement::Rename {
                module: "airflow.providers.amazon.aws.assets.s3",
                name: "convert_asset_to_openlineage",
            },
-            "sanitize_uri" => Replacement::AutoImport {
+            "sanitize_uri" => Replacement::Rename {
                module: "airflow.providers.amazon.aws.assets.s3",
                name: "sanitize_uri",
            },
@@ -858,7 +858,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            "entities",
            "AvpEntities",
            "DATASET",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
            module: "airflow.providers.amazon.aws.auth_manager.avp.entities",
            name: "AvpEntities.ASSET",
        },
@@ -874,15 +874,15 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            "file",
            rest,
        ] => match *rest {
-            "create_dataset" => Replacement::AutoImport {
+            "create_dataset" => Replacement::Rename {
                module: "airflow.providers.common.io.assets.file",
                name: "create_asset",
            },
-            "convert_dataset_to_openlineage" => Replacement::AutoImport {
+            "convert_dataset_to_openlineage" => Replacement::Rename {
                module: "airflow.providers.common.io.assets.file",
                name: "convert_asset_to_openlineage",
            },
-            "sanitize_uri" => Replacement::AutoImport {
+            "sanitize_uri" => Replacement::Rename {
                module: "airflow.providers.common.io.assets.file",
                name: "sanitize_uri",
            },
@@ -892,19 +892,19 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
        // airflow.providers.google
        // airflow.providers.google.datasets
        ["airflow", "providers", "google", "datasets", rest @ ..] => match &rest {
-            ["bigquery", "create_dataset"] => Replacement::AutoImport {
+            ["bigquery", "create_dataset"] => Replacement::Rename {
                module: "airflow.providers.google.assets.bigquery",
                name: "create_asset",
            },
-            ["gcs", "create_dataset"] => Replacement::AutoImport {
+            ["gcs", "create_dataset"] => Replacement::Rename {
                module: "airflow.providers.google.assets.gcs",
                name: "create_asset",
            },
-            ["gcs", "convert_dataset_to_openlineage"] => Replacement::AutoImport {
+            ["gcs", "convert_dataset_to_openlineage"] => Replacement::Rename {
                module: "airflow.providers.google.assets.gcs",
                name: "convert_asset_to_openlineage",
            },
-            ["gcs", "sanitize_uri"] => Replacement::AutoImport {
+            ["gcs", "sanitize_uri"] => Replacement::Rename {
                module: "airflow.providers.google.assets.gcs",
                name: "sanitize_uri",
            },
@@ -920,7 +920,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            "datasets",
            "mysql",
            "sanitize_uri",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
            module: "airflow.providers.mysql.assets.mysql",
            name: "sanitize_uri",
        },
@@ -933,7 +933,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            "datasets",
            "postgres",
            "sanitize_uri",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
            module: "airflow.providers.postgres.assets.postgres",
            name: "sanitize_uri",
        },
@@ -948,12 +948,12 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            "utils",
            rest,
        ] => match *rest {
-            "DatasetInfo" => Replacement::AutoImport {
+            "DatasetInfo" => Replacement::Rename {
                module: "airflow.providers.openlineage.utils.utils",
                name: "AssetInfo",
            },

-            "translate_airflow_dataset" => Replacement::AutoImport {
+            "translate_airflow_dataset" => Replacement::Rename {
                module: "airflow.providers.openlineage.utils.utils",
                name: "translate_airflow_asset",
            },
@@ -968,7 +968,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
            "datasets",
            "trino",
            "sanitize_uri",
-        ] => Replacement::AutoImport {
+        ] => Replacement::Rename {
            module: "airflow.providers.trino.assets.trino",
            name: "sanitize_uri",
        },
@@ -977,7 +977,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
    };

    let (module, name) = match &replacement {
-        Replacement::AutoImport { module, name } => (module, *name),
+        Replacement::Rename { module, name } => (module, *name),
        Replacement::SourceModuleMoved { module, name } => (module, name.as_str()),
        _ => {
            checker.report_diagnostic(
--- a/crates/ruff_linter/src/rules/airflow/rules/suggested_to_move_to_provider_in_3.rs
+++ b/crates/ruff_linter/src/rules/airflow/rules/suggested_to_move_to_provider_in_3.rs
@@ -65,7 +65,7 @@ impl Violation for Airflow3SuggestedToMoveToProvider<'_> {
            replacement,
        } = self;
        match replacement {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                name: _,
                module: _,
                provider,
@@ -88,7 +88,7 @@ impl Violation for Airflow3SuggestedToMoveToProvider<'_> {
    fn fix_title(&self) -> Option<String> {
        let Airflow3SuggestedToMoveToProvider { replacement, .. } = self;
        match replacement {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                module,
                name,
                provider,
@@ -130,34 +130,32 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan

    let replacement = match qualified_name.segments() {
        // apache-airflow-providers-standard
-        ["airflow", "hooks", "filesystem", "FSHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "filesystem", "FSHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.standard.hooks.filesystem",
            name: "FSHook",
            provider: "standard",
            version: "0.0.1",
        },
-        ["airflow", "hooks", "package_index", "PackageIndexHook"] => {
-            ProviderReplacement::AutoImport {
-                module: "airflow.providers.standard.hooks.package_index",
-                name: "PackageIndexHook",
-                provider: "standard",
-                version: "0.0.1",
-            }
-        }
-        ["airflow", "hooks", "subprocess", "SubprocessHook"] => ProviderReplacement::AutoImport {
+        ["airflow", "hooks", "package_index", "PackageIndexHook"] => ProviderReplacement::Rename {
+            module: "airflow.providers.standard.hooks.package_index",
+            name: "PackageIndexHook",
+            provider: "standard",
+            version: "0.0.1",
+        },
+        ["airflow", "hooks", "subprocess", "SubprocessHook"] => ProviderReplacement::Rename {
            module: "airflow.providers.standard.hooks.subprocess",
            name: "SubprocessHook",
            provider: "standard",
            version: "0.0.3",
        },
-        ["airflow", "operators", "bash", "BashOperator"] => ProviderReplacement::AutoImport {
+        ["airflow", "operators", "bash", "BashOperator"] => ProviderReplacement::Rename {
            module: "airflow.providers.standard.operators.bash",
            name: "BashOperator",
            provider: "standard",
            version: "0.0.1",
        },
        ["airflow", "operators", "datetime", "BranchDateTimeOperator"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                module: "airflow.providers.standard.operators.datetime",
                name: "BranchDateTimeOperator",
                provider: "standard",
@@ -169,20 +167,20 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            "operators",
            "trigger_dagrun",
            "TriggerDagRunOperator",
-        ] => ProviderReplacement::AutoImport {
+        ] => ProviderReplacement::Rename {
            module: "airflow.providers.standard.operators.trigger_dagrun",
            name: "TriggerDagRunOperator",
            provider: "standard",
            version: "0.0.2",
        },
-        ["airflow", "operators", "empty", "EmptyOperator"] => ProviderReplacement::AutoImport {
+        ["airflow", "operators", "empty", "EmptyOperator"] => ProviderReplacement::Rename {
            module: "airflow.providers.standard.operators.empty",
            name: "EmptyOperator",
            provider: "standard",
            version: "0.0.2",
        },
        ["airflow", "operators", "latest_only", "LatestOnlyOperator"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                module: "airflow.providers.standard.operators.latest_only",
                name: "LatestOnlyOperator",
                provider: "standard",
@@ -204,14 +202,14 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            version: "0.0.1",
        },
        ["airflow", "operators", "weekday", "BranchDayOfWeekOperator"] => {
-            ProviderReplacement::AutoImport {
+            ProviderReplacement::Rename {
                module: "airflow.providers.standard.operators.weekday",
                name: "BranchDayOfWeekOperator",
                provider: "standard",
                version: "0.0.1",
            }
        }
-        ["airflow", "sensors", "bash", "BashSensor"] => ProviderReplacement::AutoImport {
+        ["airflow", "sensors", "bash", "BashSensor"] => ProviderReplacement::Rename {
            module: "airflow.providers.standard.sensor.bash",
            name: "BashSensor",
            provider: "standard",
@@ -239,13 +237,13 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            provider: "standard",
            version: "0.0.3",
        },
-        ["airflow", "sensors", "filesystem", "FileSensor"] => ProviderReplacement::AutoImport {
+        ["airflow", "sensors", "filesystem", "FileSensor"] => ProviderReplacement::Rename {
            module: "airflow.providers.standard.sensors.filesystem",
            name: "FileSensor",
            provider: "standard",
            version: "0.0.2",
        },
-        ["airflow", "sensors", "python", "PythonSensor"] => ProviderReplacement::AutoImport {
+        ["airflow", "sensors", "python", "PythonSensor"] => ProviderReplacement::Rename {
            module: "airflow.providers.standard.sensors.python",
            name: "PythonSensor",
            provider: "standard",
@@ -273,7 +271,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            provider: "standard",
            version: "0.0.1",
        },
-        ["airflow", "sensors", "weekday", "DayOfWeekSensor"] => ProviderReplacement::AutoImport {
+        ["airflow", "sensors", "weekday", "DayOfWeekSensor"] => ProviderReplacement::Rename {
            module: "airflow.providers.standard.sensors.weekday",
            name: "DayOfWeekSensor",
            provider: "standard",
@@ -290,7 +288,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
            provider: "standard",
            version: "0.0.3",
        },
-        ["airflow", "triggers", "file", "FileTrigger"] => ProviderReplacement::AutoImport {
+        ["airflow", "triggers", "file", "FileTrigger"] => ProviderReplacement::Rename {
            module: "airflow.providers.standard.triggers.file",
            name: "FileTrigger",
            provider: "standard",
@@ -311,7 +309,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
    };

    let (module, name) = match &replacement {
-        ProviderReplacement::AutoImport { module, name, .. } => (module, *name),
+        ProviderReplacement::Rename { module, name, .. } => (module, *name),
        ProviderReplacement::SourceModuleMovedToProvider { module, name, .. } => {
            (module, name.as_str())
        }
--- a/Show More
+++ b/Show More