Add regression test and comment for GenericContext::from_type_params

.github/workflows/build-binaries.yml

@@ -49,7 +49,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build sdist"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           command: sdist
           args: --out dist
@@ -79,7 +79,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels - x86_64"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           target: x86_64
           args: --release --locked --out dist
@@ -121,7 +121,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels - aarch64"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           target: aarch64
           args: --release --locked --out dist
@@ -177,7 +177,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           target: ${{ matrix.platform.target }}
           args: --release --locked --out dist
@@ -230,7 +230,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           target: ${{ matrix.target }}
           manylinux: auto
@@ -306,7 +306,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           target: ${{ matrix.platform.target }}
           manylinux: auto
@@ -372,7 +372,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
@@ -437,7 +437,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           target: ${{ matrix.platform.target }}
           manylinux: musllinux_1_2

.github/workflows/ci.yaml

@@ -250,7 +250,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
       - name: "Install cargo nextest"
         uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
         with:
@@ -259,10 +259,6 @@ jobs:
         uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
         with:
           tool: cargo-insta
-      - name: "Install uv"
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
-        with:
-          enable-cache: "true"
       - name: ty mdtests (GitHub annotations)
         if: ${{ needs.determine_changes.outputs.ty == 'true' }}
         env:
@@ -312,7 +308,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
       - name: "Install cargo nextest"
         uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
         with:
@@ -321,10 +317,6 @@ jobs:
         uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
         with:
           tool: cargo-insta
-      - name: "Install uv"
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
-        with:
-          enable-cache: "true"
       - name: "Run tests"
         shell: bash
         env:
@@ -348,10 +340,6 @@ jobs:
         uses: taiki-e/install-action@6064345e6658255e90e9500fdf9a06ab77e6909c # v2.57.6
         with:
           tool: cargo-nextest
-      - name: "Install uv"
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
-        with:
-          enable-cache: "true"
       - name: "Run tests"
         shell: bash
         env:
@@ -405,7 +393,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
       - name: "Build"
         run: cargo build --release --locked
 
@@ -430,7 +418,7 @@ jobs:
           MSRV: ${{ steps.msrv.outputs.value }}
         run: rustup default "${MSRV}"
       - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
       - name: "Build tests"
         shell: bash
         env:
@@ -453,7 +441,9 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@837578dfb436769f1e6669b2e23ffea9d9d2da8f # v1.15.4
+        uses: cargo-bins/cargo-binstall@79e4beb1e02f733a26129a6bf26c37dab4ab3307 # v1.14.4
+        with:
+          tool: cargo-fuzz@0.11.2
       - 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
@@ -473,7 +463,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         name: Download Ruff binary to test
         id: download-cached-binary
@@ -674,7 +664,7 @@ jobs:
           branch: ${{ github.event.pull_request.base.ref }}
           workflow: "ci.yaml"
           check_artifacts: true
-      - uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - name: Fuzz
         env:
           FORCE_COLOR: 1
@@ -704,7 +694,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@837578dfb436769f1e6669b2e23ffea9d9d2da8f # v1.15.4
+      - uses: cargo-bins/cargo-binstall@79e4beb1e02f733a26129a6bf26c37dab4ab3307 # v1.14.4
       - run: cargo binstall --no-confirm cargo-shear
       - run: cargo shear
 
@@ -725,7 +715,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@86b9d133d34bc1b40018696f782949dac11bd380 # v1.49.4
+        uses: PyO3/maturin-action@e10f6c464b90acceb5f640d31beda6d586ba7b4a # v1.49.3
         with:
           args: --out dist
       - name: "Test wheel"
@@ -744,7 +734,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
       - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
@@ -787,7 +777,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: Install uv
-        uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - name: "Install Insiders dependencies"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
         run: uv pip install -r docs/requirements-insiders.txt --system
@@ -919,7 +909,7 @@ jobs:
           persist-credentials: false
 
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
 
       - name: "Install Rust toolchain"
         run: rustup show
@@ -933,7 +923,7 @@ jobs:
         run: cargo codspeed build --features "codspeed,instrumented" --no-default-features -p ruff_benchmark
 
       - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@76578c2a7ddd928664caa737f0e962e3085d4e7c # v3.8.1
+        uses: CodSpeedHQ/action@0b6e7a3d96c9d2a6057e7bcea6b45aaf2f7ce60b # v3.8.0
         with:
           run: cargo codspeed run
           token: ${{ secrets.CODSPEED_TOKEN }}
@@ -952,7 +942,7 @@ jobs:
           persist-credentials: false
 
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
-      - uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
 
       - name: "Install Rust toolchain"
         run: rustup show
@@ -966,7 +956,7 @@ jobs:
         run: cargo codspeed build --features "codspeed,walltime" --no-default-features -p ruff_benchmark
 
       - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@76578c2a7ddd928664caa737f0e962e3085d4e7c # v3.8.1
+        uses: CodSpeedHQ/action@0b6e7a3d96c9d2a6057e7bcea6b45aaf2f7ce60b # v3.8.0
         with:
           run: cargo codspeed run
           token: ${{ secrets.CODSPEED_TOKEN }}

.github/workflows/daily_fuzz.yaml

@@ -34,11 +34,11 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
-        uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
+        uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
       - name: Build ruff
         # A debug build means the script runs slower once it gets started,

.github/workflows/mypy_primer.yaml

@@ -11,7 +11,6 @@ on:
       - "crates/ruff_python_parser"
       - ".github/workflows/mypy_primer.yaml"
       - ".github/workflows/mypy_primer_comment.yaml"
-      - "scripts/mypy_primer.sh"
       - "Cargo.lock"
       - "!**.md"
 
@@ -39,7 +38,7 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
 
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
         with:
@@ -82,7 +81,7 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
 
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
         with:

.github/workflows/publish-pypi.yml

@@ -22,7 +22,7 @@ jobs:
       id-token: write
     steps:
       - name: "Install uv"
-        uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           pattern: wheels-*

.github/workflows/release.yml

@@ -61,7 +61,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
         with:
           persist-credentials: false
           submodules: recursive
@@ -124,7 +124,7 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
     steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
         with:
           persist-credentials: false
           submodules: recursive
@@ -175,7 +175,7 @@ jobs:
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
         with:
           persist-credentials: false
           submodules: recursive
@@ -251,7 +251,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
+      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
         with:
           persist-credentials: false
           submodules: recursive

.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@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - 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@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - 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@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
+      - uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
       - name: Setup git
         run: |
           git config --global user.name typeshedbot

.github/workflows/ty-ecosystem-analyzer.yaml

@@ -33,7 +33,7 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
 
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
         with:
@@ -64,12 +64,11 @@ jobs:
 
           cd ..
 
-          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@1f560d07d672effae250e3d271da53d96c5260ff"
+          uv tool install "git+https://github.com/astral-sh/ecosystem-analyzer@27dd66d9e397d986ef9c631119ee09556eab8af9"
 
           ecosystem-analyzer \
             --repository ruff \
             diff \
-            --profile=release \
             --projects-old ruff/projects_old.txt \
             --projects-new ruff/projects_new.txt \
             --old old_commit \

.github/workflows/ty-ecosystem-report.yaml

@@ -29,7 +29,7 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@557e51de59eb14aaaba2ed9621916900a91d50c6 # v6.6.1
+        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
 
       - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
         with:

.github/workflows/typing_conformance.yaml

@@ -54,9 +54,6 @@ jobs:
 
       - name: Compute diagnostic diff
         shell: bash
-        env:
-          # TODO: Remove this once we fixed the remaining panics in the conformance suite.
-          TY_MAX_PARALLELISM: 1
         run: |
           RUFF_DIR="$GITHUB_WORKSPACE/ruff"
 
@@ -66,15 +63,15 @@ jobs:
 
             echo "new commit"
             git rev-list --format=%s --max-count=1 "$GITHUB_SHA"
-            cargo build --bin ty
-            mv target/debug/ty ty-new
+            cargo build --release --bin ty
+            mv target/release/ty ty-new
 
             MERGE_BASE="$(git merge-base "$GITHUB_SHA" "origin/$GITHUB_BASE_REF")"
             git checkout -b old_commit "$MERGE_BASE"
             echo "old commit (merge base)"
             git rev-list --format=%s --max-count=1 old_commit
-            cargo build --bin ty
-            mv target/debug/ty ty-old
+            cargo build --release --bin ty
+            mv target/release/ty ty-old
           )
 
           (

CHANGELOG.md

@@ -1,84 +1,5 @@
 # Changelog
 
-## 0.12.12
-
-### Preview features
-
-- Show fixes by default ([#19919](https://github.com/astral-sh/ruff/pull/19919))
-- \[`airflow`\] Convert `DatasetOrTimeSchedule(datasets=...)` to `AssetOrTimeSchedule(assets=...)` (`AIR311`) ([#20202](https://github.com/astral-sh/ruff/pull/20202))
-- \[`airflow`\] Improve the `AIR002` error message ([#20173](https://github.com/astral-sh/ruff/pull/20173))
-- \[`airflow`\] Move `airflow.operators.postgres_operator.Mapping` from `AIR302` to `AIR301` ([#20172](https://github.com/astral-sh/ruff/pull/20172))
-- \[`flake8-async`\] Implement `blocking-input` rule (`ASYNC250`) ([#20122](https://github.com/astral-sh/ruff/pull/20122))
-- \[`flake8-use-pathlib`\] Make `PTH119` and `PTH120` fixes unsafe because they can change behavior ([#20118](https://github.com/astral-sh/ruff/pull/20118))
-- \[`pylint`\] Add U+061C to `PLE2502` ([#20106](https://github.com/astral-sh/ruff/pull/20106))
-- \[`ruff`\] Fix false negative for empty f-strings in `deque` calls (`RUF037`) ([#20109](https://github.com/astral-sh/ruff/pull/20109))
-
-### Bug fixes
-
-- Less confidently mark f-strings as empty when inferring truthiness ([#20152](https://github.com/astral-sh/ruff/pull/20152))
-- \[`fastapi`\] Fix false positive for paths with spaces around parameters (`FAST003`) ([#20077](https://github.com/astral-sh/ruff/pull/20077))
-- \[`flake8-comprehensions`\] Skip `C417` when lambda contains `yield`/`yield from` ([#20201](https://github.com/astral-sh/ruff/pull/20201))
-- \[`perflint`\] Handle tuples in dictionary comprehensions (`PERF403`) ([#19934](https://github.com/astral-sh/ruff/pull/19934))
-
-### Rule changes
-
-- \[`pycodestyle`\] Preserve return type annotation for `ParamSpec` (`E731`) ([#20108](https://github.com/astral-sh/ruff/pull/20108))
-
-### Documentation
-
-- Add fix safety sections to docs ([#17490](https://github.com/astral-sh/ruff/pull/17490),[#17499](https://github.com/astral-sh/ruff/pull/17499))
-
-## 0.12.11
-
-### Preview features
-
-- \[`airflow`\] Extend `AIR311` and `AIR312` rules ([#20082](https://github.com/astral-sh/ruff/pull/20082))
-- \[`airflow`\] Replace wrong path `airflow.io.storage` with `airflow.io.store` (`AIR311`) ([#20081](https://github.com/astral-sh/ruff/pull/20081))
-- \[`flake8-async`\] Implement `blocking-http-call-httpx-in-async-function` (`ASYNC212`) ([#20091](https://github.com/astral-sh/ruff/pull/20091))
-- \[`flake8-logging-format`\] Add auto-fix for f-string logging calls (`G004`) ([#19303](https://github.com/astral-sh/ruff/pull/19303))
-- \[`flake8-use-pathlib`\] Add autofix for `PTH211` ([#20009](https://github.com/astral-sh/ruff/pull/20009))
-- \[`flake8-use-pathlib`\] Make `PTH100` fix unsafe because it can change behavior ([#20100](https://github.com/astral-sh/ruff/pull/20100))
-
-### Bug fixes
-
-- \[`pyflakes`, `pylint`\] Fix false positives caused by `__class__` cell handling (`F841`, `PLE0117`) ([#20048](https://github.com/astral-sh/ruff/pull/20048))
-- \[`pyflakes`\] Fix `allowed-unused-imports` matching for top-level modules (`F401`) ([#20115](https://github.com/astral-sh/ruff/pull/20115))
-- \[`ruff`\] Fix false positive for t-strings in `default-factory-kwarg` (`RUF026`) ([#20032](https://github.com/astral-sh/ruff/pull/20032))
-- \[`ruff`\] Preserve relative whitespace in multi-line expressions (`RUF033`) ([#19647](https://github.com/astral-sh/ruff/pull/19647))
-
-### Rule changes
-
-- \[`ruff`\] Handle empty t-strings in `unnecessary-empty-iterable-within-deque-call` (`RUF037`) ([#20045](https://github.com/astral-sh/ruff/pull/20045))
-
-### Documentation
-
-- Fix incorrect `D413` links in docstrings convention FAQ ([#20089](https://github.com/astral-sh/ruff/pull/20089))
-- \[`flake8-use-pathlib`\] Update links to the table showing the correspondence between `os` and `pathlib` ([#20103](https://github.com/astral-sh/ruff/pull/20103))
-
-## 0.12.10
-
-### Preview features
-
-- \[`flake8-simplify`\] Implement fix for `maxsplit` without separator (`SIM905`) ([#19851](https://github.com/astral-sh/ruff/pull/19851))
-- \[`flake8-use-pathlib`\] Add fixes for `PTH102` and `PTH103` ([#19514](https://github.com/astral-sh/ruff/pull/19514))
-
-### Bug fixes
-
-- \[`isort`\] Handle multiple continuation lines after module docstring (`I002`) ([#19818](https://github.com/astral-sh/ruff/pull/19818))
-- \[`pyupgrade`\] Avoid reporting `__future__` features as unnecessary when they are used (`UP010`) ([#19769](https://github.com/astral-sh/ruff/pull/19769))
-- \[`pyupgrade`\] Handle nested `Optional`s (`UP045`) ([#19770](https://github.com/astral-sh/ruff/pull/19770))
-
-### Rule changes
-
-- \[`pycodestyle`\] Make `E731` fix unsafe instead of display-only for class assignments ([#19700](https://github.com/astral-sh/ruff/pull/19700))
-- \[`pyflakes`\] Add secondary annotation showing previous definition (`F811`) ([#19900](https://github.com/astral-sh/ruff/pull/19900))
-
-### Documentation
-
-- Fix description of global config file discovery strategy ([#19188](https://github.com/astral-sh/ruff/pull/19188))
-- Update outdated links to <https://typing.python.org/en/latest/source/stubs.html> ([#19992](https://github.com/astral-sh/ruff/pull/19992))
-- \[`flake8-annotations`\] Remove unused import in example (`ANN401`) ([#20000](https://github.com/astral-sh/ruff/pull/20000))
-
 ## 0.12.9
 
 ### Preview features
@@ -103,31 +24,8 @@
 ### Other changes
 
 - Build `riscv64` binaries for release ([#19819](https://github.com/astral-sh/ruff/pull/19819))
-
 - Add rule code to error description in GitLab output ([#19896](https://github.com/astral-sh/ruff/pull/19896))
 
-- Improve rendering of the `full` output format ([#19415](https://github.com/astral-sh/ruff/pull/19415))
-
-    Below is an example diff for [`F401`](https://docs.astral.sh/ruff/rules/unused-import/):
-
-    ```diff
-    -unused.py:8:19: F401 [*] `pathlib` imported but unused
-    +F401 [*] `pathlib` imported but unused
-    +  --> unused.py:8:19
-        |
-      7 | # Unused, _not_ marked as required (due to the alias).
-      8 | import pathlib as non_alias
-    -   |                   ^^^^^^^^^ F401
-    +   |                   ^^^^^^^^^
-      9 |
-     10 | # Unused, marked as required.
-        |
-    -   = help: Remove unused import: `pathlib`
-    +help: Remove unused import: `pathlib`
-    ```
-
-    For now, the primary difference is the movement of the filename, line number, and column information to a second line in the header. This new representation will allow us to make further additions to Ruff's diagnostics, such as adding sub-diagnostics and multiple annotations to the same snippet.
-
 ## 0.12.8
 
 ### Preview features

Cargo.toml

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 # Please update rustfmt.toml when bumping the Rust edition
 edition = "2024"
-rust-version = "1.87"
+rust-version = "1.86"
 homepage = "https://docs.astral.sh/ruff"
 documentation = "https://docs.astral.sh/ruff"
 repository = "https://github.com/astral-sh/ruff"
@@ -115,7 +115,7 @@ jiff = { version = "0.2.0" }
 js-sys = { version = "0.3.69" }
 jod-thread = { version = "1.0.0" }
 libc = { version = "0.2.153" }
-libcst = { version = "1.8.4", default-features = false }
+libcst = { version = "1.1.0", default-features = false }
 log = { version = "0.4.17" }
 lsp-server = { version = "0.7.6" }
 lsp-types = { git = "https://github.com/astral-sh/lsp-types.git", rev = "3512a9f", features = [
@@ -143,7 +143,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 = "a3ffa22cb26756473d56f867aedec3fd907c4dd9", default-features = false, features = [
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "918d35d873b2b73a0237536144ef4d22e8d57f27", default-features = false, features = [
     "compact_str",
     "macros",
     "salsa_unstable",
@@ -215,8 +215,6 @@ unexpected_cfgs = { level = "warn", check-cfg = [
 
 [workspace.lints.clippy]
 pedantic = { level = "warn", priority = -2 }
-# Enabled at the crate level
-disallowed_methods = "allow"
 # Allowed pedantic lints
 char_lit_as_u8 = "allow"
 collapsible_else_if = "allow"
@@ -251,19 +249,10 @@ rest_pat_in_fully_bound_structs = "warn"
 redundant_clone = "warn"
 debug_assert_with_mut_call = "warn"
 unused_peekable = "warn"
-# This lint sometimes flags code whose `if` and `else`
-# bodies could be flipped when a `!` operator is removed.
-# While perhaps sometimes a good idea, it is also often
-# not a good idea due to other factors impacting
-# readability. For example, if flipping the bodies results
-# in the `if` being an order of magnitude bigger than the
-# `else`, then some might consider that harder to read.
-if_not_else = "allow"
 
 # Diagnostics are not actionable: Enable once https://github.com/rust-lang/rust-clippy/issues/13774 is resolved.
 large_stack_arrays = "allow"
 
-
 [profile.release]
 # Note that we set these explicitly, and these values
 # were chosen based on a trade-off between compile times

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.12.12/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.12.12/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.12.9/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.12.9/install.ps1 | iex"
 ```
 
 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.12.12
+  rev: v0.12.9
   hooks:
     # Run the linter.
     - id: ruff-check

clippy.toml

@@ -24,20 +24,3 @@ ignore-interior-mutability = [
     # The expression is read-only.
     "ruff_python_ast::hashable::HashableExpr",
 ]
-
-disallowed-methods = [
-    { path = "std::env::var", reason = "Use System::env_var instead in ty crates" },
-    { path = "std::env::current_dir", reason = "Use System::current_directory instead in ty crates" },
-    { path = "std::fs::read_to_string", reason = "Use System::read_to_string instead in ty crates" },
-    { path = "std::fs::metadata", reason = "Use System::path_metadata instead in ty crates" },
-    { path = "std::fs::canonicalize", reason = "Use System::canonicalize_path instead in ty crates" },
-    { path = "dunce::canonicalize", reason = "Use System::canonicalize_path instead in ty crates" },
-    { path = "std::fs::read_dir", reason = "Use System::read_directory instead in ty crates" },
-    { path = "std::fs::write", reason = "Use WritableSystem::write_file instead in ty crates" },
-    { path = "std::fs::create_dir_all", reason = "Use WritableSystem::create_directory_all instead in ty crates" },
-    { path = "std::fs::File::create_new", reason = "Use WritableSystem::create_new_file instead in ty crates" },
-    # Path methods that have System trait equivalents
-    { path = "std::path::Path::exists", reason = "Use System::path_exists instead in ty crates" },
-    { path = "std::path::Path::is_dir", reason = "Use System::is_directory instead in ty crates" },
-    { path = "std::path::Path::is_file", reason = "Use System::is_file instead in ty crates" },
-]

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.12.12"
+version = "0.12.9"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }

crates/ruff/src/printer.rs

@@ -15,7 +15,8 @@ use ruff_db::diagnostic::{
 use ruff_linter::fs::relativize_path;
 use ruff_linter::logging::LogLevel;
 use ruff_linter::message::{
-    Emitter, EmitterContext, GithubEmitter, GroupedEmitter, SarifEmitter, TextEmitter,
+    Emitter, EmitterContext, GithubEmitter, GitlabEmitter, GroupedEmitter, SarifEmitter,
+    TextEmitter,
 };
 use ruff_linter::notify_user;
 use ruff_linter::settings::flags::{self};
@@ -30,6 +31,8 @@ bitflags! {
         const SHOW_VIOLATIONS = 1 << 0;
         /// Whether to show a summary of the fixed violations when emitting diagnostics.
         const SHOW_FIX_SUMMARY = 1 << 1;
+        /// Whether to show a diff of each fixed violation when emitting diagnostics.
+        const SHOW_FIX_DIFF = 1 << 2;
     }
 }
 
@@ -258,9 +261,9 @@ impl Printer {
             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_fix_diff(self.flags.intersects(Flags::SHOW_FIX_DIFF))
                     .with_show_source(self.format == OutputFormat::Full)
-                    .with_fix_applicability(self.unsafe_fixes.required_applicability())
+                    .with_unsafe_fixes(self.unsafe_fixes)
                     .with_preview(preview)
                     .emit(writer, &diagnostics.inner, &context)?;
 
@@ -293,11 +296,7 @@ impl Printer {
                 GithubEmitter.emit(writer, &diagnostics.inner, &context)?;
             }
             OutputFormat::Gitlab => {
-                let config = DisplayDiagnosticConfig::default()
-                    .format(DiagnosticFormat::Gitlab)
-                    .preview(preview);
-                let value = DisplayDiagnostics::new(&context, &config, &diagnostics.inner);
-                write!(writer, "{value}")?;
+                GitlabEmitter::default().emit(writer, &diagnostics.inner, &context)?;
             }
             OutputFormat::Pylint => {
                 let config = DisplayDiagnosticConfig::default()
@@ -462,7 +461,7 @@ impl Printer {
             TextEmitter::default()
                 .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())
+                .with_unsafe_fixes(self.unsafe_fixes)
                 .emit(writer, &diagnostics.inner, &context)?;
         }
         writer.flush()?;

crates/ruff/tests/integration_test.rs

@@ -1489,8 +1489,6 @@ fn deprecated_direct() {
 
 #[test]
 fn deprecated_multiple_direct() {
-    // Multiple deprecated rules selected by exact code should be included
-    // but a warning should be displayed
     let mut cmd = RuffCheck::default()
         .args(["--select", "RUF920", "--select", "RUF921"])
         .build();
@@ -1518,10 +1516,16 @@ fn deprecated_indirect() {
     // since it is not a "direct" selection
     let mut cmd = RuffCheck::default().args(["--select", "RUF92"]).build();
     assert_cmd_snapshot!(cmd, @r"
-    success: true
-    exit_code: 0
+    success: false
+    exit_code: 1
     ----- stdout -----
-    All checks passed!
+    RUF920 Hey this is a deprecated test rule.
+    --> -:1:1
+
+    RUF921 Hey this is another deprecated test rule.
+    --> -:1:1
+
+    Found 2 errors.
 
     ----- stderr -----
     ");
@@ -2151,10 +2155,16 @@ extend-safe-fixes = ["RUF9"]
     RUF903 Hey this is a stable test rule with a display only fix.
     --> -:1:1
 
+    RUF920 Hey this is a deprecated test rule.
+    --> -:1:1
+
+    RUF921 Hey this is another deprecated test rule.
+    --> -:1:1
+
     RUF950 Hey this is a test rule that was redirected from another.
     --> -:1:1
 
-    Found 5 errors.
+    Found 7 errors.
     [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).
 
     ----- stderr -----

crates/ruff/tests/lint.rs

@@ -5781,60 +5781,23 @@ match 42:  # invalid-syntax
 }
 
 #[test]
-fn up045_nested_optional_flatten_all() {
-    let contents = "\
-from typing import Optional
-nested_optional: Optional[Optional[Optional[str]]] = None
-";
-
+fn future_annotations_preview_warning() {
     assert_cmd_snapshot!(
         Command::new(get_cargo_bin(BIN_NAME))
             .args(STDIN_BASE_OPTIONS)
-            .args(["--select", "UP045", "--diff", "--target-version", "py312"])
+            .args(["--config", "lint.future-annotations = true"])
+            .args(["--select", "F"])
+            .arg("--no-preview")
             .arg("-")
-            .pass_stdin(contents),
+            .pass_stdin("1"),
         @r"
-    success: false
-    exit_code: 1
+    success: true
+    exit_code: 0
     ----- stdout -----
-    @@ -1,2 +1,2 @@
-     from typing import Optional
-    -nested_optional: Optional[Optional[Optional[str]]] = None
-    +nested_optional: str | None = None
-
-
-    ----- stderr -----
-    Would fix 1 error.
-    ",
-    );
-}
-
-#[test]
-fn show_fixes_in_full_output_with_preview_enabled() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args(["check", "--no-cache", "--output-format", "full"])
-            .args(["--select", "F401"])
-            .arg("--preview")
-            .arg("-")
-            .pass_stdin("import math"),
-        @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    F401 [*] `math` imported but unused
-     --> -:1:8
-      |
-    1 | import math
-      |        ^^^^
-      |
-    help: Remove unused import: `math`
-      - import math
-
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
+    All checks passed!
 
     ----- stderr -----
+    warning: The `lint.future-annotations` setting will have no effect because `preview` is disabled
     ",
     );
 }

crates/ruff/tests/snapshots/integration_test__rule_f401.snap

@@ -55,10 +55,6 @@ either a redundant alias or, if already present in the file, an `__all__` entry.
 to remove third-party and standard library imports -- the fix is unsafe because the module's
 interface changes.
 
-See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc)
-for more details on how Ruff
-determines whether an import is first or third-party.
-
 ## Example
 
 ```python
@@ -87,6 +83,11 @@ else:
     print("numpy is not installed")
 ```
 
+## Preview
+When [preview](https://docs.astral.sh/ruff/preview/) is enabled,
+the criterion for determining whether an import is first-party
+is stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.
+
 ## Options
 - `lint.ignore-init-module-imports`
 - `lint.pyflakes.allowed-unused-imports`

crates/ruff/tests/snapshots/lint__output_format_gitlab.snap

@@ -20,59 +20,59 @@ exit_code: 1
   {
     "check_name": "F401",
     "description": "F401: `os` imported but unused",
-    "severity": "major",
     "fingerprint": "4dbad37161e65c72",
     "location": {
       "path": "input.py",
       "positions": {
         "begin": {
-          "line": 1,
-          "column": 8
+          "column": 8,
+          "line": 1
         },
         "end": {
-          "line": 1,
-          "column": 10
+          "column": 10,
+          "line": 1
         }
       }
-    }
+    },
+    "severity": "major"
   },
   {
     "check_name": "F821",
     "description": "F821: Undefined name `y`",
-    "severity": "major",
     "fingerprint": "7af59862a085230",
     "location": {
       "path": "input.py",
       "positions": {
         "begin": {
-          "line": 2,
-          "column": 5
+          "column": 5,
+          "line": 2
         },
         "end": {
-          "line": 2,
-          "column": 6
+          "column": 6,
+          "line": 2
         }
       }
-    }
+    },
+    "severity": "major"
   },
   {
     "check_name": "invalid-syntax",
     "description": "invalid-syntax: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)",
-    "severity": "major",
     "fingerprint": "e558cec859bb66e8",
     "location": {
       "path": "input.py",
       "positions": {
         "begin": {
-          "line": 3,
-          "column": 1
+          "column": 1,
+          "line": 3
         },
         "end": {
-          "line": 3,
-          "column": 6
+          "column": 6,
+          "line": 3
         }
       }
-    }
+    },
+    "severity": "major"
   }
 ]
 ----- stderr -----

crates/ruff/tests/snapshots/lint__output_format_sarif.snap

@@ -95,7 +95,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## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Preview\nWhen [preview](https://docs.astral.sh/ruff/preview/) is enabled,\nthe criterion for determining whether an import is first-party\nis stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)\n"
               },
               "help": {
                 "text": "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability"

crates/ruff_benchmark/benches/ty.rs

@@ -450,6 +450,9 @@ fn benchmark_complex_constrained_attributes_2(criterion: &mut Criterion) {
                     r#"
                     class C:
                         def f(self: "C"):
+                            self.a = ""
+                            self.b = ""
+
                             if isinstance(self.a, str):
                                 return
 
@@ -463,56 +466,6 @@ fn benchmark_complex_constrained_attributes_2(criterion: &mut Criterion) {
                                 return
                             if isinstance(self.b, str):
                                 return
-                            if isinstance(self.b, str):
-                                return
-                            if isinstance(self.b, str):
-                                return
-
-                            self.a = ""
-                            self.b = ""
-                    "#,
-                )
-            },
-            |case| {
-                let Case { db, .. } = case;
-                let result = db.check();
-                assert_eq!(result.len(), 0);
-            },
-            BatchSize::SmallInput,
-        );
-    });
-}
-
-fn benchmark_complex_constrained_attributes_3(criterion: &mut Criterion) {
-    setup_rayon();
-
-    criterion.bench_function("ty_micro[complex_constrained_attributes_3]", |b| {
-        b.iter_batched_ref(
-            || {
-                // This is a regression test for https://github.com/astral-sh/ty/issues/758
-                setup_micro_case(
-                    r#"
-                    class GridOut:
-                        def __init__(self: "GridOut") -> None:
-                            self._buffer = b""
-
-                        def _read_size_or_line(self: "GridOut", size: int = -1):
-                            if size > self._position:
-                                size = self._position
-                                pass
-                            if size == 0:
-                                return bytes()
-
-                            while size > 0:
-                                if self._buffer:
-                                    buf = self._buffer
-                                    self._buffer = b""
-                                else:
-                                    buf = b""
-
-                                if len(buf) > size:
-                                    self._buffer = buf
-                                    self._position -= len(self._buffer)
                     "#,
                 )
             },
@@ -715,7 +668,6 @@ criterion_group!(
     benchmark_tuple_implicit_instance_attributes,
     benchmark_complex_constrained_attributes_1,
     benchmark_complex_constrained_attributes_2,
-    benchmark_complex_constrained_attributes_3,
     benchmark_many_enum_members,
 );
 criterion_group!(project, anyio, attrs, hydra, datetype);

crates/ruff_db/Cargo.toml

@@ -34,14 +34,12 @@ glob = { workspace = true }
 ignore = { workspace = true, optional = true }
 matchit = { workspace = true }
 path-slash = { workspace = true }
-pathdiff = { workspace = true }
 quick-junit = { workspace = true, optional = true }
 rustc-hash = { workspace = true }
 salsa = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
-similar = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, optional = true }
@@ -54,7 +52,7 @@ web-time = { version = "1.1.0" }
 etcetera = { workspace = true, optional = true }
 
 [dev-dependencies]
-insta = { workspace = true, features = ["filters"] }
+insta = { workspace = true }
 tempfile = { workspace = true }
 
 [features]

crates/ruff_db/src/diagnostic/mod.rs

@@ -325,11 +325,6 @@ impl Diagnostic {
         self.inner.fix.as_ref()
     }
 
-    #[cfg(test)]
-    pub(crate) fn fix_mut(&mut self) -> Option<&mut Fix> {
-        Arc::make_mut(&mut self.inner).fix.as_mut()
-    }
-
     /// Set the fix for this diagnostic.
     pub fn set_fix(&mut self, fix: Fix) {
         debug_assert!(
@@ -349,13 +344,6 @@ impl Diagnostic {
         self.fix().is_some()
     }
 
-    /// Returns `true` if the diagnostic is [`fixable`](Diagnostic::fixable) and applies at the
-    /// configured applicability level.
-    pub fn has_applicable_fix(&self, config: &DisplayDiagnosticConfig) -> bool {
-        self.fix()
-            .is_some_and(|fix| fix.applies(config.fix_applicability))
-    }
-
     /// Returns the offset of the parent statement for this diagnostic if it exists.
     ///
     /// This is primarily used for checking noqa/secondary code suppressions.
@@ -454,26 +442,24 @@ impl Diagnostic {
 
     /// Computes the start source location for the message.
     ///
-    /// Returns None if the diagnostic has no primary span, if its file is not a `SourceFile`,
-    /// or if the span has no range.
-    pub fn ruff_start_location(&self) -> Option<LineColumn> {
-        Some(
-            self.ruff_source_file()?
-                .to_source_code()
-                .line_column(self.range()?.start()),
-        )
+    /// Panics if the diagnostic has no primary span, if its file is not a `SourceFile`, or if the
+    /// span has no range.
+    pub fn expect_ruff_start_location(&self) -> LineColumn {
+        self.expect_primary_span()
+            .expect_ruff_file()
+            .to_source_code()
+            .line_column(self.expect_range().start())
     }
 
     /// Computes the end source location for the message.
     ///
-    /// Returns None if the diagnostic has no primary span, if its file is not a `SourceFile`,
-    /// or if the span has no range.
-    pub fn ruff_end_location(&self) -> Option<LineColumn> {
-        Some(
-            self.ruff_source_file()?
-                .to_source_code()
-                .line_column(self.range()?.end()),
-        )
+    /// Panics if the diagnostic has no primary span, if its file is not a `SourceFile`, or if the
+    /// span has no range.
+    pub fn expect_ruff_end_location(&self) -> LineColumn {
+        self.expect_primary_span()
+            .expect_ruff_file()
+            .to_source_code()
+            .line_column(self.expect_range().end())
     }
 
     /// Returns the [`SourceFile`] which the message belongs to.
@@ -503,18 +489,13 @@ impl Diagnostic {
 
     /// Returns the ordering of diagnostics based on the start of their ranges, if they have any.
     ///
-    /// Panics if either diagnostic has no primary span, or if its file is not a `SourceFile`.
+    /// Panics if either diagnostic has no primary span, if the span has no range, or if its file is
+    /// not a `SourceFile`.
     pub fn ruff_start_ordering(&self, other: &Self) -> std::cmp::Ordering {
-        let a = (
-            self.expect_ruff_source_file(),
-            self.range().map(|r| r.start()),
-        );
-        let b = (
+        (self.expect_ruff_source_file(), self.expect_range().start()).cmp(&(
             other.expect_ruff_source_file(),
-            other.range().map(|r| r.start()),
-        );
-
-        a.cmp(&b)
+            other.expect_range().start(),
+        ))
     }
 }
 
@@ -1313,10 +1294,6 @@ pub struct DisplayDiagnosticConfig {
     hide_severity: bool,
     /// Whether to show the availability of a fix in a diagnostic.
     show_fix_status: bool,
-    /// Whether to show the diff for an available fix after the main diagnostic.
-    ///
-    /// This currently only applies to `DiagnosticFormat::Full`.
-    show_fix_diff: bool,
     /// The lowest applicability that should be shown when reporting diagnostics.
     fix_applicability: Applicability,
 }
@@ -1364,14 +1341,6 @@ impl DisplayDiagnosticConfig {
         }
     }
 
-    /// Whether to show a diff for an available fix after the main diagnostic.
-    pub fn show_fix_diff(self, yes: bool) -> DisplayDiagnosticConfig {
-        DisplayDiagnosticConfig {
-            show_fix_diff: yes,
-            ..self
-        }
-    }
-
     /// Set the lowest fix applicability that should be shown.
     ///
     /// In other words, an applicability of `Safe` (the default) would suppress showing fixes or fix
@@ -1395,7 +1364,6 @@ impl Default for DisplayDiagnosticConfig {
             preview: false,
             hide_severity: false,
             show_fix_status: false,
-            show_fix_diff: false,
             fix_applicability: Applicability::Safe,
         }
     }
@@ -1449,11 +1417,6 @@ pub enum DiagnosticFormat {
     /// Print diagnostics in the format expected by JUnit.
     #[cfg(feature = "junit")]
     Junit,
-    /// Print diagnostics in the JSON format used by GitLab [Code Quality] reports.
-    ///
-    /// [Code Quality]: https://docs.gitlab.com/ci/testing/code_quality/#code-quality-report-format
-    #[cfg(feature = "serde")]
-    Gitlab,
 }
 
 /// A representation of the kinds of messages inside a diagnostic.

crates/ruff_db/src/diagnostic/render.rs

@@ -31,8 +31,6 @@ mod azure;
 mod concise;
 mod full;
 #[cfg(feature = "serde")]
-mod gitlab;
-#[cfg(feature = "serde")]
 mod json;
 #[cfg(feature = "serde")]
 mod json_lines;
@@ -138,10 +136,6 @@ impl std::fmt::Display for DisplayDiagnostics<'_> {
             DiagnosticFormat::Junit => {
                 junit::JunitRenderer::new(self.resolver).render(f, self.diagnostics)?;
             }
-            #[cfg(feature = "serde")]
-            DiagnosticFormat::Gitlab => {
-                gitlab::GitlabRenderer::new(self.resolver).render(f, self.diagnostics)?;
-            }
         }
 
         Ok(())
@@ -254,7 +248,9 @@ impl<'a> ResolvedDiagnostic<'a> {
             id,
             message: diag.inner.message.as_str().to_string(),
             annotations,
-            is_fixable: diag.has_applicable_fix(config),
+            is_fixable: diag
+                .fix()
+                .is_some_and(|fix| fix.applies(config.fix_applicability)),
         }
     }
 
@@ -2626,13 +2622,6 @@ watermelon
             self.config = config;
         }
 
-        /// Show a diff for the fix when rendering.
-        pub(super) fn show_fix_diff(&mut self, yes: bool) {
-            let mut config = std::mem::take(&mut self.config);
-            config = config.show_fix_diff(yes);
-            self.config = config;
-        }
-
         /// The lowest fix applicability to show when rendering.
         pub(super) fn fix_applicability(&mut self, applicability: Applicability) {
             let mut config = std::mem::take(&mut self.config);

crates/ruff_db/src/diagnostic/render/concise.rs

@@ -77,9 +77,11 @@ impl<'a> ConciseRenderer<'a> {
                     )?;
                 }
                 if self.config.show_fix_status {
-                    // Do not display an indicator for inapplicable fixes
-                    if diag.has_applicable_fix(self.config) {
-                        write!(f, "[{fix}] ", fix = fmt_styled("*", stylesheet.separator))?;
+                    if let Some(fix) = diag.fix() {
+                        // Do not display an indicator for inapplicable fixes
+                        if fix.applies(self.config.fix_applicability) {
+                            write!(f, "[{fix}] ", fix = fmt_styled("*", stylesheet.separator))?;
+                        }
                     }
                 }
             } else {

crates/ruff_db/src/diagnostic/render/full.rs

@@ -1,17 +1,7 @@
-use std::borrow::Cow;
-use std::num::NonZeroUsize;
-
-use similar::{ChangeTag, TextDiff};
-
 use ruff_annotate_snippets::Renderer as AnnotateRenderer;
-use ruff_diagnostics::{Applicability, Fix};
-use ruff_notebook::NotebookIndex;
-use ruff_source_file::OneIndexed;
-use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
 
 use crate::diagnostic::render::{FileResolver, Resolved};
-use crate::diagnostic::stylesheet::{DiagnosticStylesheet, fmt_styled};
-use crate::diagnostic::{Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};
+use crate::diagnostic::{Diagnostic, DisplayDiagnosticConfig, stylesheet::DiagnosticStylesheet};
 
 pub(super) struct FullRenderer<'a> {
     resolver: &'a dyn FileResolver,
@@ -57,13 +47,6 @@ impl<'a> FullRenderer<'a> {
             for diag in renderable.diagnostics.iter() {
                 writeln!(f, "{}", renderer.render(diag.to_annotate()))?;
             }
-
-            if self.config.show_fix_diff && diag.has_applicable_fix(self.config) {
-                if let Some(diff) = Diff::from_diagnostic(diag, &stylesheet, self.resolver) {
-                    write!(f, "{diff}")?;
-                }
-            }
-
             writeln!(f)?;
         }
 
@@ -71,227 +54,9 @@ impl<'a> FullRenderer<'a> {
     }
 }
 
-/// Renders a diff that shows the code fixes.
-///
-/// The implementation isn't fully fledged out and only used by tests. Before using in production, try
-/// * Improve layout
-/// * Replace tabs with spaces for a consistent experience across terminals
-/// * Replace zero-width whitespaces
-/// * Print a simpler diff if only a single line has changed
-/// * Compute the diff from the `Edit` because diff calculation is expensive.
-struct Diff<'a> {
-    fix: &'a Fix,
-    diagnostic_source: DiagnosticSource,
-    notebook_index: Option<NotebookIndex>,
-    stylesheet: &'a DiagnosticStylesheet,
-}
-
-impl<'a> Diff<'a> {
-    fn from_diagnostic(
-        diagnostic: &'a Diagnostic,
-        stylesheet: &'a DiagnosticStylesheet,
-        resolver: &'a dyn FileResolver,
-    ) -> Option<Diff<'a>> {
-        let file = &diagnostic.primary_span_ref()?.file;
-        Some(Diff {
-            fix: diagnostic.fix()?,
-            diagnostic_source: file.diagnostic_source(resolver),
-            notebook_index: resolver.notebook_index(file),
-            stylesheet,
-        })
-    }
-}
-
-impl std::fmt::Display for Diff<'_> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let source_code = self.diagnostic_source.as_source_code();
-        let source_text = source_code.text();
-
-        // Partition the source code into end offsets for each cell. If `self.notebook_index` is
-        // `None`, indicating a regular script file, all the lines will be in one "cell" under the
-        // `None` key.
-        let cells = if let Some(notebook_index) = &self.notebook_index {
-            let mut last_cell = OneIndexed::MIN;
-            let mut cells: Vec<(Option<OneIndexed>, TextSize)> = Vec::new();
-            for (row, cell) in notebook_index.iter() {
-                if cell != last_cell {
-                    let offset = source_code.line_start(row);
-                    cells.push((Some(last_cell), offset));
-                    last_cell = cell;
-                }
-            }
-            cells.push((Some(last_cell), source_text.text_len()));
-            cells
-        } else {
-            vec![(None, source_text.text_len())]
-        };
-
-        let mut last_end = TextSize::ZERO;
-        for (cell, offset) in cells {
-            let range = TextRange::new(last_end, offset);
-            last_end = offset;
-            let input = source_code.slice(range);
-
-            let mut output = String::with_capacity(input.len());
-            let mut last_end = range.start();
-
-            let mut applied = 0;
-            for edit in self.fix.edits() {
-                if range.contains_range(edit.range()) {
-                    output.push_str(source_code.slice(TextRange::new(last_end, edit.start())));
-                    output.push_str(edit.content().unwrap_or_default());
-                    last_end = edit.end();
-                    applied += 1;
-                }
-            }
-
-            // No edits were applied, so there's no need to diff.
-            if applied == 0 {
-                continue;
-            }
-
-            output.push_str(&source_text[usize::from(last_end)..usize::from(range.end())]);
-
-            let diff = TextDiff::from_lines(input, &output);
-
-            let grouped_ops = diff.grouped_ops(3);
-
-            // Find the new line number with the largest number of digits to align all of the line
-            // number separators.
-            let last_op = grouped_ops.last().and_then(|group| group.last());
-            let largest_new = last_op.map(|op| op.new_range().end).unwrap_or_default();
-
-            let digit_with = OneIndexed::new(largest_new).unwrap_or_default().digits();
-
-            if let Some(cell) = cell {
-                // Room for 1 digit, 1 space, 1 `|`, and 1 more following space. This centers the
-                // three colons on the pipe.
-                writeln!(f, "{:>1$} cell {cell}", ":::", digit_with.get() + 3)?;
-            }
-
-            for (idx, group) in grouped_ops.iter().enumerate() {
-                if idx > 0 {
-                    writeln!(f, "{:-^1$}", "-", 80)?;
-                }
-                for op in group {
-                    for change in diff.iter_inline_changes(op) {
-                        let (sign, style, line_no_style, index) = match change.tag() {
-                            ChangeTag::Delete => (
-                                "-",
-                                self.stylesheet.deletion,
-                                self.stylesheet.deletion_line_no,
-                                None,
-                            ),
-                            ChangeTag::Insert => (
-                                "+",
-                                self.stylesheet.insertion,
-                                self.stylesheet.insertion_line_no,
-                                change.new_index(),
-                            ),
-                            ChangeTag::Equal => (
-                                "|",
-                                self.stylesheet.none,
-                                self.stylesheet.line_no,
-                                change.new_index(),
-                            ),
-                        };
-
-                        let line = Line {
-                            index: index.map(OneIndexed::from_zero_indexed),
-                            width: digit_with,
-                        };
-
-                        write!(
-                            f,
-                            "{line} {sign} ",
-                            line = fmt_styled(line, self.stylesheet.line_no),
-                            sign = fmt_styled(sign, line_no_style),
-                        )?;
-
-                        for (emphasized, value) in change.iter_strings_lossy() {
-                            let value = show_nonprinting(&value);
-                            let styled = fmt_styled(value, style);
-                            if emphasized {
-                                write!(f, "{}", fmt_styled(styled, self.stylesheet.emphasis))?;
-                            } else {
-                                write!(f, "{styled}")?;
-                            }
-                        }
-                        if change.missing_newline() {
-                            writeln!(f)?;
-                        }
-                    }
-                }
-            }
-        }
-
-        match self.fix.applicability() {
-            Applicability::Safe => {}
-            Applicability::Unsafe => {
-                writeln!(
-                    f,
-                    "{note}: {msg}",
-                    note = fmt_styled("note", self.stylesheet.warning),
-                    msg = fmt_styled(
-                        "This is an unsafe fix and may change runtime behavior",
-                        self.stylesheet.emphasis
-                    )
-                )?;
-            }
-            Applicability::DisplayOnly => {
-                // Note that this is still only used in tests. There's no `--display-only-fixes`
-                // analog to `--unsafe-fixes` for users to activate this or see the styling.
-                writeln!(
-                    f,
-                    "{note}: {msg}",
-                    note = fmt_styled("note", self.stylesheet.error),
-                    msg = fmt_styled(
-                        "This is a display-only fix and is likely to be incorrect",
-                        self.stylesheet.emphasis
-                    )
-                )?;
-            }
-        }
-
-        Ok(())
-    }
-}
-
-struct Line {
-    index: Option<OneIndexed>,
-    width: NonZeroUsize,
-}
-
-impl std::fmt::Display for Line {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        match self.index {
-            None => {
-                for _ in 0..self.width.get() {
-                    f.write_str(" ")?;
-                }
-                Ok(())
-            }
-            Some(idx) => write!(f, "{:<width$}", idx, width = self.width.get()),
-        }
-    }
-}
-
-fn show_nonprinting(s: &str) -> Cow<'_, str> {
-    if s.find(['\x07', '\x08', '\x1b', '\x7f']).is_some() {
-        Cow::Owned(
-            s.replace('\x07', "␇")
-                .replace('\x08', "␈")
-                .replace('\x1b', "␛")
-                .replace('\x7f', "␡"),
-        )
-    } else {
-        Cow::Borrowed(s)
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use ruff_diagnostics::{Applicability, Edit, Fix};
+    use ruff_diagnostics::Applicability;
     use ruff_text_size::{TextLen, TextRange, TextSize};
 
     use crate::diagnostic::{
@@ -692,104 +457,6 @@ print()
         ");
     }
 
-    /// Test that we remap notebook cell line numbers in the diff as well as the main diagnostic.
-    #[test]
-    fn notebook_output_with_diff() {
-        let (mut env, diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
-        env.show_fix_diff(true);
-        env.fix_applicability(Applicability::DisplayOnly);
-
-        insta::assert_snapshot!(env.render_diagnostics(&diagnostics), @r"
-        error[unused-import][*]: `os` imported but unused
-         --> notebook.ipynb:cell 1:2:8
-          |
-        1 | # cell 1
-        2 | import os
-          |        ^^
-          |
-        help: Remove unused import: `os`
-         ::: cell 1
-        1 | # cell 1
-          - import os
-
-        error[unused-import][*]: `math` imported but unused
-         --> notebook.ipynb:cell 2:2:8
-          |
-        1 | # cell 2
-        2 | import math
-          |        ^^^^
-        3 |
-        4 | print('hello world')
-          |
-        help: Remove unused import: `math`
-         ::: cell 2
-        1 | # cell 2
-          - import math
-        2 | 
-        3 | print('hello world')
-
-        error[unused-variable][*]: Local variable `x` is assigned to but never used
-         --> notebook.ipynb:cell 3:4:5
-          |
-        2 | def foo():
-        3 |     print()
-        4 |     x = 1
-          |     ^
-          |
-        help: Remove assignment to unused variable `x`
-         ::: cell 3
-        1 | # cell 3
-        2 | def foo():
-        3 |     print()
-          -     x = 1
-        4 | 
-        note: This is an unsafe fix and may change runtime behavior
-        ");
-    }
-
-    #[test]
-    fn notebook_output_with_diff_spanning_cells() {
-        let (mut env, mut diagnostics) = create_notebook_diagnostics(DiagnosticFormat::Full);
-        env.show_fix_diff(true);
-        env.fix_applicability(Applicability::DisplayOnly);
-
-        // Move all of the edits from the later diagnostics to the first diagnostic to simulate a
-        // single diagnostic with edits in different cells.
-        let mut diagnostic = diagnostics.swap_remove(0);
-        let fix = diagnostic.fix_mut().unwrap();
-        let mut edits = fix.edits().to_vec();
-        for diag in diagnostics {
-            edits.extend_from_slice(diag.fix().unwrap().edits());
-        }
-        *fix = Fix::unsafe_edits(edits.remove(0), edits);
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[unused-import][*]: `os` imported but unused
-         --> notebook.ipynb:cell 1:2:8
-          |
-        1 | # cell 1
-        2 | import os
-          |        ^^
-          |
-        help: Remove unused import: `os`
-         ::: cell 1
-        1 | # cell 1
-          - import os
-         ::: cell 2
-        1 | # cell 2
-          - import math
-        2 | 
-        3 | print('hello world')
-         ::: cell 3
-        1 | # cell 3
-        2 | def foo():
-        3 |     print()
-          -     x = 1
-        4 | 
-        note: This is an unsafe fix and may change runtime behavior
-        ");
-    }
-
     /// Carriage return (`\r`) is a valid line-ending in Python, so we should normalize this to a
     /// line feed (`\n`) for rendering. Otherwise we report a single long line for this case.
     #[test]
@@ -892,74 +559,4 @@ print()
           |
         ");
     }
-
-    /// Test that we handle the width calculation for the line number correctly even for context
-    /// lines at the end of a diff. For example, we want it to render like this:
-    ///
-    /// ```
-    /// 8  |
-    /// 9  |
-    /// 10 |
-    /// ```
-    ///
-    /// and not like this:
-    ///
-    /// ```
-    /// 8 |
-    /// 9 |
-    /// 10 |
-    /// ```
-    #[test]
-    fn longer_line_number_end_of_context() {
-        let mut env = TestEnvironment::new();
-        let contents = "\
-line 1
-line 2
-line 3
-line 4
-line 5
-line 6
-line 7
-line 8
-line 9
-line 10
-        ";
-        env.add("example.py", contents);
-        env.format(DiagnosticFormat::Full);
-        env.show_fix_diff(true);
-        env.fix_applicability(Applicability::DisplayOnly);
-
-        let mut diagnostic = env.err().primary("example.py", "3", "3", "label").build();
-        diagnostic.help("Start of diff:");
-        let target = "line 7";
-        let line9 = contents.find(target).unwrap();
-        let range = TextRange::at(TextSize::try_from(line9).unwrap(), target.text_len());
-        diagnostic.set_fix(Fix::unsafe_edit(Edit::range_replacement(
-            format!("fixed {target}"),
-            range,
-        )));
-
-        insta::assert_snapshot!(env.render(&diagnostic), @r"
-        error[test-diagnostic][*]: main diagnostic message
-         --> example.py:3:1
-          |
-        1 | line 1
-        2 | line 2
-        3 | line 3
-          | ^^^^^^ label
-        4 | line 4
-        5 | line 5
-          |
-        help: Start of diff:
-        4  | line 4
-        5  | line 5
-        6  | line 6
-           - line 7
-        7  + fixed line 7
-        8  | line 8
-        9  | line 9
-        10 | line 10
-        note: This is an unsafe fix and may change runtime behavior
-        ");
-    }
 }

crates/ruff_db/src/diagnostic/render/gitlab.rs

@@ -1,205 +0,0 @@
-use std::{
-    collections::HashSet,
-    hash::{DefaultHasher, Hash, Hasher},
-    path::Path,
-};
-
-use ruff_source_file::LineColumn;
-use serde::{Serialize, Serializer, ser::SerializeSeq};
-
-use crate::diagnostic::{Diagnostic, Severity};
-
-use super::FileResolver;
-
-pub(super) struct GitlabRenderer<'a> {
-    resolver: &'a dyn FileResolver,
-}
-
-impl<'a> GitlabRenderer<'a> {
-    pub(super) fn new(resolver: &'a dyn FileResolver) -> Self {
-        Self { resolver }
-    }
-}
-
-impl GitlabRenderer<'_> {
-    pub(super) fn render(
-        &self,
-        f: &mut std::fmt::Formatter,
-        diagnostics: &[Diagnostic],
-    ) -> std::fmt::Result {
-        write!(
-            f,
-            "{}",
-            serde_json::to_string_pretty(&SerializedMessages {
-                diagnostics,
-                resolver: self.resolver,
-                #[expect(
-                    clippy::disallowed_methods,
-                    reason = "We don't have access to a `System` here, \
-                              and this is only intended for use by GitLab CI, \
-                              which runs on a real `System`."
-                )]
-                project_dir: std::env::var("CI_PROJECT_DIR").ok().as_deref(),
-            })
-            .unwrap()
-        )
-    }
-}
-
-struct SerializedMessages<'a> {
-    diagnostics: &'a [Diagnostic],
-    resolver: &'a dyn FileResolver,
-    project_dir: Option<&'a str>,
-}
-
-impl Serialize for SerializedMessages<'_> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut s = serializer.serialize_seq(Some(self.diagnostics.len()))?;
-        let mut fingerprints = HashSet::<u64>::with_capacity(self.diagnostics.len());
-
-        for diagnostic in self.diagnostics {
-            let location = diagnostic
-                .primary_span()
-                .map(|span| {
-                    let file = span.file();
-                    let positions = if self.resolver.is_notebook(file) {
-                        // We can't give a reasonable location for the structured formats,
-                        // so we show one that's clearly a fallback
-                        Default::default()
-                    } else {
-                        let diagnostic_source = file.diagnostic_source(self.resolver);
-                        let source_code = diagnostic_source.as_source_code();
-                        span.range()
-                            .map(|range| Positions {
-                                begin: source_code.line_column(range.start()),
-                                end: source_code.line_column(range.end()),
-                            })
-                            .unwrap_or_default()
-                    };
-
-                    let path = self.project_dir.as_ref().map_or_else(
-                        || file.relative_path(self.resolver).display().to_string(),
-                        |project_dir| relativize_path_to(file.path(self.resolver), project_dir),
-                    );
-
-                    Location { path, positions }
-                })
-                .unwrap_or_default();
-
-            let mut message_fingerprint = fingerprint(diagnostic, &location.path, 0);
-
-            // Make sure that we do not get a fingerprint that is already in use
-            // by adding in the previously generated one.
-            while fingerprints.contains(&message_fingerprint) {
-                message_fingerprint = fingerprint(diagnostic, &location.path, message_fingerprint);
-            }
-            fingerprints.insert(message_fingerprint);
-
-            let description = diagnostic.body();
-            let check_name = diagnostic.secondary_code_or_id();
-            let severity = match diagnostic.severity() {
-                Severity::Info => "info",
-                Severity::Warning => "minor",
-                Severity::Error => "major",
-                // Another option here is `blocker`
-                Severity::Fatal => "critical",
-            };
-
-            let value = Message {
-                check_name,
-                // GitLab doesn't display the separate `check_name` field in a Code Quality report,
-                // so prepend it to the description too.
-                description: format!("{check_name}: {description}"),
-                severity,
-                fingerprint: format!("{:x}", message_fingerprint),
-                location,
-            };
-
-            s.serialize_element(&value)?;
-        }
-
-        s.end()
-    }
-}
-
-#[derive(Serialize)]
-struct Message<'a> {
-    check_name: &'a str,
-    description: String,
-    severity: &'static str,
-    fingerprint: String,
-    location: Location,
-}
-
-/// The place in the source code where the issue was discovered.
-///
-/// According to the CodeClimate report format [specification] linked from the GitLab [docs], this
-/// field is required, so we fall back on a default `path` and position if the diagnostic doesn't
-/// have a primary span.
-///
-/// [specification]: https://github.com/codeclimate/platform/blob/master/spec/analyzers/SPEC.md#data-types
-/// [docs]: https://docs.gitlab.com/ci/testing/code_quality/#code-quality-report-format
-#[derive(Default, Serialize)]
-struct Location {
-    path: String,
-    positions: Positions,
-}
-
-#[derive(Default, Serialize)]
-struct Positions {
-    begin: LineColumn,
-    end: LineColumn,
-}
-
-/// Generate a unique fingerprint to identify a violation.
-fn fingerprint(diagnostic: &Diagnostic, project_path: &str, salt: u64) -> u64 {
-    let mut hasher = DefaultHasher::new();
-
-    salt.hash(&mut hasher);
-    diagnostic.name().hash(&mut hasher);
-    project_path.hash(&mut hasher);
-
-    hasher.finish()
-}
-
-/// Convert an absolute path to be relative to the specified project root.
-fn relativize_path_to<P: AsRef<Path>, R: AsRef<Path>>(path: P, project_root: R) -> String {
-    format!(
-        "{}",
-        pathdiff::diff_paths(&path, project_root)
-            .expect("Could not diff paths")
-            .display()
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::diagnostic::{
-        DiagnosticFormat,
-        render::tests::{create_diagnostics, create_syntax_error_diagnostics},
-    };
-
-    const FINGERPRINT_FILTERS: [(&str, &str); 1] = [(
-        r#""fingerprint": "[a-z0-9]+","#,
-        r#""fingerprint": "<redacted>","#,
-    )];
-
-    #[test]
-    fn output() {
-        let (env, diagnostics) = create_diagnostics(DiagnosticFormat::Gitlab);
-        insta::with_settings!({filters => FINGERPRINT_FILTERS}, {
-            insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
-        });
-    }
-
-    #[test]
-    fn syntax_errors() {
-        let (env, diagnostics) = create_syntax_error_diagnostics(DiagnosticFormat::Gitlab);
-        insta::with_settings!({filters => FINGERPRINT_FILTERS}, {
-            insta::assert_snapshot!(env.render_diagnostics(&diagnostics));
-        });
-    }
-}

crates/ruff_db/src/diagnostic/stylesheet.rs

@@ -43,10 +43,6 @@ pub struct DiagnosticStylesheet {
     pub(crate) none: Style,
     pub(crate) separator: Style,
     pub(crate) secondary_code: Style,
-    pub(crate) insertion: Style,
-    pub(crate) deletion: Style,
-    pub(crate) insertion_line_no: Style,
-    pub(crate) deletion_line_no: Style,
 }
 
 impl Default for DiagnosticStylesheet {
@@ -70,10 +66,6 @@ impl DiagnosticStylesheet {
             none: Style::new(),
             separator: AnsiColor::Cyan.on_default(),
             secondary_code: AnsiColor::Red.on_default().effects(Effects::BOLD),
-            insertion: AnsiColor::Green.on_default(),
-            deletion: AnsiColor::Red.on_default(),
-            insertion_line_no: AnsiColor::Green.on_default().effects(Effects::BOLD),
-            deletion_line_no: AnsiColor::Red.on_default().effects(Effects::BOLD),
         }
     }
 
@@ -89,10 +81,6 @@ impl DiagnosticStylesheet {
             none: Style::new(),
             separator: Style::new(),
             secondary_code: Style::new(),
-            insertion: Style::new(),
-            deletion: Style::new(),
-            insertion_line_no: Style::new(),
-            deletion_line_no: Style::new(),
         }
     }
 }

crates/ruff_db/src/lib.rs

@@ -1,8 +1,3 @@
-#![warn(
-    clippy::disallowed_methods,
-    reason = "Prefer System trait methods over std methods"
-)]
-
 use crate::files::Files;
 use crate::system::System;
 use crate::vendored::VendoredFileSystem;
@@ -70,10 +65,6 @@ pub trait Db: salsa::Database {
 /// to process work in parallel. For example, to index a directory or checking the files of a project.
 /// ty can still spawn more threads for other tasks, e.g. to wait for a Ctrl+C signal or
 /// watching the files for changes.
-#[expect(
-    clippy::disallowed_methods,
-    reason = "We don't have access to System here, but this is also only used by the CLI and the server which always run on a real system."
-)]
 pub fn max_parallelism() -> NonZeroUsize {
     std::env::var(EnvVars::TY_MAX_PARALLELISM)
         .or_else(|_| std::env::var(EnvVars::RAYON_NUM_THREADS))

crates/ruff_db/src/parsed.rs

@@ -92,14 +92,14 @@ impl ParsedModule {
         self.inner.store(None);
     }
 
-    /// Returns the pointer address of this [`ParsedModule`].
+    /// Returns a pointer for this [`ParsedModule`].
     ///
     /// The pointer uniquely identifies the module within the current Salsa revision,
     /// regardless of whether particular [`ParsedModuleRef`] instances are garbage collected.
-    pub fn addr(&self) -> usize {
+    pub fn as_ptr(&self) -> *const () {
         // Note that the outer `Arc` in `inner` is stable across garbage collection, while the inner
         // `Arc` within the `ArcSwap` may change.
-        Arc::as_ptr(&self.inner).addr()
+        Arc::as_ptr(&self.inner).cast()
     }
 }
 
@@ -202,13 +202,9 @@ mod indexed {
 
         /// Returns the node at the given index.
         pub fn get_by_index<'ast>(&'ast self, index: NodeIndex) -> AnyRootNodeRef<'ast> {
-            let index = index
-                .as_u32()
-                .expect("attempted to access uninitialized `NodeIndex`");
-
             // Note that this method restores the correct lifetime: the nodes are valid for as
             // long as the reference to `IndexedModule` is alive.
-            self.index[index as usize]
+            self.index[index.as_usize()]
         }
     }
 
@@ -224,7 +220,7 @@ mod indexed {
             T: HasNodeIndex + std::fmt::Debug,
             AnyRootNodeRef<'a>: From<&'a T>,
         {
-            node.node_index().set(NodeIndex::from(self.index));
+            node.node_index().set(self.index);
             self.nodes.push(AnyRootNodeRef::from(node));
             self.index += 1;
         }

crates/ruff_db/src/system.rs

@@ -46,7 +46,7 @@ pub type Result<T> = std::io::Result<T>;
 ///    * File watching isn't supported.
 ///
 /// Abstracting the system also enables tests to use a more efficient in-memory file system.
-pub trait System: Debug + Sync + Send {
+pub trait System: Debug {
     /// Reads the metadata of the file or directory at `path`.
     ///
     /// This function will traverse symbolic links to query information about the destination file.
@@ -197,8 +197,6 @@ pub trait System: Debug + Sync + Send {
     fn as_any(&self) -> &dyn std::any::Any;
 
     fn as_any_mut(&mut self) -> &mut dyn std::any::Any;
-
-    fn dyn_clone(&self) -> Box<dyn System>;
 }
 
 #[derive(Debug, Default, Copy, Clone, Eq, PartialEq)]

crates/ruff_db/src/system/os.rs

@@ -1,5 +1,3 @@
-#![allow(clippy::disallowed_methods)]
-
 use super::walk_directory::{
     self, DirectoryWalker, WalkDirectoryBuilder, WalkDirectoryConfiguration,
     WalkDirectoryVisitorBuilder, WalkState,
@@ -257,10 +255,6 @@ impl System for OsSystem {
     fn env_var(&self, name: &str) -> std::result::Result<String, std::env::VarError> {
         std::env::var(name)
     }
-
-    fn dyn_clone(&self) -> Box<dyn System> {
-        Box::new(self.clone())
-    }
 }
 
 impl OsSystem {

crates/ruff_db/src/system/test.rs

@@ -146,10 +146,6 @@ impl System for TestSystem {
     fn case_sensitivity(&self) -> CaseSensitivity {
         self.system().case_sensitivity()
     }
-
-    fn dyn_clone(&self) -> Box<dyn System> {
-        Box::new(self.clone())
-    }
 }
 
 impl Default for TestSystem {
@@ -398,13 +394,6 @@ impl System for InMemorySystem {
     fn case_sensitivity(&self) -> CaseSensitivity {
         CaseSensitivity::CaseSensitive
     }
-
-    fn dyn_clone(&self) -> Box<dyn System> {
-        Box::new(Self {
-            user_config_directory: Mutex::new(self.user_config_directory.lock().unwrap().clone()),
-            memory_fs: self.memory_fs.clone(),
-        })
-    }
 }
 
 impl WritableSystem for InMemorySystem {

crates/ruff_dev/Cargo.toml

@@ -13,7 +13,6 @@ license = { workspace = true }
 [dependencies]
 ty = { workspace = true }
 ty_project = { workspace = true, features = ["schemars"] }
-ty_python_semantic = { workspace = true }
 ty_static = { workspace = true }
 ruff = { workspace = true }
 ruff_formatter = { workspace = true }

crates/ruff_dev/src/generate_ty_rules.rs

@@ -52,7 +52,7 @@ pub(crate) fn main(args: &Args) -> Result<()> {
 }
 
 fn generate_markdown() -> String {
-    let registry = ty_python_semantic::default_lint_registry();
+    let registry = &*ty_project::DEFAULT_LINT_REGISTRY;
 
     let mut output = String::new();
 

crates/ruff_diagnostics/Cargo.toml

@@ -14,11 +14,8 @@ license = { workspace = true }
 doctest = false
 
 [dependencies]
-ruff_text_size = { workspace = true, features = ["get-size"] }
+ruff_text_size = { workspace = true }
 
 get-size2 = { workspace = true }
 is-macro = { workspace = true }
 serde = { workspace = true, optional = true, features = [] }
-
-[features]
-serde = ["dep:serde", "ruff_text_size/serde"]

crates/ruff_formatter/src/lib.rs

@@ -81,19 +81,14 @@ impl IndentStyle {
     pub const fn is_space(&self) -> bool {
         matches!(self, IndentStyle::Space)
     }
-
-    /// Returns the string representation of the indent style.
-    pub const fn as_str(&self) -> &'static str {
-        match self {
-            IndentStyle::Tab => "tab",
-            IndentStyle::Space => "space",
-        }
-    }
 }
 
 impl std::fmt::Display for IndentStyle {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(self.as_str())
+        match self {
+            IndentStyle::Tab => std::write!(f, "tab"),
+            IndentStyle::Space => std::write!(f, "space"),
+        }
     }
 }
 

crates/ruff_formatter/src/printer/printer_options/mod.rs

@@ -139,16 +139,4 @@ impl LineEnding {
             LineEnding::CarriageReturn => "\r",
         }
     }
-
-    /// Returns the string used to configure this line ending.
-    ///
-    /// See [`LineEnding::as_str`] for the actual string representation of the line ending.
-    #[inline]
-    pub const fn as_setting_str(&self) -> &'static str {
-        match self {
-            LineEnding::LineFeed => "lf",
-            LineEnding::CarriageReturnLineFeed => "crlf",
-            LineEnding::CarriageReturn => "cr",
-        }
-    }
 }

crates/ruff_linter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.12.12"
+version = "0.12.9"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -51,6 +51,7 @@ path-absolutize = { workspace = true, features = [
     "once_cell_cache",
     "use_unix_paths_on_wasm",
 ] }
+pathdiff = { workspace = true }
 pep440_rs = { workspace = true }
 pyproject-toml = { workspace = true }
 regex = { workspace = true }

crates/ruff_linter/resources/test/fixtures/airflow/AIR301_names.py

@@ -12,7 +12,6 @@ from airflow import (
 from airflow.api_connexion.security import requires_access
 from airflow.contrib.aws_athena_hook import AWSAthenaHook
 from airflow.datasets import DatasetAliasEvent
-from airflow.operators.postgres_operator import Mapping
 from airflow.operators.subdag import SubDagOperator
 from airflow.secrets.cache import SecretCache
 from airflow.secrets.local_filesystem import LocalFilesystemBackend
@@ -53,8 +52,6 @@ DatasetAliasEvent()
 # airflow.operators.subdag.*
 SubDagOperator()
 
-# airflow.operators.postgres_operator
-Mapping()
 
 # airflow.secrets
 # get_connection

crates/ruff_linter/resources/test/fixtures/airflow/AIR311_names.py

@@ -34,7 +34,7 @@ task_group()
 setup()
 from airflow.decorators import teardown
 from airflow.io.path import ObjectStoragePath
-from airflow.io.store import attach
+from airflow.io.storage import attach
 from airflow.models import DAG as DAGFromModel
 from airflow.models import (
     Connection,
@@ -70,40 +70,7 @@ from airflow.timetables.datasets import DatasetOrTimeSchedule
 from airflow.utils.dag_parsing_context import get_parsing_context
 
 # airflow.timetables.datasets
-DatasetOrTimeSchedule(datasets=[])
+DatasetOrTimeSchedule()
 
 # airflow.utils.dag_parsing_context
 get_parsing_context()
-
-from airflow.decorators.base import (
-    DecoratedMappedOperator,
-    DecoratedOperator,
-    TaskDecorator,
-    get_unique_task_id,
-    task_decorator_factory,
-)
-
-# airflow.decorators.base
-DecoratedMappedOperator()
-DecoratedOperator()
-TaskDecorator()
-get_unique_task_id()
-task_decorator_factory()
-
-
-from airflow.models import Param
-
-# airflow.models
-Param()
-
-
-from airflow.sensors.base import (
-    BaseSensorOperator,
-    PokeReturnValue,
-    poke_mode_only,
-)
-
-# airflow.sensors.base
-BaseSensorOperator()
-PokeReturnValue()
-poke_mode_only()

crates/ruff_linter/resources/test/fixtures/airflow/AIR312.py

@@ -9,6 +9,7 @@ from airflow.operators.empty import EmptyOperator
 from airflow.operators.latest_only import LatestOnlyOperator
 from airflow.operators.trigger_dagrun import TriggerDagRunOperator
 from airflow.operators.weekday import BranchDayOfWeekOperator
+from airflow.sensors.date_time import DateTimeSensor
 
 FSHook()
 PackageIndexHook()
@@ -21,6 +22,7 @@ EmptyOperator()
 
 LatestOnlyOperator()
 BranchDayOfWeekOperator()
+DateTimeSensor()
 
 from airflow.operators.python import (
     BranchPythonOperator,
@@ -28,23 +30,16 @@ from airflow.operators.python import (
     PythonVirtualenvOperator,
     ShortCircuitOperator,
 )
-from airflow.sensors.bash import BashSensor
-from airflow.sensors.date_time import DateTimeSensor
-
-BranchPythonOperator()
-PythonOperator()
-PythonVirtualenvOperator()
-ShortCircuitOperator()
-
-BashSensor()
-DateTimeSensor()
 from airflow.sensors.date_time import DateTimeSensorAsync
 from airflow.sensors.external_task import (
     ExternalTaskMarker,
     ExternalTaskSensor,
 )
+from airflow.sensors.time_sensor import (
+    TimeSensor,
+    TimeSensorAsync,
+)
 from airflow.sensors.filesystem import FileSensor
-from airflow.sensors.python import PythonSensor
 
 BranchPythonOperator()
 PythonOperator()
@@ -54,13 +49,6 @@ DateTimeSensorAsync()
 ExternalTaskMarker()
 ExternalTaskSensor()
 FileSensor()
-PythonSensor()
-
-from airflow.sensors.time_sensor import (
-    TimeSensor,
-    TimeSensorAsync,
-)
-
 TimeSensor()
 TimeSensorAsync()
 

crates/ruff_linter/resources/test/fixtures/fastapi/FAST003.py

@@ -213,17 +213,3 @@ async def get_id_pydantic_full(
 async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ...
 @app.get("/{my_id}")
 async def get_id_init_not_annotated(params = Depends(InitParams)): ...
-
-@app.get("/things/{ thing_id }")
-async def read_thing(query: str):
-    return {"query": query}
-
-
-@app.get("/things/{ thing_id : path }")
-async def read_thing(query: str):
-    return {"query": query}
-
-
-@app.get("/things/{ thing_id : str }")
-async def read_thing(query: str):
-    return {"query": query}

crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC212.py

@@ -1,75 +0,0 @@
-from typing import Optional
-
-import httpx
-
-
-def foo():
-    client = httpx.Client()
-    client.close()  # Ok
-    client.delete()  # Ok
-    client.get()  # Ok
-    client.head()  # Ok
-    client.options()  # Ok
-    client.patch()  # Ok
-    client.post()  # Ok
-    client.put()  # Ok
-    client.request()  # Ok
-    client.send()  # Ok
-    client.stream()  # Ok
-
-    client.anything()  # Ok
-    client.build_request()  # Ok
-    client.is_closed  # Ok
-
-
-async def foo():
-    client = httpx.Client()
-    client.close()  # ASYNC212
-    client.delete()  # ASYNC212
-    client.get()  # ASYNC212
-    client.head()  # ASYNC212
-    client.options()  # ASYNC212
-    client.patch()  # ASYNC212
-    client.post()  # ASYNC212
-    client.put()  # ASYNC212
-    client.request()  # ASYNC212
-    client.send()  # ASYNC212
-    client.stream()  # ASYNC212
-
-    client.anything()  # Ok
-    client.build_request()  # Ok
-    client.is_closed  # Ok
-
-
-async def foo(client: httpx.Client):
-    client.request()  # ASYNC212
-    client.anything()  # Ok
-
-
-async def foo(client: httpx.Client | None):
-    client.request()  # ASYNC212
-    client.anything()  # Ok
-
-
-async def foo(client: Optional[httpx.Client]):
-    client.request()  # ASYNC212
-    client.anything()  # Ok
-
-
-async def foo():
-    client: httpx.Client = ...
-    client.request()  # ASYNC212
-    client.anything()  # Ok
-
-
-global_client = httpx.Client()
-
-
-async def foo():
-    global_client.request()  # ASYNC212
-    global_client.anything()  # Ok
-
-
-async def foo():
-    async with httpx.AsyncClient() as client:
-        await client.get()  # Ok

crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC250.py

@@ -1,22 +0,0 @@
-def foo():
-    k = input()  # Ok
-    input("hello world")  # Ok
-
-
-async def foo():
-    k = input()  # ASYNC250
-    input("hello world")  # ASYNC250
-
-
-import builtins
-
-import fake
-
-
-def foo():
-    builtins.input("testing")  # Ok
-
-
-async def foo():
-    builtins.input("testing")  # ASYNC250
-    fake.input("whatever")  # Ok

crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C417.py

@@ -75,7 +75,3 @@ list(map(lambda x, y: x, [(1, 2), (3, 4)]))
 _ = t"{set(map(lambda x: x % 2 == 0, nums))}"
 _ = t"{dict(map(lambda v: (v, v**2), nums))}"
 
-
-# See https://github.com/astral-sh/ruff/issues/20198
-# No error: lambda contains `yield`, so map() should not be rewritten
-map(lambda x: (yield x), [1, 2, 3])

crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004.py

@@ -17,50 +17,3 @@ info(f"{__name__}")
 # Don't trigger for t-strings
 info(t"{name}")
 info(t"{__name__}")
-
-count = 5
-total = 9
-directory_path = "/home/hamir/ruff/crates/ruff_linter/resources/test/"
-logging.info(f"{count} out of {total} files in {directory_path} checked")
-
-
-
-x = 99
-fmt = "08d"
-logger.info(f"{x:{'08d'}}")
-logger.info(f"{x:>10} {x:{fmt}}")
-
-logging.info(f"")
-logging.info(f"This message doesn't have any variables.")
-
-obj = {"key": "value"}
-logging.info(f"Object: {obj!r}")
-
-items_count = 3
-logging.warning(f"Items: {items_count:d}")
-
-data = {"status": "active"}
-logging.info(f"Processing {len(data)} items")
-logging.info(f"Status: {data.get('status', 'unknown').upper()}")
-
-
-result = 123
-logging.info(f"Calculated result: {result + 100}")
-
-temperature = 123
-logging.info(f"Temperature: {temperature:.1f}°C")
-
-class FilePath:
-    def __init__(self, name: str):
-        self.name = name
-
-logging.info(f"No changes made to {file_path.name}.")
-
-user = "tron"
-balance = 123.45
-logging.error(f"Error {404}: User {user} has insufficient balance ${balance:.2f}")
-
-import logging
-
-x = 1
-logging.error(f"{x} -> %s", x)

crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004_arg_order.py

@@ -1,10 +0,0 @@
-"""Test f-string argument order."""
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-X = 1
-Y = 2
-logger.error(f"{X} -> %s", Y)
-logger.error(f"{Y} -> %s", X)

crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT015.py

@@ -23,11 +23,3 @@ def test_error():
     assert list([])
     assert set(set())
     assert tuple("")
-
-# https://github.com/astral-sh/ruff/issues/19935
-def test_all_ok():
-    assert f"{b""}"
-    assert f"{""=}"
-    assert f"{""!a}"
-    assert f"{""!r}"
-    assert f"{"":1}"

crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM905.py

@@ -166,7 +166,3 @@ r"""first
 print("S\x1cP\x1dL\x1eI\x1fT".split())
 print("\x1c\x1d\x1e\x1f>".split(maxsplit=0))
 print("<\x1c\x1d\x1e\x1f".rsplit(maxsplit=0))
-
-# leading/trailing whitespace should not count towards maxsplit
-" a b c d ".split(maxsplit=2)  # ["a", "b", "c d "]
-" a b c d ".rsplit(maxsplit=2)  # [" a b", "c", "d"]

crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH211.py

@@ -13,11 +13,3 @@ Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True)  # Ok
 fd = os.open(".", os.O_RDONLY)
 os.symlink("source.txt", "link.txt", dir_fd=fd)  # Ok: dir_fd is not supported by pathlib
 os.close(fd)
-
-os.symlink(src="usr/bin/python", dst="tmp/python", unknown=True)
-os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory=False)
-
-os.symlink(src="usr/bin/python", dst="tmp/python", dir_fd=None)
-
-os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory=     True    )
-os.symlink("usr/bin/python",  dst="tmp/python", target_is_directory="nonboolean")

crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/full_name.py

@@ -106,22 +106,4 @@ os.replace("src", "dst", src_dir_fd=1)
 os.replace("src", "dst", dst_dir_fd=2)
 
 os.getcwd()
-os.getcwdb()
-
-os.mkdir(path="directory")
-
-os.mkdir(
-    # comment 1
-    "directory",
-    mode=0o777
-)
-
-os.mkdir("directory", mode=0o777, dir_fd=1)
-
-os.makedirs("name", 0o777, exist_ok=False)
-
-os.makedirs("name", 0o777, False)
-
-os.makedirs(name="name", mode=0o777, exist_ok=False)
-
-os.makedirs("name", unknown_kwarg=True)
+os.getcwdb()

crates/ruff_linter/resources/test/fixtures/isort/required_imports/docstring_with_multiple_continuations.py

@@ -1,4 +0,0 @@
-"""Hello, world!"""\
-\
-
-x = 1; y = 2

crates/ruff_linter/resources/test/fixtures/perflint/PERF403.py

@@ -192,24 +192,3 @@ def issue_19005_3():
     c = {}
     for a[0], a[1] in ():
         c[a[0]] = a[1]
-
-
-def issue_19153_1():
-    v = {}
-    for o, (x,) in ["ox"]:
-        v[x,] = o
-    return v
-
-
-def issue_19153_2():
-    v = {}
-    for (o, p), x in [("op", "x")]:
-        v[x] = o, p
-    return v
-
-
-def issue_19153_3():
-    v = {}
-    for o, (x,) in ["ox"]: 
-        v[(x,)] = o 
-    return v

crates/ruff_linter/resources/test/fixtures/pycodestyle/E731.py

@@ -190,12 +190,3 @@ foo_tooltip = (
     more
 
 )
-
-# https://github.com/astral-sh/ruff/issues/20097
-def scope():
-    from collections.abc import Callable
-    from typing import ParamSpec
-
-    P = ParamSpec("P")
-    f1: Callable[P, str] = lambda x: str(x)
-    f2: Callable[..., str] = lambda x: str(x)

crates/ruff_linter/resources/test/fixtures/pyflakes/F401_35.py

@@ -1,16 +0,0 @@
-"""
-Test: allowed-unused-imports-top-level-module
-"""
-
-# No errors
-
-def f():
-    import hvplot
-def f():
-    import hvplot.pandas
-def f():
-    import hvplot.pandas.plots
-def f():
-    from hvplot.pandas import scatter_matrix
-def f():
-    from hvplot.pandas.plots import scatter_matrix

crates/ruff_linter/resources/test/fixtures/pyflakes/F841_0.py

@@ -151,39 +151,3 @@ def f():
         pass
     except Exception as _:
         pass
-
-
-# OK, `__class__` in this case is not the special `__class__` cell, so we don't
-# emit a diagnostic. (It has its own special semantics -- see
-# https://github.com/astral-sh/ruff/pull/20048#discussion_r2298338048 -- but
-# those aren't relevant here.)
-class A:
-    __class__ = 1
-
-
-# The following three cases are flagged because they declare local `__class__`
-# variables that don't refer to the special `__class__` cell.
-class A:
-    def set_class(self, cls):
-        __class__ = cls  # F841
-
-
-class A:
-    class B:
-        def set_class(self, cls):
-            __class__ = cls  # F841
-
-
-class A:
-    def foo():
-        class B:
-            print(__class__)
-            def set_class(self, cls):
-                __class__ = cls  # F841
-
-
-# OK, the `__class__` cell is nonlocal and declared as such.
-class NonlocalDunderClass:
-    def foo():
-        nonlocal __class__
-        __class__ = 1

crates/ruff_linter/resources/test/fixtures/pylint/bidirectional_unicode.py

@@ -4,9 +4,6 @@ print("שלום‬")
 # E2502
 example = "x‏" * 100  #    "‏x" is assigned
 
-# E2502
-another = "x؜" * 50  #    "؜x" is assigned
-
 # E2502
 if access_level != "none‮⁦":  # Check if admin ⁩⁦' and access_level != 'user
     print("You are an admin.")

crates/ruff_linter/resources/test/fixtures/pylint/nonlocal_without_binding.py

@@ -44,8 +44,3 @@ def f():
     def g():
         nonlocal x
         x = 2
-
-# OK
-class A:
-    def method(self):
-        nonlocal __class__

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP008.py

@@ -141,133 +141,3 @@ class ExampleWithKeywords:
     
     def method3(self):
         super(ExampleWithKeywords, self).some_method()  # Should be fixed - no keywords
-
-# See: https://github.com/astral-sh/ruff/issues/19357
-# Must be detected
-class ParentD:
-    def f(self):
-        print("D")
-
-class ChildD1(ParentD):
-    def f(self):
-        if False: __class__ # Python injects __class__ into scope
-        builtins.super(ChildD1, self).f()
-
-class ChildD2(ParentD):
-    def f(self):
-        if False: super # Python injects __class__ into scope
-        builtins.super(ChildD2, self).f()
-
-class ChildD3(ParentD):
-    def f(self):
-        builtins.super(ChildD3, self).f()
-        super # Python injects __class__ into scope
-
-import builtins as builtins_alias
-class ChildD4(ParentD):
-    def f(self):
-        builtins_alias.super(ChildD4, self).f()
-        super # Python injects __class__ into scope
-
-class ChildD5(ParentD):
-    def f(self):
-        super = 1
-        super # Python injects __class__ into scope
-        builtins.super(ChildD5, self).f()
-
-class ChildD6(ParentD):
-    def f(self):
-        super: "Any"
-        __class__ # Python injects __class__ into scope
-        builtins.super(ChildD6, self).f()
-
-class ChildD7(ParentD):
-    def f(self):
-        def x():
-            __class__ # Python injects __class__ into scope
-        builtins.super(ChildD7, self).f()
-
-class ChildD8(ParentD):
-    def f(self):
-        def x():
-            super = 1
-        super # Python injects __class__ into scope
-        builtins.super(ChildD8, self).f()
-
-class ChildD9(ParentD):
-    def f(self):
-        def x():
-            __class__ = 1
-        __class__ # Python injects __class__ into scope
-        builtins.super(ChildD9, self).f()
-
-class ChildD10(ParentD):
-    def f(self):
-        def x():
-            __class__ = 1
-        super # Python injects __class__ into scope
-        builtins.super(ChildD10, self).f()
-
-
-# Must be ignored
-class ParentI:
-    def f(self):
-        print("I")
-
-class ChildI1(ParentI):
-    def f(self):
-        builtins.super(ChildI1, self).f() # no __class__ in the local scope
-
-
-class ChildI2(ParentI):
-    def b(self):
-        x = __class__
-        if False: super
-
-    def f(self):
-        self.b()
-        builtins.super(ChildI2, self).f() # no __class__ in the local scope
-
-class ChildI3(ParentI):
-    def f(self):
-        if False: super
-        def x(_):
-            builtins.super(ChildI3, self).f() # no __class__ in the local scope
-        x(None)
-
-class ChildI4(ParentI):
-    def f(self):
-        super: "str"
-        builtins.super(ChildI4, self).f() # no __class__ in the local scope
-
-class ChildI5(ParentI):
-    def f(self):
-        super = 1
-        __class__ = 3
-        builtins.super(ChildI5, self).f() # no __class__ in the local scope
-
-class ChildI6(ParentI):
-    def f(self):
-        __class__ = None
-        __class__
-        builtins.super(ChildI6, self).f() # no __class__ in the local scope
-
-class ChildI7(ParentI):
-    def f(self):
-        __class__ = None
-        super
-        builtins.super(ChildI7, self).f()
-
-class ChildI8(ParentI):
-    def f(self):
-        __class__: "Any"
-        super
-        builtins.super(ChildI8, self).f()
-
-class ChildI9(ParentI):
-    def f(self):
-        class A:
-            def foo(self):
-                if False: super
-                if False: __class__
-        builtins.super(ChildI9, self).f()

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP010_1.py

@@ -1,18 +0,0 @@
-from __future__ import nested_scopes, generators
-from __future__ import with_statement, unicode_literals
-
-from __future__ import absolute_import, division
-from __future__ import generator_stop
-from __future__ import print_function, nested_scopes, generator_stop
-
-print(with_statement)
-generators = 1
-
-
-class Foo():
-
-    def boo(self):
-        print(division)
-
-
-__all__ = ["print_function", "generator_stop"]

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP043.pyi

@@ -1,59 +0,0 @@
-from collections.abc import Generator, AsyncGenerator
-
-
-def func() -> Generator[int, None, None]:
-    yield 42
-
-
-def func() -> Generator[int, None]:
-    yield 42
-
-
-def func() -> Generator[int]:
-    yield 42
-
-
-def func() -> Generator[int, int, int]:
-    foo = yield 42
-    return foo
-
-
-def func() -> Generator[int, int, None]:
-    _ = yield 42
-    return None
-
-
-def func() -> Generator[int, None, int]:
-    yield 42
-    return 42
-
-
-async def func() -> AsyncGenerator[int, None]:
-    yield 42
-
-
-async def func() -> AsyncGenerator[int]:
-    yield 42
-
-
-async def func() -> AsyncGenerator[int, int]:
-    foo = yield 42
-    return foo
-
-
-from typing import Generator, AsyncGenerator
-
-
-def func() -> Generator[str, None, None]:
-    yield "hello"
-
-
-async def func() -> AsyncGenerator[str, None]:
-    yield "hello"
-
-
-async def func() -> AsyncGenerator[  # type: ignore
-    str,
-    None
-]:
-    yield "hello"

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP045.py

@@ -69,10 +69,3 @@ a7: OptionalTE[typing.NamedTuple] = None
 a8: typing_extensions.Optional[typing.NamedTuple] = None
 a9: "Optional[NamedTuple]" = None
 a10: Optional[NamedTupleTE] = None
-
-
-# Test for: https://github.com/astral-sh/ruff/issues/19746
-# Nested Optional types should be flattened
-nested_optional: Optional[Optional[str]] = None
-nested_optional_typing: typing.Optional[Optional[int]] = None
-triple_nested_optional: Optional[Optional[Optional[str]]] = None

crates/ruff_linter/resources/test/fixtures/ruff/RUF026.py

@@ -118,10 +118,3 @@ def func():
         return lambda: value
 
     defaultdict(constant_factory("<missing>"))
-
-def func():
-    defaultdict(default_factory=t"")  # OK
-
-
-def func():
-    defaultdict(default_factory=t"hello")  # OK

crates/ruff_linter/resources/test/fixtures/ruff/RUF033.py

@@ -124,19 +124,3 @@ def fun_with_python_syntax():
             ...
 
     return Foo
-
-
-@dataclass
-class C:
-    def __post_init__(self, x: tuple[int, ...] = (
-        1,
-        2,
-    )) -> None:
-        self.x = x
-
-
-@dataclass
-class D:
-    def __post_init__(self, x: int = """
-    """) -> None:
-        self.x = x

crates/ruff_linter/resources/test/fixtures/ruff/RUF037.py

@@ -102,17 +102,3 @@ deque("abc") # OK
 deque(b"abc") # OK
 deque(f"" "a")  # OK
 deque(f"{x}" "")  # OK
-
-# https://github.com/astral-sh/ruff/issues/19951
-deque(t"")
-deque(t""  t"")
-deque(t"{""}") # OK
-
-# https://github.com/astral-sh/ruff/issues/20050
-deque(f"{""}")  # RUF037
-
-deque(f"{b""}")
-deque(f"{""=}")
-deque(f"{""!a}")
-deque(f"{""!r}")
-deque(f"{"":1}")

crates/ruff_linter/resources/test/fixtures/ruff/RUF060.py

@@ -42,7 +42,3 @@ b"a" in bytes("a", "utf-8")
 1 in set(set([1]))
 '' in {""}
 frozenset() in {frozenset()}
-
-# https://github.com/astral-sh/ruff/issues/20238
-"b" in f"" "" # Error
-"b" in f"" "x" # OK

crates/ruff_linter/resources/test/fixtures/syntax_errors/yield_from_in_async_function.py

@@ -1 +0,0 @@
-async def f(): yield from x # error

crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs

@@ -1,11 +1,10 @@
-use ruff_python_ast::PythonVersion;
 use ruff_python_semantic::{Binding, ScopeKind};
 
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
 use crate::rules::{
     flake8_builtins, flake8_pyi, flake8_type_checking, flake8_unused_arguments, pep8_naming,
-    pyflakes, pylint, pyupgrade, ruff,
+    pyflakes, pylint, ruff,
 };
 
 /// Run lint rules over all deferred scopes in the [`SemanticModel`].
@@ -46,7 +45,6 @@ pub(crate) fn deferred_scopes(checker: &Checker) {
         Rule::UnusedStaticMethodArgument,
         Rule::UnusedUnpackedVariable,
         Rule::UnusedVariable,
-        Rule::UnnecessaryFutureImport,
     ]) {
         return;
     }
@@ -226,11 +224,6 @@ pub(crate) fn deferred_scopes(checker: &Checker) {
             if checker.is_rule_enabled(Rule::UnusedImport) {
                 pyflakes::rules::unused_import(checker, scope);
             }
-            if checker.is_rule_enabled(Rule::UnnecessaryFutureImport) {
-                if checker.target_version() >= PythonVersion::PY37 {
-                    pyupgrade::rules::unnecessary_future_import(checker, scope);
-                }
-            }
 
             if checker.is_rule_enabled(Rule::ImportPrivateName) {
                 pylint::rules::import_private_name(checker, scope);

crates/ruff_linter/src/checkers/ast/analyze/expression.rs

@@ -8,7 +8,7 @@ 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_assert_raises_exception_call_enabled, is_optional_as_none_in_union_enabled,
 };
 use crate::registry::Rule;
 use crate::rules::{
@@ -142,10 +142,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             }
 
             if checker.is_rule_enabled(Rule::UnnecessaryDefaultTypeArgs) {
-                if checker.target_version() >= PythonVersion::PY313
-                    || is_unnecessary_default_type_args_stubs_enabled(checker.settings())
-                        && checker.semantic().in_stub_file()
-                {
+                if checker.target_version() >= PythonVersion::PY313 {
                     pyupgrade::rules::unnecessary_default_type_args(checker, expr);
                 }
             }
@@ -663,9 +660,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             if checker.is_rule_enabled(Rule::BlockingHttpCallInAsyncFunction) {
                 flake8_async::rules::blocking_http_call(checker, call);
             }
-            if checker.is_rule_enabled(Rule::BlockingHttpCallHttpxInAsyncFunction) {
-                flake8_async::rules::blocking_http_call_httpx(checker, call);
-            }
             if checker.is_rule_enabled(Rule::BlockingOpenCallInAsyncFunction) {
                 flake8_async::rules::blocking_open_call(checker, call);
             }
@@ -676,9 +670,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             ]) {
                 flake8_async::rules::blocking_process_invocation(checker, call);
             }
-            if checker.is_rule_enabled(Rule::BlockingInputInAsyncFunction) {
-                flake8_async::rules::blocking_input(checker, call);
-            }
             if checker.is_rule_enabled(Rule::BlockingSleepInAsyncFunction) {
                 flake8_async::rules::blocking_sleep(checker, call);
             }
@@ -1048,6 +1039,8 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 flake8_simplify::rules::zip_dict_keys_and_values(checker, call);
             }
             if checker.any_rule_enabled(&[
+                Rule::OsMkdir,
+                Rule::OsMakedirs,
                 Rule::OsStat,
                 Rule::OsPathJoin,
                 Rule::OsPathSplitext,
@@ -1055,6 +1048,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 Rule::PyPath,
                 Rule::Glob,
                 Rule::OsListdir,
+                Rule::OsSymlink,
             ]) {
                 flake8_use_pathlib::rules::replaceable_by_pathlib(checker, call);
             }
@@ -1126,15 +1120,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 if checker.is_rule_enabled(Rule::OsPathSamefile) {
                     flake8_use_pathlib::rules::os_path_samefile(checker, call, segments);
                 }
-                if checker.is_rule_enabled(Rule::OsMkdir) {
-                    flake8_use_pathlib::rules::os_mkdir(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsMakedirs) {
-                    flake8_use_pathlib::rules::os_makedirs(checker, call, segments);
-                }
-                if checker.is_rule_enabled(Rule::OsSymlink) {
-                    flake8_use_pathlib::rules::os_symlink(checker, call, segments);
-                }
                 if checker.is_rule_enabled(Rule::PathConstructorCurrentDirectory) {
                     flake8_use_pathlib::rules::path_constructor_current_directory(
                         checker, call, segments,
@@ -1295,7 +1280,9 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             if checker.is_rule_enabled(Rule::NonOctalPermissions) {
                 ruff::rules::non_octal_permissions(checker, call);
             }
-            if checker.is_rule_enabled(Rule::AssertRaisesException) {
+            if checker.is_rule_enabled(Rule::AssertRaisesException)
+                && is_assert_raises_exception_call_enabled(checker.settings())
+            {
                 flake8_bugbear::rules::assert_raises_exception_call(checker, call);
             }
         }
@@ -1320,10 +1307,13 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 pylint::rules::yield_in_init(checker, expr);
             }
         }
-        Expr::YieldFrom(_) => {
+        Expr::YieldFrom(yield_from) => {
             if checker.is_rule_enabled(Rule::YieldInInit) {
                 pylint::rules::yield_in_init(checker, expr);
             }
+            if checker.is_rule_enabled(Rule::YieldFromInAsyncFunction) {
+                pylint::rules::yield_from_in_async_function(checker, yield_from);
+            }
         }
         Expr::FString(f_string_expr @ ast::ExprFString { value, .. }) => {
             if checker.is_rule_enabled(Rule::FStringMissingPlaceholders) {

crates/ruff_linter/src/checkers/ast/analyze/statement.rs

@@ -728,6 +728,13 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     pylint::rules::non_ascii_module_import(checker, alias);
                 }
             }
+            if checker.is_rule_enabled(Rule::UnnecessaryFutureImport) {
+                if checker.target_version() >= PythonVersion::PY37 {
+                    if let Some("__future__") = module {
+                        pyupgrade::rules::unnecessary_future_import(checker, stmt, names);
+                    }
+                }
+            }
             if checker.is_rule_enabled(Rule::DeprecatedMockImport) {
                 pyupgrade::rules::deprecated_mock_import(checker, stmt);
             }

crates/ruff_linter/src/checkers/ast/mod.rs

@@ -71,9 +71,7 @@ use crate::registry::Rule;
 use crate::rules::pyflakes::rules::{
     LateFutureImport, ReturnOutsideFunction, YieldOutsideFunction,
 };
-use crate::rules::pylint::rules::{
-    AwaitOutsideAsync, LoadBeforeGlobalDeclaration, YieldFromInAsyncFunction,
-};
+use crate::rules::pylint::rules::{AwaitOutsideAsync, LoadBeforeGlobalDeclaration};
 use crate::rules::{flake8_pyi, flake8_type_checking, pyflakes, pyupgrade};
 use crate::settings::rule_table::RuleTable;
 use crate::settings::{LinterSettings, TargetVersion, flags};
@@ -670,12 +668,6 @@ impl SemanticSyntaxContext for Checker<'_> {
                     self.report_diagnostic(AwaitOutsideAsync, error.range);
                 }
             }
-            SemanticSyntaxErrorKind::YieldFromInAsyncFunction => {
-                // PLE1700
-                if self.is_rule_enabled(Rule::YieldFromInAsyncFunction) {
-                    self.report_diagnostic(YieldFromInAsyncFunction, error.range);
-                }
-            }
             SemanticSyntaxErrorKind::ReboundComprehensionVariable
             | SemanticSyntaxErrorKind::DuplicateTypeParameter
             | SemanticSyntaxErrorKind::MultipleCaseAssignment(_)
@@ -711,10 +703,7 @@ impl SemanticSyntaxContext for Checker<'_> {
             match scope.kind {
                 ScopeKind::Class(_) | ScopeKind::Lambda(_) => return false,
                 ScopeKind::Function(ast::StmtFunctionDef { is_async, .. }) => return *is_async,
-                ScopeKind::Generator { .. }
-                | ScopeKind::Module
-                | ScopeKind::Type
-                | ScopeKind::DunderClassCell => {}
+                ScopeKind::Generator { .. } | ScopeKind::Module | ScopeKind::Type => {}
             }
         }
         false
@@ -725,10 +714,7 @@ impl SemanticSyntaxContext for Checker<'_> {
             match scope.kind {
                 ScopeKind::Class(_) => return false,
                 ScopeKind::Function(_) | ScopeKind::Lambda(_) => return true,
-                ScopeKind::Generator { .. }
-                | ScopeKind::Module
-                | ScopeKind::Type
-                | ScopeKind::DunderClassCell => {}
+                ScopeKind::Generator { .. } | ScopeKind::Module | ScopeKind::Type => {}
             }
         }
         false
@@ -739,7 +725,7 @@ impl SemanticSyntaxContext for Checker<'_> {
             match scope.kind {
                 ScopeKind::Class(_) | ScopeKind::Generator { .. } => return false,
                 ScopeKind::Function(_) | ScopeKind::Lambda(_) => return true,
-                ScopeKind::Module | ScopeKind::Type | ScopeKind::DunderClassCell => {}
+                ScopeKind::Module | ScopeKind::Type => {}
             }
         }
         false
@@ -1106,24 +1092,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                     }
                 }
 
-                // Here we add the implicit scope surrounding a method which allows code in the
-                // method to access `__class__` at runtime. See the `ScopeKind::DunderClassCell`
-                // docs for more information.
-                let added_dunder_class_scope = if self.semantic.current_scope().kind.is_class() {
-                    self.semantic.push_scope(ScopeKind::DunderClassCell);
-                    let binding_id = self.semantic.push_binding(
-                        TextRange::default(),
-                        BindingKind::DunderClassCell,
-                        BindingFlags::empty(),
-                    );
-                    self.semantic
-                        .current_scope_mut()
-                        .add("__class__", binding_id);
-                    true
-                } else {
-                    false
-                };
-
                 self.semantic.push_scope(ScopeKind::Type);
 
                 if let Some(type_params) = type_params {
@@ -1187,9 +1155,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 self.semantic.pop_scope(); // Function scope
                 self.semantic.pop_definition();
                 self.semantic.pop_scope(); // Type parameter scope
-                if added_dunder_class_scope {
-                    self.semantic.pop_scope(); // `__class__` cell closure scope
-                }
                 self.add_binding(
                     name,
                     stmt.identifier(),

crates/ruff_linter/src/codes.rs

@@ -334,14 +334,12 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Async, "109") => (RuleGroup::Stable, rules::flake8_async::rules::AsyncFunctionWithTimeout),
         (Flake8Async, "110") => (RuleGroup::Stable, rules::flake8_async::rules::AsyncBusyWait),
         (Flake8Async, "115") => (RuleGroup::Stable, rules::flake8_async::rules::AsyncZeroSleep),
-        (Flake8Async, "116") => (RuleGroup::Stable, rules::flake8_async::rules::LongSleepNotForever),
+        (Flake8Async, "116") => (RuleGroup::Preview, rules::flake8_async::rules::LongSleepNotForever),
         (Flake8Async, "210") => (RuleGroup::Stable, rules::flake8_async::rules::BlockingHttpCallInAsyncFunction),
-        (Flake8Async, "212") => (RuleGroup::Preview, rules::flake8_async::rules::BlockingHttpCallHttpxInAsyncFunction),
         (Flake8Async, "220") => (RuleGroup::Stable, rules::flake8_async::rules::CreateSubprocessInAsyncFunction),
         (Flake8Async, "221") => (RuleGroup::Stable, rules::flake8_async::rules::RunProcessInAsyncFunction),
         (Flake8Async, "222") => (RuleGroup::Stable, rules::flake8_async::rules::WaitForProcessInAsyncFunction),
         (Flake8Async, "230") => (RuleGroup::Stable, rules::flake8_async::rules::BlockingOpenCallInAsyncFunction),
-        (Flake8Async, "250") => (RuleGroup::Preview, rules::flake8_async::rules::BlockingInputInAsyncFunction),
         (Flake8Async, "251") => (RuleGroup::Stable, rules::flake8_async::rules::BlockingSleepInAsyncFunction),
 
         // flake8-builtins
@@ -563,7 +561,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pyupgrade, "035") => (RuleGroup::Stable, rules::pyupgrade::rules::DeprecatedImport),
         (Pyupgrade, "036") => (RuleGroup::Stable, rules::pyupgrade::rules::OutdatedVersionBlock),
         (Pyupgrade, "037") => (RuleGroup::Stable, rules::pyupgrade::rules::QuotedAnnotation),
-        (Pyupgrade, "038") => (RuleGroup::Removed, rules::pyupgrade::rules::NonPEP604Isinstance),
+        (Pyupgrade, "038") => (RuleGroup::Deprecated, rules::pyupgrade::rules::NonPEP604Isinstance),
         (Pyupgrade, "039") => (RuleGroup::Stable, rules::pyupgrade::rules::UnnecessaryClassParentheses),
         (Pyupgrade, "040") => (RuleGroup::Stable, rules::pyupgrade::rules::NonPEP695TypeAlias),
         (Pyupgrade, "041") => (RuleGroup::Stable, rules::pyupgrade::rules::TimeoutErrorAlias),
@@ -574,7 +572,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pyupgrade, "046") => (RuleGroup::Stable, rules::pyupgrade::rules::NonPEP695GenericClass),
         (Pyupgrade, "047") => (RuleGroup::Stable, rules::pyupgrade::rules::NonPEP695GenericFunction),
         (Pyupgrade, "049") => (RuleGroup::Stable, rules::pyupgrade::rules::PrivateTypeParameter),
-        (Pyupgrade, "050") => (RuleGroup::Stable, rules::pyupgrade::rules::UselessClassMetaclassType),
+        (Pyupgrade, "050") => (RuleGroup::Preview, rules::pyupgrade::rules::UselessClassMetaclassType),
 
         // pydocstyle
         (Pydocstyle, "100") => (RuleGroup::Stable, rules::pydocstyle::rules::UndocumentedPublicModule),
@@ -773,7 +771,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (PandasVet, "013") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasUseOfDotStack),
         (PandasVet, "015") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasUseOfPdMerge),
         (PandasVet, "101") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasNuniqueConstantSeriesCheck),
-        (PandasVet, "901") => (RuleGroup::Removed, rules::pandas_vet::rules::PandasDfVariableName),
+        (PandasVet, "901") => (RuleGroup::Deprecated, rules::pandas_vet::rules::PandasDfVariableName),
 
         // flake8-errmsg
         (Flake8ErrMsg, "101") => (RuleGroup::Stable, rules::flake8_errmsg::rules::RawStringInException),
@@ -830,8 +828,8 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Pyi, "056") => (RuleGroup::Stable, rules::flake8_pyi::rules::UnsupportedMethodCallOnAll),
         (Flake8Pyi, "058") => (RuleGroup::Stable, rules::flake8_pyi::rules::GeneratorReturnFromIterMethod),
         (Flake8Pyi, "057") => (RuleGroup::Stable, rules::flake8_pyi::rules::ByteStringUsage),
-        (Flake8Pyi, "059") => (RuleGroup::Stable, rules::flake8_pyi::rules::GenericNotLastBaseClass),
-        (Flake8Pyi, "061") => (RuleGroup::Stable, rules::flake8_pyi::rules::RedundantNoneLiteral),
+        (Flake8Pyi, "059") => (RuleGroup::Preview, rules::flake8_pyi::rules::GenericNotLastBaseClass),
+        (Flake8Pyi, "061") => (RuleGroup::Preview, rules::flake8_pyi::rules::RedundantNoneLiteral),
         (Flake8Pyi, "062") => (RuleGroup::Stable, rules::flake8_pyi::rules::DuplicateLiteralMember),
         (Flake8Pyi, "063") => (RuleGroup::Stable, rules::flake8_pyi::rules::Pep484StylePositionalOnlyParameter),
         (Flake8Pyi, "064") => (RuleGroup::Stable, rules::flake8_pyi::rules::RedundantFinalLiteral),
@@ -923,8 +921,8 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         // flake8-use-pathlib
         (Flake8UsePathlib, "100") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsPathAbspath),
         (Flake8UsePathlib, "101") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsChmod),
-        (Flake8UsePathlib, "102") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsMkdir),
-        (Flake8UsePathlib, "103") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsMakedirs),
+        (Flake8UsePathlib, "102") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsMkdir),
+        (Flake8UsePathlib, "103") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsMakedirs),
         (Flake8UsePathlib, "104") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsRename),
         (Flake8UsePathlib, "105") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsReplace),
         (Flake8UsePathlib, "106") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsRmdir),
@@ -956,7 +954,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8UsePathlib, "207") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::Glob),
         (Flake8UsePathlib, "208") => (RuleGroup::Stable, rules::flake8_use_pathlib::violations::OsListdir),
         (Flake8UsePathlib, "210") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::InvalidPathlibWithSuffix),
-        (Flake8UsePathlib, "211") => (RuleGroup::Stable, rules::flake8_use_pathlib::rules::OsSymlink),
+        (Flake8UsePathlib, "211") => (RuleGroup::Preview, rules::flake8_use_pathlib::violations::OsSymlink),
 
         // flake8-logging-format
         (Flake8LoggingFormat, "001") => (RuleGroup::Stable, rules::flake8_logging_format::violations::LoggingStringFormat),
@@ -1032,7 +1030,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Ruff, "039") => (RuleGroup::Preview, rules::ruff::rules::UnrawRePattern),
         (Ruff, "040") => (RuleGroup::Stable, rules::ruff::rules::InvalidAssertMessageLiteralArgument),
         (Ruff, "041") => (RuleGroup::Stable, rules::ruff::rules::UnnecessaryNestedLiteral),
-        (Ruff, "043") => (RuleGroup::Stable, rules::ruff::rules::PytestRaisesAmbiguousPattern),
+        (Ruff, "043") => (RuleGroup::Preview, rules::ruff::rules::PytestRaisesAmbiguousPattern),
         (Ruff, "045") => (RuleGroup::Preview, rules::ruff::rules::ImplicitClassVarInDataclass),
         (Ruff, "046") => (RuleGroup::Stable, rules::ruff::rules::UnnecessaryCastToInt),
         (Ruff, "047") => (RuleGroup::Preview, rules::ruff::rules::NeedlessElse),
@@ -1046,7 +1044,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Ruff, "056") => (RuleGroup::Preview, rules::ruff::rules::FalsyDictGetFallback),
         (Ruff, "057") => (RuleGroup::Stable, rules::ruff::rules::UnnecessaryRound),
         (Ruff, "058") => (RuleGroup::Stable, rules::ruff::rules::StarmapZip),
-        (Ruff, "059") => (RuleGroup::Stable, rules::ruff::rules::UnusedUnpackedVariable),
+        (Ruff, "059") => (RuleGroup::Preview, rules::ruff::rules::UnusedUnpackedVariable),
         (Ruff, "060") => (RuleGroup::Preview, rules::ruff::rules::InEmptyCollection),
         (Ruff, "061") => (RuleGroup::Preview, rules::ruff::rules::LegacyFormPytestRaises),
         (Ruff, "063") => (RuleGroup::Preview, rules::ruff::rules::AccessAnnotationsFromClassDict),
@@ -1106,11 +1104,11 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
 
         // airflow
         (Airflow, "001") => (RuleGroup::Stable, rules::airflow::rules::AirflowVariableNameTaskIdMismatch),
-        (Airflow, "002") => (RuleGroup::Stable, rules::airflow::rules::AirflowDagNoScheduleArgument),
-        (Airflow, "301") => (RuleGroup::Stable, rules::airflow::rules::Airflow3Removal),
-        (Airflow, "302") => (RuleGroup::Stable, rules::airflow::rules::Airflow3MovedToProvider),
-        (Airflow, "311") => (RuleGroup::Stable, rules::airflow::rules::Airflow3SuggestedUpdate),
-        (Airflow, "312") => (RuleGroup::Stable, rules::airflow::rules::Airflow3SuggestedToMoveToProvider),
+        (Airflow, "002") => (RuleGroup::Preview, rules::airflow::rules::AirflowDagNoScheduleArgument),
+        (Airflow, "301") => (RuleGroup::Preview, rules::airflow::rules::Airflow3Removal),
+        (Airflow, "302") => (RuleGroup::Preview, rules::airflow::rules::Airflow3MovedToProvider),
+        (Airflow, "311") => (RuleGroup::Preview, rules::airflow::rules::Airflow3SuggestedUpdate),
+        (Airflow, "312") => (RuleGroup::Preview, rules::airflow::rules::Airflow3SuggestedToMoveToProvider),
 
         // perflint
         (Perflint, "101") => (RuleGroup::Stable, rules::perflint::rules::UnnecessaryListCast),
@@ -1137,7 +1135,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Refurb, "105") => (RuleGroup::Stable, rules::refurb::rules::PrintEmptyString),
         (Refurb, "110") => (RuleGroup::Preview, rules::refurb::rules::IfExpInsteadOfOrOperator),
         (Refurb, "113") => (RuleGroup::Preview, rules::refurb::rules::RepeatedAppend),
-        (Refurb, "116") => (RuleGroup::Stable, rules::refurb::rules::FStringNumberFormat),
+        (Refurb, "116") => (RuleGroup::Preview, rules::refurb::rules::FStringNumberFormat),
         (Refurb, "118") => (RuleGroup::Preview, rules::refurb::rules::ReimplementedOperator),
         (Refurb, "122") => (RuleGroup::Stable, rules::refurb::rules::ForLoopWrites),
         (Refurb, "129") => (RuleGroup::Stable, rules::refurb::rules::ReadlinesInFor),

crates/ruff_linter/src/fs.rs

@@ -58,3 +58,13 @@ pub fn relativize_path<P: AsRef<Path>>(path: P) -> String {
     }
     format!("{}", path.display())
 }
+
+/// Convert an absolute path to be relative to the specified project root.
+pub fn relativize_path_to<P: AsRef<Path>, R: AsRef<Path>>(path: P, project_root: R) -> String {
+    format!(
+        "{}",
+        pathdiff::diff_paths(&path, project_root)
+            .expect("Could not diff paths")
+            .display()
+    )
+}

crates/ruff_linter/src/importer/insertion.rs

@@ -63,9 +63,9 @@ impl<'a> Insertion<'a> {
                 return Insertion::inline(" ", location.add(offset).add(TextSize::of(';')), ";");
             }
 
-            // While the first token after the docstring is a continuation character (i.e. "\"), advance
-            // additional rows to prevent inserting in the same logical line.
-            while match_continuation(locator.after(location)).is_some() {
+            // If the first token after the docstring is a continuation character (i.e. "\"), advance
+            // an additional row to prevent inserting in the same logical line.
+            if match_continuation(locator.after(location)).is_some() {
                 location = locator.full_line_end(location);
             }
 
@@ -379,17 +379,6 @@ mod tests {
             Insertion::own_line("", TextSize::from(22), "\n")
         );
 
-        let contents = r#"
-"""Hello, world!"""\
-\
-
-"#
-        .trim_start();
-        assert_eq!(
-            insert(contents)?,
-            Insertion::own_line("", TextSize::from(24), "\n")
-        );
-
         let contents = r"
 x = 1
 "

crates/ruff_linter/src/linter.rs

@@ -1231,10 +1231,6 @@ mod tests {
     )]
     #[test_case(Rule::AwaitOutsideAsync, Path::new("await_outside_async_function.py"))]
     #[test_case(Rule::AwaitOutsideAsync, Path::new("async_comprehension.py"))]
-    #[test_case(
-        Rule::YieldFromInAsyncFunction,
-        Path::new("yield_from_in_async_function.py")
-    )]
     fn test_syntax_errors(rule: Rule, path: &Path) -> Result<()> {
         let snapshot = path.to_string_lossy().to_string();
         let path = Path::new("resources/test/fixtures/syntax_errors").join(path);

crates/ruff_linter/src/message/diff.rs

@@ -0,0 +1,202 @@
+use std::fmt::{Display, Formatter};
+use std::num::NonZeroUsize;
+
+use colored::{Color, ColoredString, Colorize, Styles};
+use similar::{ChangeTag, TextDiff};
+
+use ruff_db::diagnostic::Diagnostic;
+use ruff_source_file::{OneIndexed, SourceFile};
+use ruff_text_size::{Ranged, TextRange, TextSize};
+
+use crate::text_helpers::ShowNonprinting;
+use crate::{Applicability, Fix};
+
+/// Renders a diff that shows the code fixes.
+///
+/// The implementation isn't fully fledged out and only used by tests. Before using in production, try
+/// * Improve layout
+/// * Replace tabs with spaces for a consistent experience across terminals
+/// * Replace zero-width whitespaces
+/// * Print a simpler diff if only a single line has changed
+/// * Compute the diff from the [`Edit`] because diff calculation is expensive.
+pub(super) struct Diff<'a> {
+    fix: &'a Fix,
+    source_code: &'a SourceFile,
+}
+
+impl<'a> Diff<'a> {
+    pub(crate) fn from_message(message: &'a Diagnostic) -> Option<Diff<'a>> {
+        message.fix().map(|fix| Diff {
+            source_code: message.expect_ruff_source_file(),
+            fix,
+        })
+    }
+}
+
+impl Display for Diff<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        // TODO(dhruvmanila): Add support for Notebook cells once it's user-facing
+        let mut output = String::with_capacity(self.source_code.source_text().len());
+        let mut last_end = TextSize::default();
+
+        for edit in self.fix.edits() {
+            output.push_str(
+                self.source_code
+                    .slice(TextRange::new(last_end, edit.start())),
+            );
+            output.push_str(edit.content().unwrap_or_default());
+            last_end = edit.end();
+        }
+
+        output.push_str(&self.source_code.source_text()[usize::from(last_end)..]);
+
+        let diff = TextDiff::from_lines(self.source_code.source_text(), &output);
+
+        let message = match self.fix.applicability() {
+            // TODO(zanieb): Adjust this messaging once it's user-facing
+            Applicability::Safe => "Safe fix",
+            Applicability::Unsafe => "Unsafe fix",
+            Applicability::DisplayOnly => "Display-only fix",
+        };
+        writeln!(f, "ℹ {}", message.blue())?;
+
+        let (largest_old, largest_new) = diff
+            .ops()
+            .last()
+            .map(|op| (op.old_range().start, op.new_range().start))
+            .unwrap_or_default();
+
+        let digit_with =
+            calculate_print_width(OneIndexed::from_zero_indexed(largest_new.max(largest_old)));
+
+        for (idx, group) in diff.grouped_ops(3).iter().enumerate() {
+            if idx > 0 {
+                writeln!(f, "{:-^1$}", "-", 80)?;
+            }
+            for op in group {
+                for change in diff.iter_inline_changes(op) {
+                    let sign = match change.tag() {
+                        ChangeTag::Delete => "-",
+                        ChangeTag::Insert => "+",
+                        ChangeTag::Equal => " ",
+                    };
+
+                    let line_style = LineStyle::from(change.tag());
+
+                    let old_index = change.old_index().map(OneIndexed::from_zero_indexed);
+                    let new_index = change.new_index().map(OneIndexed::from_zero_indexed);
+
+                    write!(
+                        f,
+                        "{} {} |{}",
+                        Line {
+                            index: old_index,
+                            width: digit_with
+                        },
+                        Line {
+                            index: new_index,
+                            width: digit_with
+                        },
+                        line_style.apply_to(sign).bold()
+                    )?;
+
+                    for (emphasized, value) in change.iter_strings_lossy() {
+                        let value = value.show_nonprinting();
+                        if emphasized {
+                            write!(f, "{}", line_style.apply_to(&value).underline().on_black())?;
+                        } else {
+                            write!(f, "{}", line_style.apply_to(&value))?;
+                        }
+                    }
+                    if change.missing_newline() {
+                        writeln!(f)?;
+                    }
+                }
+            }
+        }
+
+        Ok(())
+    }
+}
+
+struct LineStyle {
+    fgcolor: Option<Color>,
+    style: Option<Styles>,
+}
+
+impl LineStyle {
+    fn apply_to(&self, input: &str) -> ColoredString {
+        let mut colored = ColoredString::from(input);
+        if let Some(color) = self.fgcolor {
+            colored = colored.color(color);
+        }
+
+        if let Some(style) = self.style {
+            match style {
+                Styles::Clear => colored.clear(),
+                Styles::Bold => colored.bold(),
+                Styles::Dimmed => colored.dimmed(),
+                Styles::Underline => colored.underline(),
+                Styles::Reversed => colored.reversed(),
+                Styles::Italic => colored.italic(),
+                Styles::Blink => colored.blink(),
+                Styles::Hidden => colored.hidden(),
+                Styles::Strikethrough => colored.strikethrough(),
+            }
+        } else {
+            colored
+        }
+    }
+}
+
+impl From<ChangeTag> for LineStyle {
+    fn from(value: ChangeTag) -> Self {
+        match value {
+            ChangeTag::Equal => LineStyle {
+                fgcolor: None,
+                style: Some(Styles::Dimmed),
+            },
+            ChangeTag::Delete => LineStyle {
+                fgcolor: Some(Color::Red),
+                style: None,
+            },
+            ChangeTag::Insert => LineStyle {
+                fgcolor: Some(Color::Green),
+                style: None,
+            },
+        }
+    }
+}
+
+struct Line {
+    index: Option<OneIndexed>,
+    width: NonZeroUsize,
+}
+
+impl Display for Line {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        match self.index {
+            None => {
+                for _ in 0..self.width.get() {
+                    f.write_str(" ")?;
+                }
+                Ok(())
+            }
+            Some(idx) => write!(f, "{:<width$}", idx, width = self.width.get()),
+        }
+    }
+}
+
+/// Calculate the length of the string representation of `value`
+pub(super) fn calculate_print_width(mut value: OneIndexed) -> NonZeroUsize {
+    const TEN: OneIndexed = OneIndexed::from_zero_indexed(9);
+
+    let mut width = OneIndexed::ONE;
+
+    while value >= TEN {
+        value = OneIndexed::new(value.get() / 10).unwrap_or(OneIndexed::MIN);
+        width = width.checked_add(1).unwrap();
+    }
+
+    width
+}

crates/ruff_linter/src/message/github.rs

@@ -19,7 +19,7 @@ impl Emitter for GithubEmitter {
         context: &EmitterContext,
     ) -> anyhow::Result<()> {
         for diagnostic in diagnostics {
-            let source_location = diagnostic.ruff_start_location().unwrap_or_default();
+            let source_location = diagnostic.expect_ruff_start_location();
             let filename = diagnostic.expect_ruff_filename();
             let location = if context.is_notebook(&filename) {
                 // We can't give a reasonable location for the structured formats,
@@ -29,7 +29,7 @@ impl Emitter for GithubEmitter {
                 source_location
             };
 
-            let end_location = diagnostic.ruff_end_location().unwrap_or_default();
+            let end_location = diagnostic.expect_ruff_end_location();
 
             write!(
                 writer,

crates/ruff_linter/src/message/gitlab.rs

@@ -0,0 +1,174 @@
+use std::collections::HashSet;
+use std::collections::hash_map::DefaultHasher;
+use std::hash::{Hash, Hasher};
+use std::io::Write;
+
+use serde::ser::SerializeSeq;
+use serde::{Serialize, Serializer};
+use serde_json::json;
+
+use ruff_db::diagnostic::Diagnostic;
+
+use crate::fs::{relativize_path, relativize_path_to};
+use crate::message::{Emitter, EmitterContext};
+
+/// Generate JSON with violations in GitLab CI format
+//  https://docs.gitlab.com/ee/ci/testing/code_quality.html#implement-a-custom-tool
+pub struct GitlabEmitter {
+    project_dir: Option<String>,
+}
+
+impl Default for GitlabEmitter {
+    fn default() -> Self {
+        Self {
+            project_dir: std::env::var("CI_PROJECT_DIR").ok(),
+        }
+    }
+}
+
+impl Emitter for GitlabEmitter {
+    fn emit(
+        &mut self,
+        writer: &mut dyn Write,
+        diagnostics: &[Diagnostic],
+        context: &EmitterContext,
+    ) -> anyhow::Result<()> {
+        serde_json::to_writer_pretty(
+            writer,
+            &SerializedMessages {
+                diagnostics,
+                context,
+                project_dir: self.project_dir.as_deref(),
+            },
+        )?;
+
+        Ok(())
+    }
+}
+
+struct SerializedMessages<'a> {
+    diagnostics: &'a [Diagnostic],
+    context: &'a EmitterContext<'a>,
+    project_dir: Option<&'a str>,
+}
+
+impl Serialize for SerializedMessages<'_> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut s = serializer.serialize_seq(Some(self.diagnostics.len()))?;
+        let mut fingerprints = HashSet::<u64>::with_capacity(self.diagnostics.len());
+
+        for diagnostic in self.diagnostics {
+            let filename = diagnostic.expect_ruff_filename();
+
+            let (start_location, end_location) = if self.context.is_notebook(&filename) {
+                // We can't give a reasonable location for the structured formats,
+                // so we show one that's clearly a fallback
+                Default::default()
+            } else {
+                (
+                    diagnostic.expect_ruff_start_location(),
+                    diagnostic.expect_ruff_end_location(),
+                )
+            };
+
+            let path = self.project_dir.as_ref().map_or_else(
+                || relativize_path(&filename),
+                |project_dir| relativize_path_to(&filename, project_dir),
+            );
+
+            let mut message_fingerprint = fingerprint(diagnostic, &path, 0);
+
+            // Make sure that we do not get a fingerprint that is already in use
+            // by adding in the previously generated one.
+            while fingerprints.contains(&message_fingerprint) {
+                message_fingerprint = fingerprint(diagnostic, &path, message_fingerprint);
+            }
+            fingerprints.insert(message_fingerprint);
+
+            let description = diagnostic.body();
+            let check_name = diagnostic.secondary_code_or_id();
+
+            let value = json!({
+                "check_name": check_name,
+                // GitLab doesn't display the separate `check_name` field in a Code Quality report,
+                // so prepend it to the description too.
+                "description": format!("{check_name}: {description}"),
+                "severity": "major",
+                "fingerprint": format!("{:x}", message_fingerprint),
+                "location": {
+                    "path": path,
+                    "positions": {
+                        "begin": start_location,
+                        "end": end_location,
+                    },
+                },
+            });
+
+            s.serialize_element(&value)?;
+        }
+
+        s.end()
+    }
+}
+
+/// Generate a unique fingerprint to identify a violation.
+fn fingerprint(message: &Diagnostic, project_path: &str, salt: u64) -> u64 {
+    let mut hasher = DefaultHasher::new();
+
+    salt.hash(&mut hasher);
+    message.name().hash(&mut hasher);
+    project_path.hash(&mut hasher);
+
+    hasher.finish()
+}
+
+#[cfg(test)]
+mod tests {
+    use insta::assert_snapshot;
+
+    use crate::message::GitlabEmitter;
+    use crate::message::tests::{
+        capture_emitter_output, create_diagnostics, create_syntax_error_diagnostics,
+    };
+
+    #[test]
+    fn output() {
+        let mut emitter = GitlabEmitter::default();
+        let content = capture_emitter_output(&mut emitter, &create_diagnostics());
+
+        assert_snapshot!(redact_fingerprint(&content));
+    }
+
+    #[test]
+    fn syntax_errors() {
+        let mut emitter = GitlabEmitter::default();
+        let content = capture_emitter_output(&mut emitter, &create_syntax_error_diagnostics());
+
+        assert_snapshot!(redact_fingerprint(&content));
+    }
+
+    // Redact the fingerprint because the default hasher isn't stable across platforms.
+    fn redact_fingerprint(content: &str) -> String {
+        static FINGERPRINT_HAY_KEY: &str = r#""fingerprint": ""#;
+
+        let mut output = String::with_capacity(content.len());
+        let mut last = 0;
+
+        for (start, _) in content.match_indices(FINGERPRINT_HAY_KEY) {
+            let fingerprint_hash_start = start + FINGERPRINT_HAY_KEY.len();
+            output.push_str(&content[last..fingerprint_hash_start]);
+            output.push_str("<redacted>");
+            last = fingerprint_hash_start
+                + content[fingerprint_hash_start..]
+                    .find('"')
+                    .expect("Expected terminating quote");
+        }
+
+        output.push_str(&content[last..]);
+
+        output
+    }
+}

crates/ruff_linter/src/message/grouped.rs

@@ -10,6 +10,7 @@ use ruff_notebook::NotebookIndex;
 use ruff_source_file::{LineColumn, OneIndexed};
 
 use crate::fs::relativize_path;
+use crate::message::diff::calculate_print_width;
 use crate::message::{Emitter, EmitterContext};
 use crate::settings::types::UnsafeFixes;
 
@@ -52,8 +53,8 @@ impl Emitter for GroupedEmitter {
                 max_column_length = max_column_length.max(message.start_location.column);
             }
 
-            let row_length = max_row_length.digits();
-            let column_length = max_column_length.digits();
+            let row_length = calculate_print_width(max_row_length);
+            let column_length = calculate_print_width(max_column_length);
 
             // Print the filename.
             writeln!(writer, "{}:", relativize_path(&*filename).underline())?;
@@ -105,7 +106,7 @@ fn group_diagnostics_by_filename(
             .or_insert_with(Vec::new)
             .push(MessageWithLocation {
                 message: diagnostic,
-                start_location: diagnostic.ruff_start_location().unwrap_or_default(),
+                start_location: diagnostic.expect_ruff_start_location(),
             });
     }
     grouped_messages
@@ -130,7 +131,8 @@ impl Display for DisplayGroupedMessage<'_> {
         write!(
             f,
             "  {row_padding}",
-            row_padding = " ".repeat(self.row_length.get() - start_location.line.digits().get())
+            row_padding = " "
+                .repeat(self.row_length.get() - calculate_print_width(start_location.line).get())
         )?;
 
         // Check if we're working on a jupyter notebook and translate positions with cell accordingly
@@ -157,8 +159,9 @@ impl Display for DisplayGroupedMessage<'_> {
             f,
             "{row}{sep}{col}{col_padding} {code_and_body}",
             sep = ":".cyan(),
-            col_padding =
-                " ".repeat(self.column_length.get() - start_location.column.digits().get()),
+            col_padding = " ".repeat(
+                self.column_length.get() - calculate_print_width(start_location.column).get()
+            ),
             code_and_body = RuleCodeAndBody {
                 message,
                 show_fix_status: self.show_fix_status,

crates/ruff_linter/src/message/mod.rs

@@ -10,6 +10,7 @@ use ruff_db::diagnostic::{
 use ruff_db::files::File;
 
 pub use github::GithubEmitter;
+pub use gitlab::GitlabEmitter;
 pub use grouped::GroupedEmitter;
 use ruff_notebook::NotebookIndex;
 use ruff_source_file::SourceFile;
@@ -20,7 +21,9 @@ pub use text::TextEmitter;
 use crate::Fix;
 use crate::registry::Rule;
 
+mod diff;
 mod github;
+mod gitlab;
 mod grouped;
 mod sarif;
 mod text;

crates/ruff_linter/src/message/sarif.rs

@@ -158,8 +158,8 @@ struct SarifResult<'a> {
 impl<'a> SarifResult<'a> {
     #[cfg(not(target_arch = "wasm32"))]
     fn from_message(message: &'a Diagnostic) -> Result<Self> {
-        let start_location = message.ruff_start_location().unwrap_or_default();
-        let end_location = message.ruff_end_location().unwrap_or_default();
+        let start_location = message.expect_ruff_start_location();
+        let end_location = message.expect_ruff_end_location();
         let path = normalize_path(&*message.expect_ruff_filename());
         Ok(Self {
             code: RuleCode::from(message),
@@ -178,8 +178,8 @@ impl<'a> SarifResult<'a> {
     #[cfg(target_arch = "wasm32")]
     #[expect(clippy::unnecessary_wraps)]
     fn from_message(message: &'a Diagnostic) -> Result<Self> {
-        let start_location = message.ruff_start_location().unwrap_or_default();
-        let end_location = message.ruff_end_location().unwrap_or_default();
+        let start_location = message.expect_ruff_start_location();
+        let end_location = message.expect_ruff_end_location();
         let path = normalize_path(&*message.expect_ruff_filename());
         Ok(Self {
             code: RuleCode::from(message),

crates/ruff_linter/src/message/snapshots/ruff_linter__message__gitlab__tests__output.snap

@@ -1,63 +1,63 @@
 ---
-source: crates/ruff_db/src/diagnostic/render/gitlab.rs
-expression: env.render_diagnostics(&diagnostics)
+source: crates/ruff_linter/src/message/gitlab.rs
+expression: redact_fingerprint(&content)
 ---
 [
   {
     "check_name": "F401",
     "description": "F401: `os` imported but unused",
-    "severity": "major",
     "fingerprint": "<redacted>",
     "location": {
       "path": "fib.py",
       "positions": {
         "begin": {
-          "line": 1,
-          "column": 8
+          "column": 8,
+          "line": 1
         },
         "end": {
-          "line": 1,
-          "column": 10
+          "column": 10,
+          "line": 1
         }
       }
-    }
+    },
+    "severity": "major"
   },
   {
     "check_name": "F841",
     "description": "F841: Local variable `x` is assigned to but never used",
-    "severity": "major",
     "fingerprint": "<redacted>",
     "location": {
       "path": "fib.py",
       "positions": {
         "begin": {
-          "line": 6,
-          "column": 5
+          "column": 5,
+          "line": 6
         },
         "end": {
-          "line": 6,
-          "column": 6
+          "column": 6,
+          "line": 6
         }
       }
-    }
+    },
+    "severity": "major"
   },
   {
     "check_name": "F821",
     "description": "F821: Undefined name `a`",
-    "severity": "major",
     "fingerprint": "<redacted>",
     "location": {
       "path": "undef.py",
       "positions": {
         "begin": {
-          "line": 1,
-          "column": 4
+          "column": 4,
+          "line": 1
         },
         "end": {
-          "line": 1,
-          "column": 5
+          "column": 5,
+          "line": 1
         }
       }
-    }
+    },
+    "severity": "major"
   }
 ]

crates/ruff_linter/src/message/snapshots/ruff_linter__message__gitlab__tests__syntax_errors.snap

@@ -1,44 +1,44 @@
 ---
-source: crates/ruff_db/src/diagnostic/render/gitlab.rs
-expression: env.render_diagnostics(&diagnostics)
+source: crates/ruff_linter/src/message/gitlab.rs
+expression: redact_fingerprint(&content)
 ---
 [
   {
     "check_name": "invalid-syntax",
     "description": "invalid-syntax: Expected one or more symbol names after import",
-    "severity": "major",
     "fingerprint": "<redacted>",
     "location": {
       "path": "syntax_errors.py",
       "positions": {
         "begin": {
-          "line": 1,
-          "column": 15
+          "column": 15,
+          "line": 1
         },
         "end": {
-          "line": 2,
-          "column": 1
+          "column": 1,
+          "line": 2
         }
       }
-    }
+    },
+    "severity": "major"
   },
   {
     "check_name": "invalid-syntax",
     "description": "invalid-syntax: Expected ')', found newline",
-    "severity": "major",
     "fingerprint": "<redacted>",
     "location": {
       "path": "syntax_errors.py",
       "positions": {
         "begin": {
-          "line": 3,
-          "column": 12
+          "column": 12,
+          "line": 3
         },
         "end": {
-          "line": 4,
-          "column": 1
+          "column": 1,
+          "line": 4
         }
       }
-    }
+    },
+    "severity": "major"
   }
 ]

crates/ruff_linter/src/message/snapshots/ruff_linter__message__sarif__tests__results.snap

@@ -81,7 +81,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## Fix safety\n\nFixes to remove unused imports are safe, except in `__init__.py` files.\n\nApplying fixes to `__init__.py` files is currently in preview. The fix offered depends on the\ntype of the unused import. Ruff will suggest a safe fix to export first-party imports with\neither a redundant alias or, if already present in the file, an `__all__` entry. If multiple\n`__all__` declarations are present, Ruff will not offer a fix. Ruff will suggest an unsafe fix\nto remove third-party and standard library imports -- the fix is unsafe because the module's\ninterface changes.\n\n## Example\n\n```python\nimport numpy as np  # unused import\n\n\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nUse instead:\n\n```python\ndef area(radius):\n    return 3.14 * radius**2\n```\n\nTo check the availability of a module, use `importlib.util.find_spec`:\n\n```python\nfrom importlib.util import find_spec\n\nif find_spec(\"numpy\") is not None:\n    print(\"numpy is installed\")\nelse:\n    print(\"numpy is not installed\")\n```\n\n## Preview\nWhen [preview](https://docs.astral.sh/ruff/preview/) is enabled,\nthe criterion for determining whether an import is first-party\nis stricter, which could affect the suggested fix. See [this FAQ section](https://docs.astral.sh/ruff/faq/#how-does-ruff-determine-which-of-my-imports-are-first-party-third-party-etc) for more details.\n\n## Options\n- `lint.ignore-init-module-imports`\n- `lint.pyflakes.allowed-unused-imports`\n\n## References\n- [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)\n- [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)\n- [Typing documentation: interface conventions](https://typing.python.org/en/latest/spec/distributing.html#library-interface-public-and-private-symbols)\n"
               },
               "help": {
                 "text": "`{name}` imported but unused; consider using `importlib.util.find_spec` to test for availability"
@@ -119,7 +119,7 @@ expression: value
             },
             {
               "fullDescription": {
-                "text": "## What it does\nChecks for the presence of unused variables in function scopes.\n\n## Why is this bad?\nA variable that is defined but not used is likely a mistake, and should\nbe removed to avoid confusion.\n\nIf a variable is intentionally defined-but-not-used, it should be\nprefixed with an underscore, or some other value that adheres to the\n[`lint.dummy-variable-rgx`] pattern.\n\n## Example\n```python\ndef foo():\n    x = 1\n    y = 2\n    return x\n```\n\nUse instead:\n```python\ndef foo():\n    x = 1\n    return x\n```\n\n## Fix safety\n\nThis rule's fix is marked as unsafe because removing an unused variable assignment may\ndelete comments that are attached to the assignment.\n\n## See also\n\nThis rule does not apply to bindings in unpacked assignments (e.g. `x, y = 1, 2`). See\n[`unused-unpacked-variable`][RUF059] for this case.\n\n## Options\n- `lint.dummy-variable-rgx`\n\n[RUF059]: https://docs.astral.sh/ruff/rules/unused-unpacked-variable/\n"
+                "text": "## What it does\nChecks for the presence of unused variables in function scopes.\n\n## Why is this bad?\nA variable that is defined but not used is likely a mistake, and should\nbe removed to avoid confusion.\n\nIf a variable is intentionally defined-but-not-used, it should be\nprefixed with an underscore, or some other value that adheres to the\n[`lint.dummy-variable-rgx`] pattern.\n\n## Example\n```python\ndef foo():\n    x = 1\n    y = 2\n    return x\n```\n\nUse instead:\n```python\ndef foo():\n    x = 1\n    return x\n```\n\n## Fix safety\n\nThis rule's fix is marked as unsafe because removing an unused variable assignment may\ndelete comments that are attached to the assignment.\n\n## Options\n- `lint.dummy-variable-rgx`\n"
               },
               "help": {
                 "text": "Local variable `{name}` is assigned to but never used"

crates/ruff_linter/src/message/text.rs

@@ -1,19 +1,23 @@
 use std::io::Write;
 
-use ruff_db::diagnostic::{
-    Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig, DisplayDiagnostics,
-};
-use ruff_diagnostics::Applicability;
+use ruff_db::diagnostic::{Diagnostic, DiagnosticFormat, DisplayDiagnosticConfig};
 
+use crate::message::diff::Diff;
 use crate::message::{Emitter, EmitterContext};
+use crate::settings::types::UnsafeFixes;
 
 pub struct TextEmitter {
+    /// Whether to show the diff of a fix, for diagnostics that have a fix.
+    ///
+    /// Note that this is not currently exposed in the CLI (#7352) and is only used in tests.
+    show_fix_diff: bool,
     config: DisplayDiagnosticConfig,
 }
 
 impl Default for TextEmitter {
     fn default() -> Self {
         Self {
+            show_fix_diff: false,
             config: DisplayDiagnosticConfig::default()
                 .format(DiagnosticFormat::Concise)
                 .hide_severity(true)
@@ -31,7 +35,7 @@ impl TextEmitter {
 
     #[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.show_fix_diff = show_fix_diff;
         self
     }
 
@@ -46,8 +50,10 @@ impl TextEmitter {
     }
 
     #[must_use]
-    pub fn with_fix_applicability(mut self, applicability: Applicability) -> Self {
-        self.config = self.config.fix_applicability(applicability);
+    pub fn with_unsafe_fixes(mut self, unsafe_fixes: UnsafeFixes) -> Self {
+        self.config = self
+            .config
+            .fix_applicability(unsafe_fixes.required_applicability());
         self
     }
 
@@ -71,11 +77,15 @@ impl Emitter for TextEmitter {
         diagnostics: &[Diagnostic],
         context: &EmitterContext,
     ) -> anyhow::Result<()> {
-        write!(
-            writer,
-            "{}",
-            DisplayDiagnostics::new(context, &self.config, diagnostics)
-        )?;
+        for message in diagnostics {
+            write!(writer, "{}", message.display(context, &self.config))?;
+
+            if self.show_fix_diff {
+                if let Some(diff) = Diff::from_message(message) {
+                    writeln!(writer, "{diff}")?;
+                }
+            }
+        }
 
         Ok(())
     }
@@ -84,13 +94,13 @@ impl Emitter for TextEmitter {
 #[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,
     };
+    use crate::settings::types::UnsafeFixes;
 
     #[test]
     fn default() {
@@ -115,7 +125,7 @@ mod tests {
         let mut emitter = TextEmitter::default()
             .with_show_fix_status(true)
             .with_show_source(true)
-            .with_fix_applicability(Applicability::Unsafe);
+            .with_unsafe_fixes(UnsafeFixes::Enabled);
         let content = capture_emitter_output(&mut emitter, &create_diagnostics());
 
         assert_snapshot!(content);
@@ -126,7 +136,7 @@ mod tests {
         let mut emitter = TextEmitter::default()
             .with_show_fix_status(true)
             .with_show_source(true)
-            .with_fix_applicability(Applicability::Unsafe);
+            .with_unsafe_fixes(UnsafeFixes::Enabled);
         let (messages, notebook_indexes) = create_notebook_diagnostics();
         let content = capture_emitter_notebook_output(&mut emitter, &messages, &notebook_indexes);
 

crates/ruff_linter/src/preview.rs

@@ -11,6 +11,11 @@ pub(crate) const fn is_py314_support_enabled(settings: &LinterSettings) -> bool
     settings.preview.is_enabled()
 }
 
+// https://github.com/astral-sh/ruff/pull/16565
+pub(crate) const fn is_full_path_match_source_strategy_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}
+
 // Rule-specific behavior
 
 // https://github.com/astral-sh/ruff/pull/15541
@@ -35,11 +40,6 @@ pub(crate) const fn is_bad_version_info_in_non_stub_enabled(settings: &LinterSet
     settings.preview.is_enabled()
 }
 
-/// <https://github.com/astral-sh/ruff/pull/19303>
-pub(crate) const fn is_fix_f_string_logging_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
 // https://github.com/astral-sh/ruff/pull/16719
 pub(crate) const fn is_fix_manual_dict_comprehension_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()
@@ -159,21 +159,6 @@ pub(crate) const fn is_fix_os_getcwd_enabled(settings: &LinterSettings) -> bool
     settings.preview.is_enabled()
 }
 
-// https://github.com/astral-sh/ruff/pull/19514
-pub(crate) const fn is_fix_os_mkdir_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/19514
-pub(crate) const fn is_fix_os_makedirs_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
-// https://github.com/astral-sh/ruff/pull/20009
-pub(crate) const fn is_fix_os_symlink_enabled(settings: &LinterSettings) -> bool {
-    settings.preview.is_enabled()
-}
-
 // https://github.com/astral-sh/ruff/pull/11436
 // https://github.com/astral-sh/ruff/pull/11168
 pub(crate) const fn is_dunder_init_fix_unused_import_enabled(settings: &LinterSettings) -> bool {
@@ -195,11 +180,35 @@ pub(crate) const fn is_allow_nested_roots_enabled(settings: &LinterSettings) ->
     settings.preview.is_enabled()
 }
 
+// https://github.com/astral-sh/ruff/pull/18208
+pub(crate) const fn is_multiple_with_statements_fix_safe_enabled(
+    settings: &LinterSettings,
+) -> bool {
+    settings.preview.is_enabled()
+}
+
+// https://github.com/astral-sh/ruff/pull/18400
+pub(crate) const fn is_ignore_init_files_in_useless_alias_enabled(
+    settings: &LinterSettings,
+) -> bool {
+    settings.preview.is_enabled()
+}
+
 // https://github.com/astral-sh/ruff/pull/18572
 pub(crate) const fn is_optional_as_none_in_union_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()
 }
 
+// https://github.com/astral-sh/ruff/pull/18547
+pub(crate) const fn is_invalid_async_mock_access_check_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}
+
+// https://github.com/astral-sh/ruff/pull/18867
+pub(crate) const fn is_raise_exception_byte_string_enabled(settings: &LinterSettings) -> bool {
+    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,
@@ -207,14 +216,17 @@ pub(crate) const fn is_safe_super_call_with_parameters_fix_enabled(
     settings.preview.is_enabled()
 }
 
-// https://github.com/astral-sh/ruff/pull/19851
-pub(crate) const fn is_maxsplit_without_separator_fix_enabled(settings: &LinterSettings) -> bool {
+// https://github.com/astral-sh/ruff/pull/19063
+pub(crate) const fn is_assert_raises_exception_call_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()
 }
 
-// https://github.com/astral-sh/ruff/pull/20027
-pub(crate) const fn is_unnecessary_default_type_args_stubs_enabled(
-    settings: &LinterSettings,
-) -> bool {
+// https://github.com/astral-sh/ruff/pull/19100
+pub(crate) const fn is_add_future_annotations_imports_enabled(settings: &LinterSettings) -> bool {
+    settings.preview.is_enabled()
+}
+
+// https://github.com/astral-sh/ruff/pull/19390
+pub(crate) const fn is_trailing_comma_type_params_enabled(settings: &LinterSettings) -> bool {
     settings.preview.is_enabled()
 }

crates/ruff_linter/src/renamer.rs

@@ -354,10 +354,7 @@ impl Renamer {
                 ))
             }
             // Avoid renaming builtins and other "special" bindings.
-            BindingKind::FutureImport
-            | BindingKind::Builtin
-            | BindingKind::Export(_)
-            | BindingKind::DunderClassCell => None,
+            BindingKind::FutureImport | BindingKind::Builtin | BindingKind::Export(_) => None,
             // By default, replace the binding's name with the target name.
             BindingKind::Annotation
             | BindingKind::Argument

crates/ruff_linter/src/rule_selector.rs

@@ -214,8 +214,10 @@ impl RuleSelector {
                 RuleGroup::Preview => {
                     preview_enabled && (self.is_exact() || !preview_require_explicit)
                 }
-                // Deprecated rules are excluded by default unless explicitly selected
-                RuleGroup::Deprecated => !preview_enabled && self.is_exact(),
+                // Deprecated rules are excluded in preview mode and with 'All' option unless explicitly selected
+                RuleGroup::Deprecated => {
+                    (!preview_enabled || self.is_exact()) && !matches!(self, RuleSelector::All)
+                }
                 // Removed rules are included if explicitly selected but will error downstream
                 RuleGroup::Removed => self.is_exact(),
             }

crates/ruff_linter/src/rules/airflow/helpers.rs

@@ -37,6 +37,7 @@ pub(crate) enum Replacement {
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub(crate) enum ProviderReplacement {
+    None,
     AutoImport {
         module: &'static str,
         name: &'static str,

crates/ruff_linter/src/rules/airflow/rules/dag_schedule_argument.rs

@@ -46,7 +46,7 @@ pub(crate) struct AirflowDagNoScheduleArgument;
 impl Violation for AirflowDagNoScheduleArgument {
     #[derive_message_formats]
     fn message(&self) -> String {
-        "`DAG` or `@dag` should have an explicit `schedule` argument".to_string()
+        "DAG should have an explicit `schedule` argument".to_string()
     }
 }
 

crates/ruff_linter/src/rules/airflow/rules/moved_to_provider_in_3.rs

@@ -13,13 +13,13 @@ use ruff_text_size::TextRange;
 use crate::{FixAvailability, Violation};
 
 /// ## What it does
-/// Checks for uses of Airflow functions and values that have been moved to its providers
-/// (e.g., `apache-airflow-providers-fab`).
+/// Checks for uses of Airflow functions and values that have been moved to it providers.
+/// (e.g., apache-airflow-providers-fab)
 ///
 /// ## Why is this bad?
 /// Airflow 3.0 moved various deprecated functions, members, and other
 /// values to its providers. The user needs to install the corresponding provider and replace
-/// the original usage with the one in the provider.
+/// the original usage with the one in the provider
 ///
 /// ## Example
 /// ```python
@@ -50,6 +50,9 @@ impl Violation for Airflow3MovedToProvider<'_> {
             replacement,
         } = self;
         match replacement {
+            ProviderReplacement::None => {
+                format!("`{deprecated}` is removed in Airflow 3.0")
+            }
             ProviderReplacement::AutoImport {
                 name: _,
                 module: _,
@@ -82,6 +85,7 @@ impl Violation for Airflow3MovedToProvider<'_> {
                 provider,
                 version,
             } => Some((module, name.as_str(), provider, version)),
+            ProviderReplacement::None => None,
         } {
             Some(format!(
                 "Install `apache-airflow-providers-{provider}>={version}` and use `{name}` from `{module}` instead."
@@ -1016,6 +1020,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             provider: "postgres",
             version: "1.0.0",
         },
+        ["airflow", "operators", "postgres_operator", "Mapping"] => ProviderReplacement::None,
 
         // apache-airflow-providers-presto
         ["airflow", "hooks", "presto_hook", "PrestoHook"] => ProviderReplacement::AutoImport {
@@ -1204,6 +1209,16 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
         ProviderReplacement::SourceModuleMovedToProvider { module, name, .. } => {
             (module, name.as_str())
         }
+        ProviderReplacement::None => {
+            checker.report_diagnostic(
+                Airflow3MovedToProvider {
+                    deprecated: qualified_name,
+                    replacement,
+                },
+                ranged,
+            );
+            return;
+        }
     };
 
     if is_guarded_by_try_except(expr, module, name, checker.semantic()) {

crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs

@@ -23,7 +23,7 @@ use ruff_text_size::TextRange;
 /// ## Why is this bad?
 /// Airflow 3.0 removed various deprecated functions, members, and other
 /// values. Some have more modern replacements. Others are considered too niche
-/// and not worth continued maintenance in Airflow.
+/// and not worth to be maintained in Airflow.
 ///
 /// ## Example
 /// ```python
@@ -704,7 +704,6 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
         ["airflow", "operators", "subdag", ..] => {
             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 {
             module: "airflow.sdk",
             name: "get_current_context",

crates/ruff_linter/src/rules/airflow/rules/suggested_to_move_to_provider_in_3.rs

@@ -65,6 +65,9 @@ impl Violation for Airflow3SuggestedToMoveToProvider<'_> {
             replacement,
         } = self;
         match replacement {
+            ProviderReplacement::None => {
+                format!("`{deprecated}` is removed in Airflow 3.0")
+            }
             ProviderReplacement::AutoImport {
                 name: _,
                 module: _,
@@ -88,6 +91,7 @@ impl Violation for Airflow3SuggestedToMoveToProvider<'_> {
     fn fix_title(&self) -> Option<String> {
         let Airflow3SuggestedToMoveToProvider { replacement, .. } = self;
         match replacement {
+            ProviderReplacement::None => None,
             ProviderReplacement::AutoImport {
                 module,
                 name,
@@ -211,12 +215,6 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
                 version: "0.0.1",
             }
         }
-        ["airflow", "sensors", "bash", "BashSensor"] => ProviderReplacement::AutoImport {
-            module: "airflow.providers.standard.sensor.bash",
-            name: "BashSensor",
-            provider: "standard",
-            version: "0.0.1",
-        },
         [
             "airflow",
             "sensors",
@@ -245,12 +243,6 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
             provider: "standard",
             version: "0.0.2",
         },
-        ["airflow", "sensors", "python", "PythonSensor"] => ProviderReplacement::AutoImport {
-            module: "airflow.providers.standard.sensors.python",
-            name: "PythonSensor",
-            provider: "standard",
-            version: "0.0.1",
-        },
         [
             "airflow",
             "sensors",
@@ -315,6 +307,16 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
         ProviderReplacement::SourceModuleMovedToProvider { module, name, .. } => {
             (module, name.as_str())
         }
+        ProviderReplacement::None => {
+            checker.report_diagnostic(
+                Airflow3SuggestedToMoveToProvider {
+                    deprecated: qualified_name,
+                    replacement: replacement.clone(),
+                },
+                ranged.range(),
+            );
+            return;
+        }
     };
 
     if is_guarded_by_try_except(expr, module, name, checker.semantic()) {

crates/ruff_linter/src/rules/airflow/rules/suggested_to_update_3_0.rs

@@ -17,9 +17,9 @@ use ruff_text_size::TextRange;
 /// ## Why is this bad?
 /// Airflow 3.0 removed various deprecated functions, members, and other
 /// values. Some have more modern replacements. Others are considered too niche
-/// and not worth continued maintenance in Airflow.
+/// and not worth to be maintained in Airflow.
 /// Even though these symbols still work fine on Airflow 3.0, they are expected to be removed in a future version.
-/// Where available, users should replace the removed functionality with the new alternatives.
+/// The user is suggested to replace the original usage with the new ones.
 ///
 /// ## Example
 /// ```python
@@ -157,9 +157,6 @@ fn check_call_arguments(checker: &Checker, qualified_name: &QualifiedName, argum
         ["airflow", .., "DAG" | "dag"] => {
             diagnostic_for_argument(checker, arguments, "sla_miss_callback", None);
         }
-        ["airflow", "timetables", "datasets", "DatasetOrTimeSchedule"] => {
-            diagnostic_for_argument(checker, arguments, "datasets", Some("assets"));
-        }
         segments => {
             if is_airflow_builtin_or_provider(segments, "operators", "Operator") {
                 diagnostic_for_argument(checker, arguments, "sla", None);
@@ -230,26 +227,13 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             module: "airflow.sdk",
             name: (*rest).to_string(),
         },
-        [
-            "airflow",
-            "decorators",
-            "base",
-            rest @ ("DecoratedMappedOperator"
-            | "DecoratedOperator"
-            | "TaskDecorator"
-            | "get_unique_task_id"
-            | "task_decorator_factory"),
-        ] => Replacement::SourceModuleMoved {
-            module: "airflow.sdk.bases.decorator",
-            name: (*rest).to_string(),
-        },
 
         // airflow.io
         ["airflow", "io", "path", "ObjectStoragePath"] => Replacement::SourceModuleMoved {
             module: "airflow.sdk",
             name: "ObjectStoragePath".to_string(),
         },
-        ["airflow", "io", "store", "attach"] => Replacement::SourceModuleMoved {
+        ["airflow", "io", "storage", "attach"] => Replacement::SourceModuleMoved {
             module: "airflow.sdk.io",
             name: "attach".to_string(),
         },
@@ -261,10 +245,6 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
                 name: (*rest).to_string(),
             }
         }
-        ["airflow", "models", "Param"] => Replacement::AutoImport {
-            module: "airflow.sdk.definitions.param",
-            name: "Param",
-        },
 
         // airflow.models.baseoperator
         [
@@ -280,30 +260,16 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             module: "airflow.sdk",
             name: "BaseOperatorLink",
         },
-
         // airflow.model..DAG
         ["airflow", "models", .., "DAG"] => Replacement::SourceModuleMoved {
             module: "airflow.sdk",
             name: "DAG".to_string(),
         },
-
-        // airflow.sensors.base
-        [
-            "airflow",
-            "sensors",
-            "base",
-            rest @ ("BaseSensorOperator" | "PokeReturnValue" | "poke_mode_only"),
-        ] => Replacement::SourceModuleMoved {
-            module: "airflow.sdk",
-            name: (*rest).to_string(),
-        },
-
         // airflow.timetables
         ["airflow", "timetables", "datasets", "DatasetOrTimeSchedule"] => Replacement::AutoImport {
             module: "airflow.timetables.assets",
             name: "AssetOrTimeSchedule",
         },
-
         // airflow.utils
         [
             "airflow",

crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR002_AIR002.py.snap

@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/airflow/mod.rs
 ---
-AIR002 `DAG` or `@dag` should have an explicit `schedule` argument
+AIR002 DAG should have an explicit `schedule` argument
  --> AIR002.py:4:1
   |
 2 | from airflow.timetables.simple import NullTimetable
@@ -12,7 +12,7 @@ AIR002 `DAG` or `@dag` should have an explicit `schedule` argument
 6 | DAG(dag_id="class_schedule", schedule="@hourly")
   |
 
-AIR002 `DAG` or `@dag` should have an explicit `schedule` argument
+AIR002 DAG should have an explicit `schedule` argument
   --> AIR002.py:13:2
    |
 13 | @dag()