Use a deprecated output format for the ecosystem check

Fixes a regression in the ecosystem checks from
https://github.com/astral-sh/ruff/pull/9687 which was causing them to
run for multiple hours due to the size of the output.

We need the concise format for comparisons.

We should probably update the ecosystem checks to actually diff the full
output in the future because that'd be nice.

.config/nextest.toml

@@ -1,8 +0,0 @@
-[profile.ci]
-# Print out output for failing tests as soon as they fail, and also at the end
-# of the run (for easy scrollability).
-failure-output = "immediate-final"
-# Do not cancel the test run on the first failure.
-fail-fast = false
-
-status-level = "skip"

.github/CODEOWNERS

@@ -7,9 +7,3 @@
 
 # Jupyter
 /crates/ruff_linter/src/jupyter/ @dhruvmanila
-/crates/ruff_formatter/ @MichaReiser
-/crates/ruff_python_formatter/ @MichaReiser
-/crates/ruff_python_parser/ @MichaReiser
-
-# flake8-pyi
-/crates/ruff_linter/src/rules/flake8_pyi/ @AlexWaygood

.github/dependabot.yml

@@ -9,10 +9,6 @@ updates:
       actions:
         patterns:
           - "*"
-    ignore:
-      # The latest versions of these are not compatible with our release workflow
-      - dependency-name: "actions/upload-artifact"
-      - dependency-name: "actions/download-artifact"
 
   - package-ecosystem: "cargo"
     directory: "/"

.github/workflows/ci.yaml

@@ -35,7 +35,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: tj-actions/changed-files@v42
+      - uses: tj-actions/changed-files@v41
         id: changed
         with:
           files_yaml: |
@@ -76,7 +76,6 @@ jobs:
   cargo-fmt:
     name: "cargo fmt"
     runs-on: ubuntu-latest
-    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - name: "Install Rust toolchain"
@@ -88,7 +87,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
       - name: "Install Rust toolchain"
@@ -102,21 +100,40 @@ jobs:
         run: cargo clippy -p ruff_wasm --target wasm32-unknown-unknown --all-features --locked -- -D warnings
 
   cargo-test-linux:
-    name: "cargo test (linux)"
     runs-on: ubuntu-latest
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 20
+    name: "cargo test (linux)"
     steps:
       - uses: actions/checkout@v4
       - name: "Install Rust toolchain"
         run: rustup show
-      - name: "Install mold"
-        uses: rui314/setup-mold@v1
-      - name: "Install cargo nextest"
+      - name: "Install cargo insta"
         uses: taiki-e/install-action@v2
         with:
-          tool: cargo-nextest
+          tool: cargo-insta
+      - uses: Swatinem/rust-cache@v2
+      - name: "Run tests"
+        run: cargo insta test --all --all-features --unreferenced reject
+      # Check for broken links in the documentation.
+      - run: cargo doc --all --no-deps
+        env:
+          # Setting RUSTDOCFLAGS because `cargo doc --check` isn't yet implemented (https://github.com/rust-lang/cargo/issues/10025).
+          RUSTDOCFLAGS: "-D warnings"
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ruff
+          path: target/debug/ruff
+
+  cargo-test-windows:
+    runs-on: windows-latest
+    needs: determine_changes
+    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
+    name: "cargo test (windows)"
+    steps:
+      - uses: actions/checkout@v4
+      - name: "Install Rust toolchain"
+        run: rustup show
       - name: "Install cargo insta"
         uses: taiki-e/install-action@v2
         with:
@@ -124,47 +141,14 @@ jobs:
       - uses: Swatinem/rust-cache@v2
       - name: "Run tests"
         shell: bash
-        env:
-          NEXTEST_PROFILE: "ci"
-        run: cargo insta test --all-features --unreferenced reject --test-runner nextest
-
-      # Check for broken links in the documentation.
-      - run: cargo doc --all --no-deps
-        env:
-          # Setting RUSTDOCFLAGS because `cargo doc --check` isn't yet implemented (https://github.com/rust-lang/cargo/issues/10025).
-          RUSTDOCFLAGS: "-D warnings"
-      - uses: actions/upload-artifact@v4
-        with:
-          name: ruff
-          path: target/debug/ruff
-
-  cargo-test-windows:
-    name: "cargo test (windows)"
-    runs-on: windows-latest
-    needs: determine_changes
-    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-nextest
-      - uses: Swatinem/rust-cache@v2
-      - name: "Run tests"
-        shell: bash
-        run: |
-          cargo nextest run --all-features --profile ci
-          cargo test --all-features --doc
+        # We can't reject unreferenced snapshots on windows because flake8_executable can't run on windows
+        run: cargo insta test --all --all-features
 
   cargo-test-wasm:
-    name: "cargo test (wasm)"
     runs-on: ubuntu-latest
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 10
+    name: "cargo test (wasm)"
     steps:
       - uses: actions/checkout@v4
       - name: "Install Rust toolchain"
@@ -182,11 +166,10 @@ jobs:
           wasm-pack test --node
 
   cargo-fuzz:
-    name: "cargo fuzz"
     runs-on: ubuntu-latest
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 10
+    name: "cargo fuzz"
     steps:
       - uses: actions/checkout@v4
       - name: "Install Rust toolchain"
@@ -205,7 +188,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
       - name: "Install Rust toolchain"
@@ -231,14 +213,13 @@ jobs:
     if: github.event_name == 'pull_request' && ${{
       needs.determine_changes.outputs.code == 'true'
       }}
-    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         name: Download comparison Ruff binary
         id: ruff-target
         with:
@@ -250,7 +231,6 @@ jobs:
         with:
           name: ruff
           branch: ${{ github.event.pull_request.base.ref }}
-          workflow: "ci.yaml"
           check_artifacts: true
 
       - name: Install ruff-ecosystem
@@ -325,13 +305,13 @@ jobs:
         run: |
           echo ${{ github.event.number }} > pr-number
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         name: Upload PR Number
         with:
           name: pr-number
           path: pr-number
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         name: Upload Results
         with:
           name: ecosystem-result
@@ -342,7 +322,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
       - name: "Install nightly Rust toolchain"
@@ -357,7 +336,6 @@ jobs:
   python-package:
     name: "python package"
     runs-on: ubuntu-latest
-    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -382,7 +360,6 @@ jobs:
   pre-commit:
     name: "pre-commit"
     runs-on: ubuntu-latest
-    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -394,7 +371,7 @@ jobs:
       - name: "Install pre-commit"
         run: pip install pre-commit
       - name: "Cache pre-commit"
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pre-commit
           key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
@@ -411,7 +388,6 @@ jobs:
   docs:
     name: "mkdocs"
     runs-on: ubuntu-latest
-    timeout-minutes: 10
     env:
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
@@ -419,7 +395,7 @@ jobs:
       - uses: actions/setup-python@v5
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        uses: webfactory/ssh-agent@v0.9.0
+        uses: webfactory/ssh-agent@v0.8.0
         with:
           ssh-private-key: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY }}
       - name: "Install Rust toolchain"
@@ -449,7 +425,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: determine_changes
     if: needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main'
-    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - name: "Install Rust toolchain"
@@ -466,13 +441,12 @@ jobs:
   check-ruff-lsp:
     name: "test ruff-lsp"
     runs-on: ubuntu-latest
-    timeout-minutes: 5
     needs:
       - cargo-test-linux
       - determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
     steps:
-      - uses: extractions/setup-just@v2
+      - uses: extractions/setup-just@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -485,7 +459,7 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         name: Download development ruff binary
         id: ruff-target
         with:
@@ -510,7 +484,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 20
     steps:
       - name: "Checkout Branch"
         uses: actions/checkout@v4

.github/workflows/docs.yaml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/setup-python@v5
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        uses: webfactory/ssh-agent@v0.9.0
+        uses: webfactory/ssh-agent@v0.8.0
         with:
           ssh-private-key: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY }}
       - name: "Install Rust toolchain"

.github/workflows/pr-comment.yaml

@@ -61,7 +61,7 @@ jobs:
           echo 'EOF' >> $GITHUB_OUTPUT
 
       - name: Find existing comment
-        uses: peter-evans/find-comment@v3
+        uses: peter-evans/find-comment@v2
         if: steps.generate-comment.outcome == 'success'
         id: find-comment
         with:
@@ -71,7 +71,7 @@ jobs:
 
       - name: Create or update comment
         if: steps.find-comment.outcome == 'success'
-        uses: peter-evans/create-or-update-comment@v4
+        uses: peter-evans/create-or-update-comment@v3
         with:
           comment-id: ${{ steps.find-comment.outputs.comment-id }}
           issue-number: ${{ steps.pr-number.outputs.pr-number }}

.github/workflows/release.yaml

@@ -28,7 +28,6 @@ env:
   CARGO_NET_RETRY: 10
   CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
-  MATURIN_VERSION: "1.4.0"
 
 jobs:
   sdist:
@@ -45,7 +44,6 @@ jobs:
       - name: "Build sdist"
         uses: PyO3/maturin-action@v1
         with:
-          maturin-version: ${{ env.MATURIN_VERSION }}
           command: sdist
           args: --out dist
       - name: "Test sdist"
@@ -54,9 +52,9 @@ jobs:
           ruff --help
           python -m ruff --help
       - name: "Upload sdist"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: wheels-sdist
+          name: wheels
           path: dist
 
   macos-x86_64:
@@ -74,7 +72,6 @@ jobs:
       - name: "Build wheels - x86_64"
         uses: PyO3/maturin-action@v1
         with:
-          maturin-version: ${{ env.MATURIN_VERSION }}
           target: x86_64
           args: --release --locked --out dist
       - name: "Test wheel - x86_64"
@@ -83,9 +80,9 @@ jobs:
           ruff --help
           python -m ruff --help
       - name: "Upload wheels"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: wheels-macos-x86_64
+          name: wheels
           path: dist
       - name: "Archive binary"
         run: |
@@ -93,9 +90,9 @@ jobs:
           tar czvf $ARCHIVE_FILE -C target/x86_64-apple-darwin/release ruff
           shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
       - name: "Upload binary"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: binaries-macos-x86_64
+          name: binaries
           path: |
             *.tar.gz
             *.sha256
@@ -115,7 +112,6 @@ jobs:
       - name: "Build wheels - universal2"
         uses: PyO3/maturin-action@v1
         with:
-          maturin-version: ${{ env.MATURIN_VERSION }}
           args: --release --locked --target universal2-apple-darwin --out dist
       - name: "Test wheel - universal2"
         run: |
@@ -123,9 +119,9 @@ jobs:
           ruff --help
           python -m ruff --help
       - name: "Upload wheels"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: wheels-aarch64-apple-darwin
+          name: wheels
           path: dist
       - name: "Archive binary"
         run: |
@@ -133,9 +129,9 @@ jobs:
           tar czvf $ARCHIVE_FILE -C target/aarch64-apple-darwin/release ruff
           shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
       - name: "Upload binary"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: binaries-aarch64-apple-darwin
+          name: binaries
           path: |
             *.tar.gz
             *.sha256
@@ -164,7 +160,6 @@ jobs:
       - name: "Build wheels"
         uses: PyO3/maturin-action@v1
         with:
-          maturin-version: ${{ env.MATURIN_VERSION }}
           target: ${{ matrix.platform.target }}
           args: --release --locked --out dist
       - name: "Test wheel"
@@ -175,9 +170,9 @@ jobs:
           ruff --help
           python -m ruff --help
       - name: "Upload wheels"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: wheels-${{ matrix.platform.target }}
+          name: wheels
           path: dist
       - name: "Archive binary"
         shell: bash
@@ -186,9 +181,9 @@ jobs:
           7z a $ARCHIVE_FILE ./target/${{ matrix.platform.target }}/release/ruff.exe
           sha256sum $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
       - name: "Upload binary"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: binaries-${{ matrix.platform.target }}
+          name: binaries
           path: |
             *.zip
             *.sha256
@@ -213,7 +208,6 @@ jobs:
       - name: "Build wheels"
         uses: PyO3/maturin-action@v1
         with:
-          maturin-version: ${{ env.MATURIN_VERSION }}
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --locked --out dist
@@ -224,9 +218,9 @@ jobs:
           ruff --help
           python -m ruff --help
       - name: "Upload wheels"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: wheels-${{ matrix.target }}
+          name: wheels
           path: dist
       - name: "Archive binary"
         run: |
@@ -234,9 +228,9 @@ jobs:
           tar czvf $ARCHIVE_FILE -C target/${{ matrix.target }}/release ruff
           shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
       - name: "Upload binary"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: binaries-${{ matrix.target }}
+          name: binaries
           path: |
             *.tar.gz
             *.sha256
@@ -257,12 +251,8 @@ jobs:
             arch: s390x
           - target: powerpc64le-unknown-linux-gnu
             arch: ppc64le
-            # see https://github.com/astral-sh/ruff/issues/10073
-            maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
           - target: powerpc64-unknown-linux-gnu
             arch: ppc64
-            # see https://github.com/astral-sh/ruff/issues/10073
-            maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
 
     steps:
       - uses: actions/checkout@v4
@@ -276,7 +266,6 @@ jobs:
       - name: "Build wheels"
         uses: PyO3/maturin-action@v1
         with:
-          maturin-version: ${{ env.MATURIN_VERSION }}
           target: ${{ matrix.platform.target }}
           manylinux: auto
           docker-options: ${{ matrix.platform.maturin_docker_options }}
@@ -296,9 +285,9 @@ jobs:
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
             ruff --help
       - name: "Upload wheels"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: wheels-${{ matrix.platform.target }}
+          name: wheels
           path: dist
       - name: "Archive binary"
         run: |
@@ -306,9 +295,9 @@ jobs:
           tar czvf $ARCHIVE_FILE -C target/${{ matrix.platform.target }}/release ruff
           shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
       - name: "Upload binary"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: binaries-${{ matrix.platform.target }}
+          name: binaries
           path: |
             *.tar.gz
             *.sha256
@@ -333,7 +322,6 @@ jobs:
       - name: "Build wheels"
         uses: PyO3/maturin-action@v1
         with:
-          maturin-version: ${{ env.MATURIN_VERSION }}
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
           args: --release --locked --out dist
@@ -349,9 +337,9 @@ jobs:
             .venv/bin/pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
             .venv/bin/ruff check --help
       - name: "Upload wheels"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: wheels-${{ matrix.target }}
+          name: wheels
           path: dist
       - name: "Archive binary"
         run: |
@@ -359,9 +347,9 @@ jobs:
           tar czvf $ARCHIVE_FILE -C target/${{ matrix.target }}/release ruff
           shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
       - name: "Upload binary"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: binaries-${{ matrix.target }}
+          name: binaries
           path: |
             *.tar.gz
             *.sha256
@@ -389,7 +377,6 @@ jobs:
       - name: "Build wheels"
         uses: PyO3/maturin-action@v1
         with:
-          maturin-version: ${{ env.MATURIN_VERSION }}
           target: ${{ matrix.platform.target }}
           manylinux: musllinux_1_2
           args: --release --locked --out dist
@@ -407,9 +394,9 @@ jobs:
             .venv/bin/pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
             .venv/bin/ruff check --help
       - name: "Upload wheels"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: wheels-${{ matrix.platform.target }}
+          name: wheels
           path: dist
       - name: "Archive binary"
         run: |
@@ -417,9 +404,9 @@ jobs:
           tar czvf $ARCHIVE_FILE -C target/${{ matrix.platform.target }}/release ruff
           shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
       - name: "Upload binary"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: binaries-${{ matrix.platform.target }}
+          name: binaries
           path: |
             *.tar.gz
             *.sha256
@@ -476,11 +463,10 @@ jobs:
       # For pypi trusted publishing
       id-token: write
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
-          pattern: wheels-*
+          name: wheels
           path: wheels
-          merge-multiple: true
       - name: Publish to PyPi
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
@@ -520,11 +506,10 @@ jobs:
       # For GitHub release publishing
       contents: write
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
-          pattern: binaries-*
+          name: binaries
           path: binaries
-          merge-multiple: true
       - name: "Publish to GitHub"
         uses: softprops/action-gh-release@v1
         with:

BREAKING_CHANGES.md

@@ -1,56 +1,5 @@
 # Breaking Changes
 
-## 0.3.0
-
-### Ruff 2024.2 style
-
-The formatter now formats code according to the Ruff 2024.2 style guide. Read the [changelog](./CHANGELOG.md#030) for a detailed list of stabilized style changes.
-
-### `isort`: Use one blank line after imports in typing stub files ([#9971](https://github.com/astral-sh/ruff/pull/9971))
-
-Previously, Ruff used one or two blank lines (or the number configured by `isort.lines-after-imports`) after imports in typing stub files (`.pyi` files).
-The [typing style guide for stubs](https://typing.readthedocs.io/en/latest/source/stubs.html#style-guide) recommends using at most 1 blank line for grouping.
-As of this release, `isort` now always uses one blank line after imports in stub files, the same as the formatter.
-
-### `build` is no longer excluded by default ([#10093](https://github.com/astral-sh/ruff/pull/10093))
-
-Ruff maintains a list of directories and files that are excluded by default. This list now consists of the following patterns:
-
-- `.bzr`
-- `.direnv`
-- `.eggs`
-- `.git`
-- `.git-rewrite`
-- `.hg`
-- `.ipynb_checkpoints`
-- `.mypy_cache`
-- `.nox`
-- `.pants.d`
-- `.pyenv`
-- `.pytest_cache`
-- `.pytype`
-- `.ruff_cache`
-- `.svn`
-- `.tox`
-- `.venv`
-- `.vscode`
-- `__pypackages__`
-- `_build`
-- `buck-out`
-- `dist`
-- `node_modules`
-- `site-packages`
-- `venv`
-
-Previously, the `build` directory was included in this list. However, the `build` directory tends to be a not-unpopular directory
-name, and excluding it by default caused confusion. Ruff now no longer excludes `build` except if it is excluded by a `.gitignore` file
-or because it is listed in `extend-exclude`.
-
-### `--format` is no longer a valid `rule` or `linter` command option
-
-Previously, `ruff rule` and `ruff linter` accepted the `--format <FORMAT>` option as an alias for `--output-format`. Ruff no longer
-supports this alias. Please use `ruff rule --output-format <FORMAT>` and `ruff linter --output-format <FORMAT>` instead.
-
 ## 0.1.9
 
 ### `site-packages` is now excluded by default ([#5513](https://github.com/astral-sh/ruff/pull/5513))

CHANGELOG.md

@@ -1,421 +1,5 @@
 # Changelog
 
-## 0.3.1
-
-### Preview features
-
-- \[`pycodestyle`\] Fix E301 not triggering on decorated methods. ([#10117](https://github.com/astral-sh/ruff/pull/10117))
-- \[`pycodestyle`\] Respect `isort` settings in blank line rules (`E3*`) ([#10096](https://github.com/astral-sh/ruff/pull/10096))
-- \[`pycodestyle`\] Make blank lines in typing stub files optional (`E3*`) ([#10098](https://github.com/astral-sh/ruff/pull/10098))
-- \[`pylint`\] Implement `singledispatch-method` (`E1519`) ([#10140](https://github.com/astral-sh/ruff/pull/10140))
-- \[`pylint`\] Implement `useless-exception-statement` (`W0133`) ([#10176](https://github.com/astral-sh/ruff/pull/10176))
-
-### Rule changes
-
-- \[`flake8-debugger`\] Check for use of `debugpy` and `ptvsd` debug modules (#10177) ([#10194](https://github.com/astral-sh/ruff/pull/10194))
-- \[`pyupgrade`\] Generate diagnostic for all valid f-string conversions regardless of line length (`UP032`) ([#10238](https://github.com/astral-sh/ruff/pull/10238))
-- \[`pep8_naming`\] Add fixes for `N804` and `N805` ([#10215](https://github.com/astral-sh/ruff/pull/10215))
-
-### CLI
-
-- Colorize the output of `ruff format --diff` ([#10110](https://github.com/astral-sh/ruff/pull/10110))
-- Make `--config` and `--isolated` global flags ([#10150](https://github.com/astral-sh/ruff/pull/10150))
-- Correctly expand tildes and environment variables in paths passed to `--config` ([#10219](https://github.com/astral-sh/ruff/pull/10219))
-
-### Configuration
-
-- Accept a PEP 440 version specifier for `required-version` ([#10216](https://github.com/astral-sh/ruff/pull/10216))
-- Implement isort's `default-section` setting ([#10149](https://github.com/astral-sh/ruff/pull/10149))
-
-### Bug fixes
-
-- Remove trailing space from `CapWords` message ([#10220](https://github.com/astral-sh/ruff/pull/10220))
-- Respect external codes in file-level exemptions ([#10203](https://github.com/astral-sh/ruff/pull/10203))
-- \[`flake8-raise`\] Avoid false-positives for parens-on-raise with `future.exception()` (`RSE102`) ([#10206](https://github.com/astral-sh/ruff/pull/10206))
-- \[`pylint`\] Add fix for unary expressions in `PLC2801` ([#9587](https://github.com/astral-sh/ruff/pull/9587))
-- \[`ruff`\] Fix RUF028 not allowing `# fmt: skip` on match cases ([#10178](https://github.com/astral-sh/ruff/pull/10178))
-
-## 0.3.0
-
-This release introduces the new Ruff formatter 2024.2 style and adds a new lint rule to
-detect invalid formatter suppression comments.
-
-### Preview features
-
-- \[`flake8-bandit`\] Remove suspicious-lxml-import (`S410`) ([#10154](https://github.com/astral-sh/ruff/pull/10154))
-- \[`pycodestyle`\] Allow `os.environ` modifications between imports (`E402`) ([#10066](https://github.com/astral-sh/ruff/pull/10066))
-- \[`pycodestyle`\] Don't warn about a single whitespace character before a comma in a tuple (`E203`) ([#10094](https://github.com/astral-sh/ruff/pull/10094))
-
-### Rule changes
-
-- \[`eradicate`\] Detect commented out `case` statements (`ERA001`) ([#10055](https://github.com/astral-sh/ruff/pull/10055))
-- \[`eradicate`\] Detect single-line code for `try:`, `except:`, etc. (`ERA001`) ([#10057](https://github.com/astral-sh/ruff/pull/10057))
-- \[`flake8-boolean-trap`\] Allow boolean positionals in `__post_init__` ([#10027](https://github.com/astral-sh/ruff/pull/10027))
-- \[`flake8-copyright`\] Allow © in copyright notices ([#10065](https://github.com/astral-sh/ruff/pull/10065))
-- \[`isort`\]: Use one blank line after imports in typing stub files ([#9971](https://github.com/astral-sh/ruff/pull/9971))
-- \[`pylint`\] New Rule `dict-iter-missing-items` (`PLE1141`) ([#9845](https://github.com/astral-sh/ruff/pull/9845))
-- \[`pylint`\] Ignore `sys.version` and `sys.platform` (`PLR1714`) ([#10054](https://github.com/astral-sh/ruff/pull/10054))
-- \[`pyupgrade`\] Detect literals with unary operators (`UP018`) ([#10060](https://github.com/astral-sh/ruff/pull/10060))
-- \[`ruff`\] Expand rule for `list(iterable).pop(0)` idiom (`RUF015`) ([#10148](https://github.com/astral-sh/ruff/pull/10148))
-
-### Formatter
-
-This release introduces the Ruff 2024.2 style, stabilizing the following changes:
-
-- Prefer splitting the assignment's value over the target or type annotation ([#8943](https://github.com/astral-sh/ruff/pull/8943))
-- Remove blank lines before class docstrings ([#9154](https://github.com/astral-sh/ruff/pull/9154))
-- Wrap multiple context managers in `with` parentheses when targeting Python 3.9 or newer ([#9222](https://github.com/astral-sh/ruff/pull/9222))
-- Add a blank line after nested classes with a dummy body (`...`) in typing stub files ([#9155](https://github.com/astral-sh/ruff/pull/9155))
-- Reduce vertical spacing for classes and functions with a dummy (`...`) body ([#7440](https://github.com/astral-sh/ruff/issues/7440), [#9240](https://github.com/astral-sh/ruff/pull/9240))
-- Add a blank line after the module docstring ([#8283](https://github.com/astral-sh/ruff/pull/8283))
-- Parenthesize long type hints in assignments ([#9210](https://github.com/astral-sh/ruff/pull/9210))
-- Preserve indent for single multiline-string call-expressions ([#9673](https://github.com/astral-sh/ruff/pull/9637))
-- Normalize hex escape and unicode escape sequences ([#9280](https://github.com/astral-sh/ruff/pull/9280))
-- Format module docstrings ([#9725](https://github.com/astral-sh/ruff/pull/9725))
-
-### CLI
-
-- Explicitly disallow `extend` as part of a `--config` flag ([#10135](https://github.com/astral-sh/ruff/pull/10135))
-- Remove `build` from the default exclusion list ([#10093](https://github.com/astral-sh/ruff/pull/10093))
-- Deprecate `ruff <path>`, `ruff --explain`, `ruff --clean`, and `ruff --generate-shell-completion` in favor of `ruff check <path>`, `ruff rule`, `ruff clean`, and `ruff generate-shell-completion` ([#10169](https://github.com/astral-sh/ruff/pull/10169))
-- Remove the deprecated CLI option `--format` from `ruff rule` and `ruff linter` ([#10170](https://github.com/astral-sh/ruff/pull/10170))
-
-### Bug fixes
-
-- \[`flake8-bugbear`\] Avoid adding default initializers to stubs (`B006`) ([#10152](https://github.com/astral-sh/ruff/pull/10152))
-- \[`flake8-type-checking`\] Respect runtime-required decorators for function signatures ([#10091](https://github.com/astral-sh/ruff/pull/10091))
-- \[`pycodestyle`\] Mark fixes overlapping with a multiline string as unsafe (`W293`) ([#10049](https://github.com/astral-sh/ruff/pull/10049))
-- \[`pydocstyle`\] Trim whitespace when removing blank lines after section (`D413`) ([#10162](https://github.com/astral-sh/ruff/pull/10162))
-- \[`pylint`\] Delete entire statement, including semicolons (`PLR0203`) ([#10074](https://github.com/astral-sh/ruff/pull/10074))
-- \[`ruff`\] Avoid f-string false positives in `gettext` calls (`RUF027`) ([#10118](https://github.com/astral-sh/ruff/pull/10118))
-- Fix `ruff` crashing on PowerPC systems because of too small page size ([#10080](https://github.com/astral-sh/ruff/pull/10080))
-
-### Performance
-
-- Add cold attribute to less likely printer queue branches in the formatter ([#10121](https://github.com/astral-sh/ruff/pull/10121))
-- Skip unnecessary string normalization in the formatter ([#10116](https://github.com/astral-sh/ruff/pull/10116))
-
-### Documentation
-
-- Remove "Beta" Label from formatter documentation ([#10144](https://github.com/astral-sh/ruff/pull/10144))
-- `line-length` option: fix link to `pycodestyle.max-line-length` ([#10136](https://github.com/astral-sh/ruff/pull/10136))
-
-## 0.2.2
-
-Highlights include:
-
-- Initial support formatting f-strings (in `--preview`).
-- Support for overriding arbitrary configuration options via the CLI through an expanded `--config`
-    argument (e.g., `--config "lint.isort.combine-as-imports=false"`).
-- Significant performance improvements in Ruff's lexer, parser, and lint rules.
-
-### Preview features
-
-- Implement minimal f-string formatting ([#9642](https://github.com/astral-sh/ruff/pull/9642))
-- \[`pycodestyle`\] Add blank line(s) rules (`E301`, `E302`, `E303`, `E304`, `E305`, `E306`) ([#9266](https://github.com/astral-sh/ruff/pull/9266))
-- \[`refurb`\] Implement `readlines_in_for` (`FURB129`) ([#9880](https://github.com/astral-sh/ruff/pull/9880))
-
-### Rule changes
-
-- \[`ruff`\] Ensure closing parentheses for multiline sequences are always on their own line (`RUF022`, `RUF023`) ([#9793](https://github.com/astral-sh/ruff/pull/9793))
-- \[`numpy`\] Add missing deprecation violations (`NPY002`) ([#9862](https://github.com/astral-sh/ruff/pull/9862))
-- \[`flake8-bandit`\] Detect `mark_safe` usages in decorators ([#9887](https://github.com/astral-sh/ruff/pull/9887))
-- \[`ruff`\] Expand `asyncio-dangling-task` (`RUF006`) to include `new_event_loop` ([#9976](https://github.com/astral-sh/ruff/pull/9976))
-- \[`flake8-pyi`\] Ignore 'unused' private type dicts in class scopes ([#9952](https://github.com/astral-sh/ruff/pull/9952))
-
-### Formatter
-
-- Docstring formatting: Preserve tab indentation when using `indent-style=tabs` ([#9915](https://github.com/astral-sh/ruff/pull/9915))
-- Disable top-level docstring formatting for notebooks ([#9957](https://github.com/astral-sh/ruff/pull/9957))
-- Stabilize quote-style's `preserve` mode ([#9922](https://github.com/astral-sh/ruff/pull/9922))
-
-### CLI
-
-- Allow arbitrary configuration options to be overridden via the CLI ([#9599](https://github.com/astral-sh/ruff/pull/9599))
-
-### Bug fixes
-
-- Make `show-settings` filters directory-agnostic ([#9866](https://github.com/astral-sh/ruff/pull/9866))
-- Respect duplicates when rewriting type aliases ([#9905](https://github.com/astral-sh/ruff/pull/9905))
-- Respect tuple assignments in typing analyzer ([#9969](https://github.com/astral-sh/ruff/pull/9969))
-- Use atomic write when persisting cache ([#9981](https://github.com/astral-sh/ruff/pull/9981))
-- Use non-parenthesized range for `DebugText` ([#9953](https://github.com/astral-sh/ruff/pull/9953))
-- \[`flake8-simplify`\] Avoid false positive with `async` for loops (`SIM113`) ([#9996](https://github.com/astral-sh/ruff/pull/9996))
-- \[`flake8-trio`\] Respect `async with` in `timeout-without-await` ([#9859](https://github.com/astral-sh/ruff/pull/9859))
-- \[`perflint`\] Catch a wider range of mutations in `PERF101` ([#9955](https://github.com/astral-sh/ruff/pull/9955))
-- \[`pycodestyle`\] Fix `E30X` panics on blank lines with trailing white spaces ([#9907](https://github.com/astral-sh/ruff/pull/9907))
-- \[`pydocstyle`\] Allow using `parameters` as a subsection header (`D405`) ([#9894](https://github.com/astral-sh/ruff/pull/9894))
-- \[`pydocstyle`\] Fix blank-line docstring rules for module-level docstrings ([#9878](https://github.com/astral-sh/ruff/pull/9878))
-- \[`pylint`\] Accept 0.0 and 1.0 as common magic values (`PLR2004`) ([#9964](https://github.com/astral-sh/ruff/pull/9964))
-- \[`pylint`\] Avoid suggesting set rewrites for non-hashable types ([#9956](https://github.com/astral-sh/ruff/pull/9956))
-- \[`ruff`\] Avoid false negatives with string literals inside of method calls (`RUF027`) ([#9865](https://github.com/astral-sh/ruff/pull/9865))
-- \[`ruff`\] Fix panic on with f-string detection (`RUF027`) ([#9990](https://github.com/astral-sh/ruff/pull/9990))
-- \[`ruff`\] Ignore builtins when detecting missing f-strings ([#9849](https://github.com/astral-sh/ruff/pull/9849))
-
-### Performance
-
-- Use `memchr` for string lexing ([#9888](https://github.com/astral-sh/ruff/pull/9888))
-- Use `memchr` for tab-indentation detection ([#9853](https://github.com/astral-sh/ruff/pull/9853))
-- Reduce `Result<Tok, LexicalError>` size by using `Box<str>` instead of `String` ([#9885](https://github.com/astral-sh/ruff/pull/9885))
-- Reduce size of `Expr` from 80 to 64 bytes ([#9900](https://github.com/astral-sh/ruff/pull/9900))
-- Improve trailing comma rule performance ([#9867](https://github.com/astral-sh/ruff/pull/9867))
-- Remove unnecessary string cloning from the parser ([#9884](https://github.com/astral-sh/ruff/pull/9884))
-
-## 0.2.1
-
-This release includes support for range formatting (i.e., the ability to format specific lines
-within a source file).
-
-### Preview features
-
-- \[`refurb`\] Implement `missing-f-string-syntax` (`RUF027`) ([#9728](https://github.com/astral-sh/ruff/pull/9728))
-- Format module-level docstrings ([#9725](https://github.com/astral-sh/ruff/pull/9725))
-
-### Formatter
-
-- Add `--range` option to `ruff format` ([#9733](https://github.com/astral-sh/ruff/pull/9733))
-- Don't trim last empty line in docstrings ([#9813](https://github.com/astral-sh/ruff/pull/9813))
-
-### Bug fixes
-
-- Skip empty lines when determining base indentation ([#9795](https://github.com/astral-sh/ruff/pull/9795))
-- Drop `__get__` and `__set__` from `unnecessary-dunder-call` ([#9791](https://github.com/astral-sh/ruff/pull/9791))
-- Respect generic `Protocol` in ellipsis removal ([#9841](https://github.com/astral-sh/ruff/pull/9841))
-- Revert "Use publicly available Apple Silicon runners (#9726)" ([#9834](https://github.com/astral-sh/ruff/pull/9834))
-
-### Performance
-
-- Skip LibCST parsing for standard dedent adjustments ([#9769](https://github.com/astral-sh/ruff/pull/9769))
-- Remove CST-based fixer for `C408` ([#9822](https://github.com/astral-sh/ruff/pull/9822))
-- Add our own ignored-names abstractions ([#9802](https://github.com/astral-sh/ruff/pull/9802))
-- Remove CST-based fixers for `C400`, `C401`, `C410`, and `C418` ([#9819](https://github.com/astral-sh/ruff/pull/9819))
-- Use `AhoCorasick` to speed up quote match ([#9773](https://github.com/astral-sh/ruff/pull/9773))
-- Remove CST-based fixers for `C405` and `C409` ([#9821](https://github.com/astral-sh/ruff/pull/9821))
-- Add fast-path for comment detection ([#9808](https://github.com/astral-sh/ruff/pull/9808))
-- Invert order of checks in `zero-sleep-call` ([#9766](https://github.com/astral-sh/ruff/pull/9766))
-- Short-circuit typing matches based on imports ([#9800](https://github.com/astral-sh/ruff/pull/9800))
-- Run dunder method rule on methods directly ([#9815](https://github.com/astral-sh/ruff/pull/9815))
-- Track top-level module imports in the semantic model ([#9775](https://github.com/astral-sh/ruff/pull/9775))
-- Slight speed-up for lowercase and uppercase identifier checks ([#9798](https://github.com/astral-sh/ruff/pull/9798))
-- Remove LibCST-based fixer for `C403` ([#9818](https://github.com/astral-sh/ruff/pull/9818))
-
-### Documentation
-
-- Update `max-pos-args` example to `max-positional-args` ([#9797](https://github.com/astral-sh/ruff/pull/9797))
-- Fixed example code in `weak_cryptographic_key.rs` ([#9774](https://github.com/astral-sh/ruff/pull/9774))
-- Fix references to deprecated `ANN` rules in changelog ([#9771](https://github.com/astral-sh/ruff/pull/9771))
-- Fix default for `max-positional-args` ([#9838](https://github.com/astral-sh/ruff/pull/9838))
-
-## 0.2.0
-
-### Breaking changes
-
-- The `NURSERY` selector cannot be used anymore
-- Legacy selection of nursery rules by exact codes is no longer allowed without preview enabled
-
-See also, the "Remapped rules" section which may result in disabled rules.
-
-### Deprecations
-
-The following rules are now deprecated:
-
-- [`missing-type-self`](https://docs.astral.sh/ruff/rules/missing-type-self/) (`ANN101`)
-- [`missing-type-cls`](https://docs.astral.sh/ruff/rules/missing-type-cls/) (`ANN102`)
-
-The following command line options are now deprecated:
-
-- `--show-source`; use `--output-format full` instead
-- `--no-show-source`; use `--output-format concise` instead
-- `--output-format text`; use `full` or `concise` instead
-
-The following settings have moved and the previous name is deprecated:
-
-- `ruff.allowed-confusables` → [`ruff.lint.allowed-confusables`](https://docs.astral.sh//ruff/settings/#lint_allowed-confusables)
-- `ruff.dummy-variable-rgx` → [`ruff.lint.dummy-variable-rgx`](https://docs.astral.sh//ruff/settings/#lint_dummy-variable-rgx)
-- `ruff.explicit-preview-rules` → [`ruff.lint.explicit-preview-rules`](https://docs.astral.sh//ruff/settings/#lint_explicit-preview-rules)
-- `ruff.extend-fixable` → [`ruff.lint.extend-fixable`](https://docs.astral.sh//ruff/settings/#lint_extend-fixable)
-- `ruff.extend-ignore` → [`ruff.lint.extend-ignore`](https://docs.astral.sh//ruff/settings/#lint_extend-ignore)
-- `ruff.extend-per-file-ignores` → [`ruff.lint.extend-per-file-ignores`](https://docs.astral.sh//ruff/settings/#lint_extend-per-file-ignores)
-- `ruff.extend-safe-fixes` → [`ruff.lint.extend-safe-fixes`](https://docs.astral.sh//ruff/settings/#lint_extend-safe-fixes)
-- `ruff.extend-select` → [`ruff.lint.extend-select`](https://docs.astral.sh//ruff/settings/#lint_extend-select)
-- `ruff.extend-unfixable` → [`ruff.lint.extend-unfixable`](https://docs.astral.sh//ruff/settings/#lint_extend-unfixable)
-- `ruff.extend-unsafe-fixes` → [`ruff.lint.extend-unsafe-fixes`](https://docs.astral.sh//ruff/settings/#lint_extend-unsafe-fixes)
-- `ruff.external` → [`ruff.lint.external`](https://docs.astral.sh//ruff/settings/#lint_external)
-- `ruff.fixable` → [`ruff.lint.fixable`](https://docs.astral.sh//ruff/settings/#lint_fixable)
-- `ruff.flake8-annotations` → [`ruff.lint.flake8-annotations`](https://docs.astral.sh//ruff/settings/#lint_flake8-annotations)
-- `ruff.flake8-bandit` → [`ruff.lint.flake8-bandit`](https://docs.astral.sh//ruff/settings/#lint_flake8-bandit)
-- `ruff.flake8-bugbear` → [`ruff.lint.flake8-bugbear`](https://docs.astral.sh//ruff/settings/#lint_flake8-bugbear)
-- `ruff.flake8-builtins` → [`ruff.lint.flake8-builtins`](https://docs.astral.sh//ruff/settings/#lint_flake8-builtins)
-- `ruff.flake8-comprehensions` → [`ruff.lint.flake8-comprehensions`](https://docs.astral.sh//ruff/settings/#lint_flake8-comprehensions)
-- `ruff.flake8-copyright` → [`ruff.lint.flake8-copyright`](https://docs.astral.sh//ruff/settings/#lint_flake8-copyright)
-- `ruff.flake8-errmsg` → [`ruff.lint.flake8-errmsg`](https://docs.astral.sh//ruff/settings/#lint_flake8-errmsg)
-- `ruff.flake8-gettext` → [`ruff.lint.flake8-gettext`](https://docs.astral.sh//ruff/settings/#lint_flake8-gettext)
-- `ruff.flake8-implicit-str-concat` → [`ruff.lint.flake8-implicit-str-concat`](https://docs.astral.sh//ruff/settings/#lint_flake8-implicit-str-concat)
-- `ruff.flake8-import-conventions` → [`ruff.lint.flake8-import-conventions`](https://docs.astral.sh//ruff/settings/#lint_flake8-import-conventions)
-- `ruff.flake8-pytest-style` → [`ruff.lint.flake8-pytest-style`](https://docs.astral.sh//ruff/settings/#lint_flake8-pytest-style)
-- `ruff.flake8-quotes` → [`ruff.lint.flake8-quotes`](https://docs.astral.sh//ruff/settings/#lint_flake8-quotes)
-- `ruff.flake8-self` → [`ruff.lint.flake8-self`](https://docs.astral.sh//ruff/settings/#lint_flake8-self)
-- `ruff.flake8-tidy-imports` → [`ruff.lint.flake8-tidy-imports`](https://docs.astral.sh//ruff/settings/#lint_flake8-tidy-imports)
-- `ruff.flake8-type-checking` → [`ruff.lint.flake8-type-checking`](https://docs.astral.sh//ruff/settings/#lint_flake8-type-checking)
-- `ruff.flake8-unused-arguments` → [`ruff.lint.flake8-unused-arguments`](https://docs.astral.sh//ruff/settings/#lint_flake8-unused-arguments)
-- `ruff.ignore` → [`ruff.lint.ignore`](https://docs.astral.sh//ruff/settings/#lint_ignore)
-- `ruff.ignore-init-module-imports` → [`ruff.lint.ignore-init-module-imports`](https://docs.astral.sh//ruff/settings/#lint_ignore-init-module-imports)
-- `ruff.isort` → [`ruff.lint.isort`](https://docs.astral.sh//ruff/settings/#lint_isort)
-- `ruff.logger-objects` → [`ruff.lint.logger-objects`](https://docs.astral.sh//ruff/settings/#lint_logger-objects)
-- `ruff.mccabe` → [`ruff.lint.mccabe`](https://docs.astral.sh//ruff/settings/#lint_mccabe)
-- `ruff.pep8-naming` → [`ruff.lint.pep8-naming`](https://docs.astral.sh//ruff/settings/#lint_pep8-naming)
-- `ruff.per-file-ignores` → [`ruff.lint.per-file-ignores`](https://docs.astral.sh//ruff/settings/#lint_per-file-ignores)
-- `ruff.pycodestyle` → [`ruff.lint.pycodestyle`](https://docs.astral.sh//ruff/settings/#lint_pycodestyle)
-- `ruff.pydocstyle` → [`ruff.lint.pydocstyle`](https://docs.astral.sh//ruff/settings/#lint_pydocstyle)
-- `ruff.pyflakes` → [`ruff.lint.pyflakes`](https://docs.astral.sh//ruff/settings/#lint_pyflakes)
-- `ruff.pylint` → [`ruff.lint.pylint`](https://docs.astral.sh//ruff/settings/#lint_pylint)
-- `ruff.pyupgrade` → [`ruff.lint.pyupgrade`](https://docs.astral.sh//ruff/settings/#lint_pyupgrade)
-- `ruff.select` → [`ruff.lint.select`](https://docs.astral.sh//ruff/settings/#lint_select)
-- `ruff.task-tags` → [`ruff.lint.task-tags`](https://docs.astral.sh//ruff/settings/#lint_task-tags)
-- `ruff.typing-modules` → [`ruff.lint.typing-modules`](https://docs.astral.sh//ruff/settings/#lint_typing-modules)
-- `ruff.unfixable` → [`ruff.lint.unfixable`](https://docs.astral.sh//ruff/settings/#lint_unfixable)
-
-### Remapped rules
-
-The following rules have been remapped to new codes:
-
-- [`raise-without-from-inside-except`](https://docs.astral.sh/ruff/rules/raise-without-from-inside-except/): `TRY200` to `B904`
-- [`suspicious-eval-usage`](https://docs.astral.sh/ruff/rules/suspicious-eval-usage/): `PGH001` to `S307`
-- [`logging-warn`](https://docs.astral.sh/ruff/rules/logging-warn/): `PGH002` to `G010`
-- [`static-key-dict-comprehension`](https://docs.astral.sh/ruff/rules/static-key-dict-comprehension): `RUF011` to `B035`
-- [`runtime-string-union`](https://docs.astral.sh/ruff/rules/runtime-string-union): `TCH006` to `TCH010`
-
-### Stabilizations
-
-The following rules have been stabilized and are no longer in preview:
-
-- [`trio-timeout-without-await`](https://docs.astral.sh/ruff/rules/trio-timeout-without-await) (`TRIO100`)
-- [`trio-sync-call`](https://docs.astral.sh/ruff/rules/trio-sync-call) (`TRIO105`)
-- [`trio-async-function-with-timeout`](https://docs.astral.sh/ruff/rules/trio-async-function-with-timeout) (`TRIO109`)
-- [`trio-unneeded-sleep`](https://docs.astral.sh/ruff/rules/trio-unneeded-sleep) (`TRIO110`)
-- [`trio-zero-sleep-call`](https://docs.astral.sh/ruff/rules/trio-zero-sleep-call) (`TRIO115`)
-- [`unnecessary-escaped-quote`](https://docs.astral.sh/ruff/rules/unnecessary-escaped-quote) (`Q004`)
-- [`enumerate-for-loop`](https://docs.astral.sh/ruff/rules/enumerate-for-loop) (`SIM113`)
-- [`zip-dict-keys-and-values`](https://docs.astral.sh/ruff/rules/zip-dict-keys-and-values) (`SIM911`)
-- [`timeout-error-alias`](https://docs.astral.sh/ruff/rules/timeout-error-alias) (`UP041`)
-- [`flask-debug-true`](https://docs.astral.sh/ruff/rules/flask-debug-true) (`S201`)
-- [`tarfile-unsafe-members`](https://docs.astral.sh/ruff/rules/tarfile-unsafe-members) (`S202`)
-- [`ssl-insecure-version`](https://docs.astral.sh/ruff/rules/ssl-insecure-version) (`S502`)
-- [`ssl-with-bad-defaults`](https://docs.astral.sh/ruff/rules/ssl-with-bad-defaults) (`S503`)
-- [`ssl-with-no-version`](https://docs.astral.sh/ruff/rules/ssl-with-no-version) (`S504`)
-- [`weak-cryptographic-key`](https://docs.astral.sh/ruff/rules/weak-cryptographic-key) (`S505`)
-- [`ssh-no-host-key-verification`](https://docs.astral.sh/ruff/rules/ssh-no-host-key-verification) (`S507`)
-- [`django-raw-sql`](https://docs.astral.sh/ruff/rules/django-raw-sql) (`S611`)
-- [`mako-templates`](https://docs.astral.sh/ruff/rules/mako-templates) (`S702`)
-- [`generator-return-from-iter-method`](https://docs.astral.sh/ruff/rules/generator-return-from-iter-method) (`PYI058`)
-- [`runtime-string-union`](https://docs.astral.sh/ruff/rules/runtime-string-union) (`TCH006`)
-- [`numpy2-deprecation`](https://docs.astral.sh/ruff/rules/numpy2-deprecation) (`NPY201`)
-- [`quadratic-list-summation`](https://docs.astral.sh/ruff/rules/quadratic-list-summation) (`RUF017`)
-- [`assignment-in-assert`](https://docs.astral.sh/ruff/rules/assignment-in-assert) (`RUF018`)
-- [`unnecessary-key-check`](https://docs.astral.sh/ruff/rules/unnecessary-key-check) (`RUF019`)
-- [`never-union`](https://docs.astral.sh/ruff/rules/never-union) (`RUF020`)
-- [`direct-logger-instantiation`](https://docs.astral.sh/ruff/rules/direct-logger-instantiation) (`LOG001`)
-- [`invalid-get-logger-argument`](https://docs.astral.sh/ruff/rules/invalid-get-logger-argument) (`LOG002`)
-- [`exception-without-exc-info`](https://docs.astral.sh/ruff/rules/exception-without-exc-info) (`LOG007`)
-- [`undocumented-warn`](https://docs.astral.sh/ruff/rules/undocumented-warn) (`LOG009`)
-
-Fixes for the following rules have been stabilized and are now available without preview:
-
-- [`triple-single-quotes`](https://docs.astral.sh/ruff/rules/triple-single-quotes) (`D300`)
-- [`non-pep604-annotation`](https://docs.astral.sh/ruff/rules/non-pep604-annotation) (`UP007`)
-- [`dict-get-with-none-default`](https://docs.astral.sh/ruff/rules/dict-get-with-none-default) (`SIM910`)
-- [`in-dict-keys`](https://docs.astral.sh/ruff/rules/in-dict-keys) (`SIM118`)
-- [`collapsible-else-if`](https://docs.astral.sh/ruff/rules/collapsible-else-if) (`PLR5501`)
-- [`if-with-same-arms`](https://docs.astral.sh/ruff/rules/if-with-same-arms) (`SIM114`)
-- [`useless-else-on-loop`](https://docs.astral.sh/ruff/rules/useless-else-on-loop) (`PLW0120`)
-- [`unnecessary-literal-union`](https://docs.astral.sh/ruff/rules/unnecessary-literal-union) (`PYI030`)
-- [`unnecessary-spread`](https://docs.astral.sh/ruff/rules/unnecessary-spread) (`PIE800`)
-- [`error-instead-of-exception`](https://docs.astral.sh/ruff/rules/error-instead-of-exception) (`TRY400`)
-- [`redefined-while-unused`](https://docs.astral.sh/ruff/rules/redefined-while-unused) (`F811`)
-- [`duplicate-value`](https://docs.astral.sh/ruff/rules/duplicate-value) (`B033`)
-- [`multiple-imports-on-one-line`](https://docs.astral.sh/ruff/rules/multiple-imports-on-one-line) (`E401`)
-- [`non-pep585-annotation`](https://docs.astral.sh/ruff/rules/non-pep585-annotation) (`UP006`)
-
-Fixes for the following rules have been promoted from unsafe to safe:
-
-- [`unaliased-collections-abc-set-import`](https://docs.astral.sh/ruff/rules/unaliased-collections-abc-set-import) (`PYI025`)
-
-The following behaviors have been stabilized:
-
-- [`module-import-not-at-top-of-file`](https://docs.astral.sh/ruff/rules/module-import-not-at-top-of-file/) (`E402`) allows `sys.path` modifications between imports
-- [`reimplemented-container-builtin`](https://docs.astral.sh/ruff/rules/reimplemented-container-builtin/) (`PIE807`) includes lambdas that can be replaced with `dict`
-- [`unnecessary-placeholder`](https://docs.astral.sh/ruff/rules/unnecessary-placeholder/) (`PIE790`) applies to unnecessary ellipses (`...`)
-- [`if-else-block-instead-of-dict-get`](https://docs.astral.sh/ruff/rules/if-else-block-instead-of-dict-get/) (`SIM401`) applies to `if-else` expressions
-
-### Preview features
-
-- \[`refurb`\] Implement `metaclass_abcmeta` (`FURB180`) ([#9658](https://github.com/astral-sh/ruff/pull/9658))
-- Implement `blank_line_after_nested_stub_class` preview style ([#9155](https://github.com/astral-sh/ruff/pull/9155))
-- The preview rule [`and-or-ternary`](https://docs.astral.sh/ruff/rules/and-or-ternary) (`PLR1706`) was removed
-
-### Bug fixes
-
-- \[`flake8-async`\] Take `pathlib.Path` into account when analyzing async functions ([#9703](https://github.com/astral-sh/ruff/pull/9703))
-- \[`flake8-return`\] - fix indentation syntax error (`RET505`) ([#9705](https://github.com/astral-sh/ruff/pull/9705))
-- Detect multi-statement lines in else removal ([#9748](https://github.com/astral-sh/ruff/pull/9748))
-- `RUF022`, `RUF023`: never add two trailing commas to the end of a sequence ([#9698](https://github.com/astral-sh/ruff/pull/9698))
-- `RUF023`: Don't sort `__match_args__`, only `__slots__` ([#9724](https://github.com/astral-sh/ruff/pull/9724))
-- \[`flake8-simplify`\] - Fix syntax error in autofix (`SIM114`) ([#9704](https://github.com/astral-sh/ruff/pull/9704))
-- \[`pylint`\] Show verbatim constant in `magic-value-comparison` (`PLR2004`) ([#9694](https://github.com/astral-sh/ruff/pull/9694))
-- Removing trailing whitespace inside multiline strings is unsafe ([#9744](https://github.com/astral-sh/ruff/pull/9744))
-- Support `IfExp` with dual string arms in `invalid-envvar-default` ([#9734](https://github.com/astral-sh/ruff/pull/9734))
-- \[`pylint`\] Add `__mro_entries__` to known dunder methods (`PLW3201`) ([#9706](https://github.com/astral-sh/ruff/pull/9706))
-
-### Documentation
-
-- Removed rules are now retained in the documentation ([#9691](https://github.com/astral-sh/ruff/pull/9691))
-- Deprecated rules are now indicated in the documentation ([#9689](https://github.com/astral-sh/ruff/pull/9689))
-
-## 0.1.15
-
-### Preview features
-
-- Error when `NURSERY` selector is used with `--preview` ([#9682](https://github.com/astral-sh/ruff/pull/9682))
-- Preserve indentation around multiline strings in formatter ([#9637](https://github.com/astral-sh/ruff/pull/9637))
-- \[`flake8-return`\] Add fixes for all rules (`RET505`, `RET506`, `RET507`, `RET508`) ([#9595](https://github.com/astral-sh/ruff/pull/9595))
-- \[`flake8-simplify`\] Add fix for `if-with-same-arms` (`SIM114`) ([#9591](https://github.com/astral-sh/ruff/pull/9591))
-- \[`pycodestyle`\] Add fix for `multiple-imports-on-one-line` (`E401`) ([#9518](https://github.com/astral-sh/ruff/pull/9518))
-- \[`pylint`\] Add fix for `collapsible-else-if` (`PLR5501`) ([#9594](https://github.com/astral-sh/ruff/pull/9594))
-- \[`pylint`\] Add fix for `useless-else-on-loop` (`PLW0120`) ([#9590](https://github.com/astral-sh/ruff/pull/9590))
-- \[`pylint`\] Implement `assigning-non-slot` (`E0237`) ([#9623](https://github.com/astral-sh/ruff/pull/9623))
-- \[`pylint`\] Implement `potential-index-error` (`PLE0643`) ([#9545](https://github.com/astral-sh/ruff/pull/9545))
-- \[`pylint`\] Implement `too-many-nested-blocks` (`PLR1702`) ([#9172](https://github.com/astral-sh/ruff/pull/9172))
-- \[`ruff`\] Add rule to sort `__slots__` and `__match_args__` ([#9564](https://github.com/astral-sh/ruff/pull/9564))
-- \[`ruff`\] Detect unnecessary `dict` comprehensions for iterables (`RUF025`) ([#9613](https://github.com/astral-sh/ruff/pull/9613))
-- \[`ruff`\] Guard against use of `default_factory` as a keyword argument (`RUF026`) ([#9651](https://github.com/astral-sh/ruff/pull/9651))
-- \[`ruff`\] Implement `mutable-fromkeys-value` (`RUF024`) ([#9597](https://github.com/astral-sh/ruff/pull/9597))
-
-### CLI
-
-- Enable auto-wrapping of `--help` output ([#9633](https://github.com/astral-sh/ruff/pull/9633))
-
-### Bug fixes
-
-- Avoid rendering display-only rules as fixable ([#9649](https://github.com/astral-sh/ruff/pull/9649))
-- Detect automagic-like assignments in notebooks ([#9653](https://github.com/astral-sh/ruff/pull/9653))
-- Generate custom JSON schema for dynamic setting ([#9632](https://github.com/astral-sh/ruff/pull/9632))
-- \[`flake8-no-pep420`\] Include global `--config` when determining namespace packages ([#9603](https://github.com/astral-sh/ruff/pull/9603))
-- \[`flake8-pie`\] Omit bound tuples passed to `.startswith` or `.endswith` ([#9661](https://github.com/astral-sh/ruff/pull/9661))
-- \[`flake8-return`\] Avoid panic when fixing inlined else blocks ([#9657](https://github.com/astral-sh/ruff/pull/9657))
-- \[`flake8-return`\] Consider exception suppression in unnecessary assignment ([#9673](https://github.com/astral-sh/ruff/pull/9673))
-- \[`flake8-return`\] Take `NoReturn` annotation into account when analyzing implicit returns ([#9636](https://github.com/astral-sh/ruff/pull/9636))
-- \[`flake8-simplify`\] Support inverted returns in `needless-bool` (`SIM103`) ([#9619](https://github.com/astral-sh/ruff/pull/9619))
-- \[`flake8-type-checking`\] Add Pydantic's `BaseConfig` to default-copy list ([#9650](https://github.com/astral-sh/ruff/pull/9650))
-- \[`flake8-type-checking`\] Avoid marking `InitVar` as a typing-only annotation ([#9688](https://github.com/astral-sh/ruff/pull/9688))
-- \[`pycodestyle`\] Allow `dtype` comparisons in `type-comparison` ([#9676](https://github.com/astral-sh/ruff/pull/9676))
-- \[`pydocstyle`\] Re-implement `last-line-after-section` (`D413`) ([#9654](https://github.com/astral-sh/ruff/pull/9654))
-
-### Documentation
-
-- \[`flake8-pytest-style`\] Add fix safety documentation for `duplicate-parameterize-test-cases` ([#9678](https://github.com/astral-sh/ruff/pull/9678))
-- \[`pylint`\] Document `literal-membership` fix safety conditions ([#9677](https://github.com/astral-sh/ruff/pull/9677))
-- \[`isort`\] Fix reference to `isort` rule code ([#9598](https://github.com/astral-sh/ruff/pull/9598))
-
 ## 0.1.14
 
 ### Preview features

CONTRIBUTING.md

@@ -26,10 +26,6 @@ Welcome! We're happy to have you here. Thank you in advance for your contributio
 - [`cargo dev`](#cargo-dev)
 - [Subsystems](#subsystems)
     - [Compilation Pipeline](#compilation-pipeline)
-    - [Import Categorization](#import-categorization)
-        - [Project root](#project-root)
-        - [Package root](#package-root)
-        - [Import categorization](#import-categorization-1)
 
 ## The Basics
 
@@ -39,7 +35,7 @@ For small changes (e.g., bug fixes), feel free to submit a PR.
 
 For larger changes (e.g., new lint rules, new functionality, new configuration options), consider
 creating an [**issue**](https://github.com/astral-sh/ruff/issues) outlining your proposed change.
-You can also join us on [**Discord**](https://discord.com/invite/astral-sh) to discuss your idea with the
+You can also join us on [**Discord**](https://discord.gg/c9MhzV8aU5) to discuss your idea with the
 community. We've labeled [beginner-friendly tasks](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
 in the issue tracker, along with [bugs](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3Abug)
 and [improvements](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3Aaccepted)
@@ -67,7 +63,7 @@ You'll also need [Insta](https://insta.rs/docs/) to update snapshot tests:
 cargo install cargo-insta
 ```
 
-And you'll need pre-commit to run some validation checks:
+and pre-commit to run some validation checks:
 
 ```shell
 pipx install pre-commit  # or `pip install pre-commit` if you have a virtualenv
@@ -80,16 +76,6 @@ when making a commit:
 pre-commit install
 ```
 
-We recommend [nextest](https://nexte.st/) to run Ruff's test suite (via `cargo nextest run`),
-though it's not strictly necessary:
-
-```shell
-cargo install cargo-nextest --locked
-```
-
-Throughout this guide, any usages of `cargo test` can be replaced with `cargo nextest run`,
-if you choose to install `nextest`.
-
 ### Development
 
 After cloning the repository, run Ruff locally from the repository root with:
@@ -245,7 +231,7 @@ Once you've completed the code for the rule itself, you can define tests with th
     For example, if you're adding a new rule named `E402`, you would run:
 
     ```shell
-    cargo run -p ruff -- check crates/ruff_linter/resources/test/fixtures/pycodestyle/E402.py --no-cache --preview --select E402
+    cargo run -p ruff -- check crates/ruff_linter/resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402
     ```
 
     **Note:** Only a subset of rules are enabled by default. When testing a new rule, ensure that
@@ -316,7 +302,7 @@ To preview any changes to the documentation locally:
     ```
 
 The documentation should then be available locally at
-[http://127.0.0.1:8000/ruff/](http://127.0.0.1:8000/ruff/).
+[http://127.0.0.1:8000/docs/](http://127.0.0.1:8000/docs/).
 
 ## Release Process
 
@@ -387,11 +373,6 @@ We have several ways of benchmarking and profiling Ruff:
 - Microbenchmarks which run the linter or the formatter on individual files. These run on pull requests.
 - Profiling the linter on either the microbenchmarks or entire projects
 
-> \[!NOTE\]
-> When running benchmarks, ensure that your CPU is otherwise idle (e.g., close any background
-> applications, like web browsers). You may also want to switch your CPU to a "performance"
-> mode, if it exists, especially when benchmarking short-lived processes.
-
 ### CPython Benchmark
 
 First, clone [CPython](https://github.com/python/cpython). It's a large and diverse Python codebase,

Cargo.toml

@@ -14,50 +14,49 @@ license = "MIT"
 [workspace.dependencies]
 aho-corasick = { version = "1.1.2" }
 annotate-snippets = { version = "0.9.2", features = ["color"] }
-anyhow = { version = "1.0.80" }
+anyhow = { version = "1.0.79" }
 argfile = { version = "0.1.6" }
 assert_cmd = { version = "2.0.13" }
 bincode = { version = "1.3.3" }
 bitflags = { version = "2.4.1" }
-bstr = { version = "1.9.1" }
 cachedir = { version = "0.3.1" }
-chrono = { version = "0.4.34", default-features = false, features = ["clock"] }
-clap = { version = "4.5.1", features = ["derive"] }
+chrono = { version = "0.4.33", default-features = false, features = ["clock"] }
+clap = { version = "4.4.13", features = ["derive"] }
 clap_complete_command = { version = "0.5.1" }
 clearscreen = { version = "2.0.0" }
-codspeed-criterion-compat = { version = "2.4.0", default-features = false }
+codspeed-criterion-compat = { version = "2.3.3", default-features = false }
 colored = { version = "2.1.0" }
 configparser = { version = "3.0.3" }
 console_error_panic_hook = { version = "0.1.7" }
 console_log = { version = "1.0.0" }
-countme = { version = "3.0.1" }
+countme = { version ="3.0.1"}
 criterion = { version = "0.5.1", default-features = false }
 dirs = { version = "5.0.0" }
 drop_bomb = { version = "0.1.5" }
-env_logger = { version = "0.10.1" }
+env_logger = { version ="0.10.1"}
 fern = { version = "0.6.1" }
 filetime = { version = "0.2.23" }
-fs-err = { version = "2.11.0" }
+fs-err = { version ="2.11.0"}
 glob = { version = "0.3.1" }
 globset = { version = "0.4.14" }
-hexf-parse = { version = "0.2.1" }
+hexf-parse = { version ="0.2.1"}
 ignore = { version = "0.4.22" }
-imara-diff = { version = "0.1.5" }
+imara-diff ={ version = "0.1.5"}
 imperative = { version = "1.0.4" }
-indicatif = { version = "0.17.8" }
-indoc = { version = "2.0.4" }
-insta = { version = "1.35.1", feature = ["filters", "glob"] }
+indicatif ={ version = "0.17.7"}
+indoc ={ version = "2.0.4"}
+insta = { version = "1.34.0", feature = ["filters", "glob"] }
 insta-cmd = { version = "0.4.0" }
-is-macro = { version = "0.3.5" }
+is-macro = { version = "0.3.4" }
 is-wsl = { version = "0.4.0" }
-itertools = { version = "0.12.1" }
+itertools = { version = "0.12.0" }
 js-sys = { version = "0.3.67" }
 lalrpop-util = { version = "0.20.0", default-features = false }
 lexical-parse-float = { version = "0.8.0", features = ["format"] }
 libcst = { version = "1.1.0", default-features = false }
 log = { version = "0.4.17" }
-memchr = { version = "2.7.1" }
-mimalloc = { version = "0.1.39" }
+memchr = { version = "2.6.4" }
+mimalloc = { version ="0.1.39"}
 natord = { version = "1.0.9" }
 notify = { version = "6.1.1" }
 once_cell = { version = "1.19.0" }
@@ -65,8 +64,8 @@ path-absolutize = { version = "3.1.1" }
 pathdiff = { version = "0.2.1" }
 pep440_rs = { version = "0.4.0", features = ["serde"] }
 pretty_assertions = "1.3.0"
-proc-macro2 = { version = "1.0.78" }
-pyproject-toml = { version = "0.9.0" }
+proc-macro2 = { version = "1.0.73" }
+pyproject-toml = { version = "0.8.1" }
 quick-junit = { version = "0.3.5" }
 quote = { version = "1.0.23" }
 rand = { version = "0.8.5" }
@@ -75,34 +74,35 @@ regex = { version = "1.10.2" }
 result-like = { version = "0.5.0" }
 rustc-hash = { version = "1.1.0" }
 schemars = { version = "0.8.16" }
-seahash = { version = "4.1.0" }
-serde = { version = "1.0.197", features = ["derive"] }
-serde-wasm-bindgen = { version = "0.6.4" }
+seahash = { version ="4.1.0"}
+semver = { version = "1.0.21" }
+serde = { version = "1.0.195", features = ["derive"] }
+serde-wasm-bindgen = { version = "0.6.3" }
 serde_json = { version = "1.0.113" }
 serde_test = { version = "1.0.152" }
-serde_with = { version = "3.6.0", default-features = false, features = ["macros"] }
+serde_with = { version = "3.5.1", default-features = false, features = ["macros"] }
 shellexpand = { version = "3.0.0" }
-shlex = { version = "1.3.0" }
+shlex = { version ="1.3.0"}
 similar = { version = "2.4.0", features = ["inline"] }
 smallvec = { version = "1.13.1" }
 static_assertions = "1.1.0"
 strum = { version = "0.25.0", features = ["strum_macros"] }
 strum_macros = { version = "0.25.3" }
-syn = { version = "2.0.51" }
-tempfile = { version = "3.9.0" }
+syn = { version = "2.0.40" }
+tempfile = { version ="3.9.0"}
 test-case = { version = "3.3.1" }
-thiserror = { version = "1.0.57" }
-tikv-jemallocator = { version = "0.5.0" }
-toml = { version = "0.8.9" }
+thiserror = { version = "1.0.51" }
+tikv-jemallocator = { version ="0.5.0"}
+toml = { version = "0.8.8" }
 tracing = { version = "0.1.40" }
 tracing-indicatif = { version = "0.3.6" }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 typed-arena = { version = "2.0.2" }
-unic-ucd-category = { version = "0.9" }
+unic-ucd-category = { version ="0.9"}
 unicode-ident = { version = "1.0.12" }
 unicode-width = { version = "0.1.11" }
 unicode_names2 = { version = "1.2.1" }
-ureq = { version = "2.9.6" }
+ureq = { version = "2.9.1" }
 url = { version = "2.5.0" }
 uuid = { version = "1.6.1", features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
 walkdir = { version = "2.3.2" }

README.md

@@ -7,9 +7,8 @@
 [![image](https://img.shields.io/pypi/l/ruff.svg)](https://pypi.python.org/pypi/ruff)
 [![image](https://img.shields.io/pypi/pyversions/ruff.svg)](https://pypi.python.org/pypi/ruff)
 [![Actions status](https://github.com/astral-sh/ruff/workflows/CI/badge.svg)](https://github.com/astral-sh/ruff/actions)
-[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?logo=discord&logoColor=white)](https://discord.com/invite/astral-sh)
 
-[**Docs**](https://docs.astral.sh/ruff/) | [**Playground**](https://play.ruff.rs/)
+[**Discord**](https://discord.gg/c9MhzV8aU5) | [**Docs**](https://docs.astral.sh/ruff/) | [**Playground**](https://play.ruff.rs/)
 
 An extremely fast Python linter and code formatter, written in Rust.
 
@@ -151,7 +150,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.3.1
+  rev: v0.1.14
   hooks:
     # Run the linter.
     - id: ruff
@@ -173,7 +172,7 @@ jobs:
   ruff:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: chartboost/ruff-action@v1
 ```
 
@@ -342,14 +341,14 @@ For a complete enumeration of the supported rules, see [_Rules_](https://docs.as
 Contributions are welcome and highly appreciated. To get started, check out the
 [**contributing guidelines**](https://docs.astral.sh/ruff/contributing/).
 
-You can also join us on [**Discord**](https://discord.com/invite/astral-sh).
+You can also join us on [**Discord**](https://discord.gg/c9MhzV8aU5).
 
 ## Support
 
 Having trouble? Check out the existing issues on [**GitHub**](https://github.com/astral-sh/ruff/issues),
 or feel free to [**open a new one**](https://github.com/astral-sh/ruff/issues/new).
 
-You can also ask for help on [**Discord**](https://discord.com/invite/astral-sh).
+You can also ask for help on [**Discord**](https://discord.gg/c9MhzV8aU5).
 
 ## Acknowledgements
 
@@ -379,7 +378,6 @@ Ruff is released under the MIT license.
 
 Ruff is used by a number of major open-source projects and companies, including:
 
-- [Albumentations](https://github.com/albumentations-team/albumentations)
 - Amazon ([AWS SAM](https://github.com/aws/serverless-application-model))
 - Anthropic ([Python SDK](https://github.com/anthropics/anthropic-sdk-python))
 - [Apache Airflow](https://github.com/apache/airflow)
@@ -404,9 +402,7 @@ Ruff is used by a number of major open-source projects and companies, including:
     [Diffusers](https://github.com/huggingface/diffusers))
 - ING Bank ([popmon](https://github.com/ing-bank/popmon), [probatus](https://github.com/ing-bank/probatus))
 - [Ibis](https://github.com/ibis-project/ibis)
-- [ivy](https://github.com/unifyai/ivy)
 - [Jupyter](https://github.com/jupyter-server/jupyter_server)
-- [Kraken Tech](https://kraken.tech/)
 - [LangChain](https://github.com/hwchase17/langchain)
 - [Litestar](https://litestar.dev/)
 - [LlamaIndex](https://github.com/jerryjliu/llama_index)
@@ -436,7 +432,6 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [PyInstaller](https://github.com/pyinstaller/pyinstaller)
 - [PyMC](https://github.com/pymc-devs/pymc/)
 - [PyMC-Marketing](https://github.com/pymc-labs/pymc-marketing)
-- [pytest](https://github.com/pytest-dev/pytest)
 - [PyTorch](https://github.com/pytorch/pytorch)
 - [Pydantic](https://github.com/pydantic/pydantic)
 - [Pylint](https://github.com/PyCQA/pylint)
@@ -467,7 +462,7 @@ Ruff is used by a number of major open-source projects and companies, including:
 
 ### Show Your Support
 
-If you're using Ruff, consider adding the Ruff badge to your project's `README.md`:
+If you're using Ruff, consider adding the Ruff badge to project's `README.md`:
 
 ```md
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
@@ -493,6 +488,6 @@ MIT
 
 <div align="center">
   <a target="_blank" href="https://astral.sh" style="background:none">
-    <img src="https://raw.githubusercontent.com/astral-sh/ruff/main/assets/svg/Astral.svg" alt="Made by Astral">
+    <img src="https://raw.githubusercontent.com/astral-sh/ruff/main/assets/svg/Astral.svg">
   </a>
 </div>

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.3.1"
+version = "0.1.14"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -48,16 +48,12 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 shellexpand = { workspace = true }
 strum = { workspace = true, features = [] }
-tempfile = { workspace = true }
 thiserror = { workspace = true }
-toml = { workspace = true }
 tracing = { workspace = true, features = ["log"] }
 walkdir = { workspace = true }
 wild = { workspace = true }
 
 [dev-dependencies]
-# Enable test rules during development
-ruff_linter = { path = "../ruff_linter", features = ["clap", "test-rules"] }
 assert_cmd = { workspace = true }
 # Avoid writing colored snapshots when running tests from the terminal
 colored = { workspace = true, features = ["no-color"]}

crates/ruff/src/args.rs

@@ -1,18 +1,8 @@
-use std::cmp::Ordering;
-use std::fmt::Formatter;
-use std::ops::Deref;
-use std::path::{Path, PathBuf};
-use std::str::FromStr;
-use std::sync::Arc;
+use std::path::PathBuf;
 
-use anyhow::bail;
-use clap::builder::{TypedValueParser, ValueParserFactory};
 use clap::{command, Parser};
-use colored::Colorize;
-use path_absolutize::path_dedot;
 use regex::Regex;
 use rustc_hash::FxHashMap;
-use toml;
 
 use ruff_linter::line_width::LineLength;
 use ruff_linter::logging::LogLevel;
@@ -22,58 +12,10 @@ use ruff_linter::settings::types::{
     SerializationFormat, UnsafeFixes,
 };
 use ruff_linter::{warn_user, RuleParser, RuleSelector, RuleSelectorParser};
-use ruff_source_file::{LineIndex, OneIndexed};
-use ruff_text_size::TextRange;
 use ruff_workspace::configuration::{Configuration, RuleSelection};
-use ruff_workspace::options::{Options, PycodestyleOptions};
+use ruff_workspace::options::PycodestyleOptions;
 use ruff_workspace::resolver::ConfigurationTransformer;
 
-/// All configuration options that can be passed "globally",
-/// i.e., can be passed to all subcommands
-#[derive(Debug, Default, Clone, clap::Args)]
-pub struct GlobalConfigArgs {
-    #[clap(flatten)]
-    log_level_args: LogLevelArgs,
-    /// Either a path to a TOML configuration file (`pyproject.toml` or `ruff.toml`),
-    /// or a TOML `<KEY> = <VALUE>` pair
-    /// (such as you might find in a `ruff.toml` configuration file)
-    /// overriding a specific configuration option.
-    /// Overrides of individual settings using this option always take precedence
-    /// over all configuration files, including configuration files that were also
-    /// specified using `--config`.
-    #[arg(
-        long,
-        action = clap::ArgAction::Append,
-        value_name = "CONFIG_OPTION",
-        value_parser = ConfigArgumentParser,
-        global = true,
-        help_heading = "Global options",
-    )]
-    pub config: Vec<SingleConfigArgument>,
-    /// Ignore all configuration files.
-    //
-    // Note: We can't mark this as conflicting with `--config` here
-    // as `--config` can be used for specifying configuration overrides
-    // as well as configuration files.
-    // Specifying a configuration file conflicts with `--isolated`;
-    // specifying a configuration override does not.
-    // If a user specifies `ruff check --isolated --config=ruff.toml`,
-    // we emit an error later on, after the initial parsing by clap.
-    #[arg(long, help_heading = "Global options", global = true)]
-    pub isolated: bool,
-}
-
-impl GlobalConfigArgs {
-    pub fn log_level(&self) -> LogLevel {
-        LogLevel::from(&self.log_level_args)
-    }
-
-    #[must_use]
-    fn partition(self) -> (LogLevel, Vec<SingleConfigArgument>, bool) {
-        (self.log_level(), self.config, self.isolated)
-    }
-}
-
 #[derive(Debug, Parser)]
 #[command(
     author,
@@ -84,9 +26,9 @@ impl GlobalConfigArgs {
 #[command(version)]
 pub struct Args {
     #[command(subcommand)]
-    pub(crate) command: Command,
+    pub command: Command,
     #[clap(flatten)]
-    pub(crate) global_options: GlobalConfigArgs,
+    pub log_level_args: LogLevelArgs,
 }
 
 #[allow(clippy::large_enum_variant)]
@@ -109,6 +51,10 @@ pub enum Command {
         /// Output format
         #[arg(long, value_enum, default_value = "text")]
         output_format: HelpFormat,
+
+        /// Output format (Deprecated: Use `--output-format` instead).
+        #[arg(long, value_enum, conflicts_with = "output_format", hide = true)]
+        format: Option<HelpFormat>,
     },
     /// List or describe the available configuration options.
     Config { option: Option<String> },
@@ -117,6 +63,10 @@ pub enum Command {
         /// Output format
         #[arg(long, value_enum, default_value = "text")]
         output_format: HelpFormat,
+
+        /// Output format (Deprecated: Use `--output-format` instead).
+        #[arg(long, value_enum, conflicts_with = "output_format", hide = true)]
+        format: Option<HelpFormat>,
     },
     /// Clear any caches in the current directory and any subdirectories.
     #[clap(alias = "--clean")]
@@ -199,6 +149,10 @@ pub struct CheckCommand {
     preview: bool,
     #[clap(long, overrides_with("preview"), hide = true)]
     no_preview: bool,
+    /// Path to the `pyproject.toml` or `ruff.toml` file to use for
+    /// configuration.
+    #[arg(long, conflicts_with = "isolated")]
+    pub config: Option<PathBuf>,
     /// Comma-separated list of rule codes to enable (or ALL, to enable all rules).
     #[arg(
         long,
@@ -330,6 +284,9 @@ pub struct CheckCommand {
     /// Disable cache reads.
     #[arg(short, long, env = "RUFF_NO_CACHE", help_heading = "Miscellaneous")]
     pub no_cache: bool,
+    /// Ignore all configuration files.
+    #[arg(long, conflicts_with = "config", help_heading = "Miscellaneous")]
+    pub isolated: bool,
     /// Path to the cache directory.
     #[arg(long, env = "RUFF_CACHE_DIR", help_heading = "Miscellaneous")]
     pub cache_dir: Option<PathBuf>,
@@ -421,6 +378,9 @@ pub struct FormatCommand {
     /// difference between the current file and how the formatted file would look like.
     #[arg(long)]
     pub diff: bool,
+    /// Path to the `pyproject.toml` or `ruff.toml` file to use for configuration.
+    #[arg(long, conflicts_with = "isolated")]
+    pub config: Option<PathBuf>,
 
     /// Disable cache reads.
     #[arg(short, long, env = "RUFF_NO_CACHE", help_heading = "Miscellaneous")]
@@ -461,6 +421,9 @@ pub struct FormatCommand {
     /// Set the line-length.
     #[arg(long, help_heading = "Format configuration")]
     pub line_length: Option<LineLength>,
+    /// Ignore all configuration files.
+    #[arg(long, conflicts_with = "config", help_heading = "Miscellaneous")]
+    pub isolated: bool,
     /// The name of the file when passing it through stdin.
     #[arg(long, help_heading = "Miscellaneous")]
     pub stdin_filename: Option<PathBuf>,
@@ -477,21 +440,6 @@ pub struct FormatCommand {
     preview: bool,
     #[clap(long, overrides_with("preview"), hide = true)]
     no_preview: bool,
-
-    /// When specified, Ruff will try to only format the code in the given range.
-    /// It might be necessary to extend the start backwards or the end forwards, to fully enclose a logical line.
-    /// The `<RANGE>` uses the format `<start_line>:<start_column>-<end_line>:<end_column>`.
-    ///
-    /// - The line and column numbers are 1 based.
-    /// - The column specifies the nth-unicode codepoint on that line.
-    /// - The end offset is exclusive.
-    /// - The column numbers are optional. You can write `--range=1-2` instead of `--range=1:1-2:1`.
-    /// - The end position is optional. You can write `--range=2` to format the entire document starting from the second line.
-    /// - The start position is optional. You can write `--range=-3` to format the first three lines of the document.
-    ///
-    /// The option can only be used when formatting a single file. Range formatting of notebooks is unsupported.
-    #[clap(long, help_heading = "Editor options", verbatim_doc_comment)]
-    pub range: Option<FormatRange>,
 }
 
 #[derive(Debug, Clone, Copy, clap::ValueEnum)]
@@ -501,7 +449,7 @@ pub enum HelpFormat {
 }
 
 #[allow(clippy::module_name_repetitions)]
-#[derive(Debug, Default, Clone, clap::Args)]
+#[derive(Debug, clap::Args)]
 pub struct LogLevelArgs {
     /// Enable verbose logging.
     #[arg(
@@ -546,191 +494,100 @@ impl From<&LogLevelArgs> for LogLevel {
     }
 }
 
-/// Configuration-related arguments passed via the CLI.
-#[derive(Default)]
-pub struct ConfigArguments {
-    /// Whether the user specified --isolated on the command line
-    pub(crate) isolated: bool,
-    /// The logging level to be used, derived from command-line arguments passed
-    pub(crate) log_level: LogLevel,
-    /// Path to a pyproject.toml or ruff.toml configuration file (etc.).
-    /// Either 0 or 1 configuration file paths may be provided on the command line.
-    config_file: Option<PathBuf>,
-    /// Overrides provided via the `--config "KEY=VALUE"` option.
-    /// An arbitrary number of these overrides may be provided on the command line.
-    /// These overrides take precedence over all configuration files,
-    /// even configuration files that were also specified using `--config`.
-    overrides: Configuration,
-    /// Overrides provided via dedicated flags such as `--line-length` etc.
-    /// These overrides take precedence over all configuration files,
-    /// and also over all overrides specified using any `--config "KEY=VALUE"` flags.
-    per_flag_overrides: ExplicitConfigOverrides,
-}
-
-impl ConfigArguments {
-    pub fn config_file(&self) -> Option<&Path> {
-        self.config_file.as_deref()
-    }
-
-    fn from_cli_arguments(
-        global_options: GlobalConfigArgs,
-        per_flag_overrides: ExplicitConfigOverrides,
-    ) -> anyhow::Result<Self> {
-        let (log_level, config_options, isolated) = global_options.partition();
-        let mut config_file: Option<PathBuf> = None;
-        let mut overrides = Configuration::default();
-
-        for option in config_options {
-            match option {
-                SingleConfigArgument::SettingsOverride(overridden_option) => {
-                    let overridden_option = Arc::try_unwrap(overridden_option)
-                        .unwrap_or_else(|option| option.deref().clone());
-                    overrides = overrides.combine(Configuration::from_options(
-                        overridden_option,
-                        None,
-                        &path_dedot::CWD,
-                    )?);
-                }
-                SingleConfigArgument::FilePath(path) => {
-                    if isolated {
-                        bail!(
-                            "\
-The argument `--config={}` cannot be used with `--isolated`
-
-  tip: You cannot specify a configuration file and also specify `--isolated`,
-       as `--isolated` causes ruff to ignore all configuration files.
-       For more information, try `--help`.
-",
-                            path.display()
-                        );
-                    }
-                    if let Some(ref config_file) = config_file {
-                        let (first, second) = (config_file.display(), path.display());
-                        bail!(
-                            "\
-You cannot specify more than one configuration file on the command line.
-
-  tip: remove either `--config={first}` or `--config={second}`.
-       For more information, try `--help`.
-"
-                        );
-                    }
-                    config_file = Some(path);
-                }
-            }
-        }
-        Ok(Self {
-            isolated,
-            log_level,
-            config_file,
-            overrides,
-            per_flag_overrides,
-        })
-    }
-}
-
-impl ConfigurationTransformer for ConfigArguments {
-    fn transform(&self, config: Configuration) -> Configuration {
-        let with_config_overrides = self.overrides.clone().combine(config);
-        self.per_flag_overrides.transform(with_config_overrides)
-    }
-}
-
 impl CheckCommand {
     /// Partition the CLI into command-line arguments and configuration
     /// overrides.
-    pub fn partition(
-        self,
-        global_options: GlobalConfigArgs,
-    ) -> anyhow::Result<(CheckArguments, ConfigArguments)> {
-        let check_arguments = CheckArguments {
-            add_noqa: self.add_noqa,
-            diff: self.diff,
-            ecosystem_ci: self.ecosystem_ci,
-            exit_non_zero_on_fix: self.exit_non_zero_on_fix,
-            exit_zero: self.exit_zero,
-            files: self.files,
-            ignore_noqa: self.ignore_noqa,
-            no_cache: self.no_cache,
-            output_file: self.output_file,
-            show_files: self.show_files,
-            show_settings: self.show_settings,
-            statistics: self.statistics,
-            stdin_filename: self.stdin_filename,
-            watch: self.watch,
-        };
-
-        let cli_overrides = ExplicitConfigOverrides {
-            dummy_variable_rgx: self.dummy_variable_rgx,
-            exclude: self.exclude,
-            extend_exclude: self.extend_exclude,
-            extend_fixable: self.extend_fixable,
-            extend_ignore: self.extend_ignore,
-            extend_per_file_ignores: self.extend_per_file_ignores,
-            extend_select: self.extend_select,
-            extend_unfixable: self.extend_unfixable,
-            fixable: self.fixable,
-            ignore: self.ignore,
-            line_length: self.line_length,
-            per_file_ignores: self.per_file_ignores,
-            preview: resolve_bool_arg(self.preview, self.no_preview).map(PreviewMode::from),
-            respect_gitignore: resolve_bool_arg(self.respect_gitignore, self.no_respect_gitignore),
-            select: self.select,
-            target_version: self.target_version,
-            unfixable: self.unfixable,
-            // TODO(charlie): Included in `pyproject.toml`, but not inherited.
-            cache_dir: self.cache_dir,
-            fix: resolve_bool_arg(self.fix, self.no_fix),
-            fix_only: resolve_bool_arg(self.fix_only, self.no_fix_only),
-            unsafe_fixes: resolve_bool_arg(self.unsafe_fixes, self.no_unsafe_fixes)
-                .map(UnsafeFixes::from),
-            force_exclude: resolve_bool_arg(self.force_exclude, self.no_force_exclude),
-            output_format: resolve_output_format(
-                self.output_format,
-                resolve_bool_arg(self.show_source, self.no_show_source),
-                resolve_bool_arg(self.preview, self.no_preview).unwrap_or_default(),
-            ),
-            show_fixes: resolve_bool_arg(self.show_fixes, self.no_show_fixes),
-            extension: self.extension,
-        };
-
-        let config_args = ConfigArguments::from_cli_arguments(global_options, cli_overrides)?;
-        Ok((check_arguments, config_args))
+    pub fn partition(self) -> (CheckArguments, CliOverrides) {
+        (
+            CheckArguments {
+                add_noqa: self.add_noqa,
+                config: self.config,
+                diff: self.diff,
+                ecosystem_ci: self.ecosystem_ci,
+                exit_non_zero_on_fix: self.exit_non_zero_on_fix,
+                exit_zero: self.exit_zero,
+                files: self.files,
+                ignore_noqa: self.ignore_noqa,
+                isolated: self.isolated,
+                no_cache: self.no_cache,
+                output_file: self.output_file,
+                show_files: self.show_files,
+                show_settings: self.show_settings,
+                statistics: self.statistics,
+                stdin_filename: self.stdin_filename,
+                watch: self.watch,
+            },
+            CliOverrides {
+                dummy_variable_rgx: self.dummy_variable_rgx,
+                exclude: self.exclude,
+                extend_exclude: self.extend_exclude,
+                extend_fixable: self.extend_fixable,
+                extend_ignore: self.extend_ignore,
+                extend_per_file_ignores: self.extend_per_file_ignores,
+                extend_select: self.extend_select,
+                extend_unfixable: self.extend_unfixable,
+                fixable: self.fixable,
+                ignore: self.ignore,
+                line_length: self.line_length,
+                per_file_ignores: self.per_file_ignores,
+                preview: resolve_bool_arg(self.preview, self.no_preview).map(PreviewMode::from),
+                respect_gitignore: resolve_bool_arg(
+                    self.respect_gitignore,
+                    self.no_respect_gitignore,
+                ),
+                select: self.select,
+                target_version: self.target_version,
+                unfixable: self.unfixable,
+                // TODO(charlie): Included in `pyproject.toml`, but not inherited.
+                cache_dir: self.cache_dir,
+                fix: resolve_bool_arg(self.fix, self.no_fix),
+                fix_only: resolve_bool_arg(self.fix_only, self.no_fix_only),
+                unsafe_fixes: resolve_bool_arg(self.unsafe_fixes, self.no_unsafe_fixes)
+                    .map(UnsafeFixes::from),
+                force_exclude: resolve_bool_arg(self.force_exclude, self.no_force_exclude),
+                output_format: resolve_output_format(
+                    self.output_format,
+                    resolve_bool_arg(self.show_source, self.no_show_source),
+                    resolve_bool_arg(self.preview, self.no_preview).unwrap_or_default(),
+                ),
+                show_fixes: resolve_bool_arg(self.show_fixes, self.no_show_fixes),
+                extension: self.extension,
+            },
+        )
     }
 }
 
 impl FormatCommand {
     /// Partition the CLI into command-line arguments and configuration
     /// overrides.
-    pub fn partition(
-        self,
-        global_options: GlobalConfigArgs,
-    ) -> anyhow::Result<(FormatArguments, ConfigArguments)> {
-        let format_arguments = FormatArguments {
-            check: self.check,
-            diff: self.diff,
-            files: self.files,
-            no_cache: self.no_cache,
-            stdin_filename: self.stdin_filename,
-            range: self.range,
-        };
+    pub fn partition(self) -> (FormatArguments, CliOverrides) {
+        (
+            FormatArguments {
+                check: self.check,
+                diff: self.diff,
+                config: self.config,
+                files: self.files,
+                isolated: self.isolated,
+                no_cache: self.no_cache,
+                stdin_filename: self.stdin_filename,
+            },
+            CliOverrides {
+                line_length: self.line_length,
+                respect_gitignore: resolve_bool_arg(
+                    self.respect_gitignore,
+                    self.no_respect_gitignore,
+                ),
+                exclude: self.exclude,
+                preview: resolve_bool_arg(self.preview, self.no_preview).map(PreviewMode::from),
+                force_exclude: resolve_bool_arg(self.force_exclude, self.no_force_exclude),
+                target_version: self.target_version,
+                cache_dir: self.cache_dir,
+                extension: self.extension,
 
-        let cli_overrides = ExplicitConfigOverrides {
-            line_length: self.line_length,
-            respect_gitignore: resolve_bool_arg(self.respect_gitignore, self.no_respect_gitignore),
-            exclude: self.exclude,
-            preview: resolve_bool_arg(self.preview, self.no_preview).map(PreviewMode::from),
-            force_exclude: resolve_bool_arg(self.force_exclude, self.no_force_exclude),
-            target_version: self.target_version,
-            cache_dir: self.cache_dir,
-            extension: self.extension,
-
-            // Unsupported on the formatter CLI, but required on `Overrides`.
-            ..ExplicitConfigOverrides::default()
-        };
-
-        let config_args = ConfigArguments::from_cli_arguments(global_options, cli_overrides)?;
-        Ok((format_arguments, config_args))
+                // Unsupported on the formatter CLI, but required on `Overrides`.
+                ..CliOverrides::default()
+            },
+        )
     }
 }
 
@@ -743,180 +600,6 @@ fn resolve_bool_arg(yes: bool, no: bool) -> Option<bool> {
     }
 }
 
-/// Enumeration of various ways in which a --config CLI flag
-/// could be invalid
-#[derive(Debug)]
-enum InvalidConfigFlagReason {
-    InvalidToml(toml::de::Error),
-    /// It was valid TOML, but not a valid ruff config file.
-    /// E.g. the user tried to select a rule that doesn't exist,
-    /// or tried to enable a setting that doesn't exist
-    ValidTomlButInvalidRuffSchema(toml::de::Error),
-    /// It was a valid ruff config file, but the user tried to pass a
-    /// value for `extend` as part of the config override.
-    // `extend` is special, because it affects which config files we look at
-    /// in the first place. We currently only parse --config overrides *after*
-    /// we've combined them with all the arguments from the various config files
-    /// that we found, so trying to override `extend` as part of a --config
-    /// override is forbidden.
-    ExtendPassedViaConfigFlag,
-}
-
-impl InvalidConfigFlagReason {
-    const fn description(&self) -> &'static str {
-        match self {
-            Self::InvalidToml(_) => "The supplied argument is not valid TOML",
-            Self::ValidTomlButInvalidRuffSchema(_) => {
-                "Could not parse the supplied argument as a `ruff.toml` configuration option"
-            }
-            Self::ExtendPassedViaConfigFlag => "Cannot include `extend` in a --config flag value",
-        }
-    }
-}
-
-/// Enumeration to represent a single `--config` argument
-/// passed via the CLI.
-///
-/// Using the `--config` flag, users may pass 0 or 1 paths
-/// to configuration files and an arbitrary number of
-/// "inline TOML" overrides for specific settings.
-///
-/// For example:
-///
-/// ```sh
-/// ruff check --config "path/to/ruff.toml" --config "extend-select=['E501', 'F841']" --config "lint.per-file-ignores = {'some_file.py' = ['F841']}"
-/// ```
-#[derive(Clone, Debug)]
-pub enum SingleConfigArgument {
-    FilePath(PathBuf),
-    SettingsOverride(Arc<Options>),
-}
-
-#[derive(Clone)]
-pub struct ConfigArgumentParser;
-
-impl ValueParserFactory for SingleConfigArgument {
-    type Parser = ConfigArgumentParser;
-
-    fn value_parser() -> Self::Parser {
-        ConfigArgumentParser
-    }
-}
-
-impl TypedValueParser for ConfigArgumentParser {
-    type Value = SingleConfigArgument;
-
-    fn parse_ref(
-        &self,
-        cmd: &clap::Command,
-        arg: Option<&clap::Arg>,
-        value: &std::ffi::OsStr,
-    ) -> Result<Self::Value, clap::Error> {
-        // Convert to UTF-8.
-        let Some(value) = value.to_str() else {
-            // But respect non-UTF-8 paths.
-            let path_to_config_file = PathBuf::from(value);
-            if path_to_config_file.is_file() {
-                return Ok(SingleConfigArgument::FilePath(path_to_config_file));
-            }
-            return Err(clap::Error::new(clap::error::ErrorKind::InvalidUtf8));
-        };
-
-        // Expand environment variables and tildes.
-        if let Ok(path_to_config_file) =
-            shellexpand::full(value).map(|config| PathBuf::from(&*config))
-        {
-            if path_to_config_file.is_file() {
-                return Ok(SingleConfigArgument::FilePath(path_to_config_file));
-            }
-        }
-
-        let config_parse_error = match toml::Table::from_str(value) {
-            Ok(table) => match table.try_into::<Options>() {
-                Ok(option) => {
-                    if option.extend.is_none() {
-                        return Ok(SingleConfigArgument::SettingsOverride(Arc::new(option)));
-                    }
-                    InvalidConfigFlagReason::ExtendPassedViaConfigFlag
-                }
-                Err(underlying_error) => {
-                    InvalidConfigFlagReason::ValidTomlButInvalidRuffSchema(underlying_error)
-                }
-            },
-            Err(underlying_error) => InvalidConfigFlagReason::InvalidToml(underlying_error),
-        };
-
-        let mut new_error = clap::Error::new(clap::error::ErrorKind::ValueValidation).with_cmd(cmd);
-        if let Some(arg) = arg {
-            new_error.insert(
-                clap::error::ContextKind::InvalidArg,
-                clap::error::ContextValue::String(arg.to_string()),
-            );
-        }
-        new_error.insert(
-            clap::error::ContextKind::InvalidValue,
-            clap::error::ContextValue::String(value.to_string()),
-        );
-
-        let underlying_error = match &config_parse_error {
-            InvalidConfigFlagReason::ExtendPassedViaConfigFlag => {
-                let tip = config_parse_error.description().into();
-                new_error.insert(
-                    clap::error::ContextKind::Suggested,
-                    clap::error::ContextValue::StyledStrs(vec![tip]),
-                );
-                return Err(new_error);
-            }
-            InvalidConfigFlagReason::InvalidToml(underlying_error)
-            | InvalidConfigFlagReason::ValidTomlButInvalidRuffSchema(underlying_error) => {
-                underlying_error
-            }
-        };
-
-        // small hack so that multiline tips
-        // have the same indent on the left-hand side:
-        let tip_indent = " ".repeat("  tip: ".len());
-
-        let mut tip = format!(
-            "\
-A `--config` flag must either be a path to a `.toml` configuration file
-{tip_indent}or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-{tip_indent}option"
-        );
-
-        // Here we do some heuristics to try to figure out whether
-        // the user was trying to pass in a path to a configuration file
-        // or some inline TOML.
-        // We want to display the most helpful error to the user as possible.
-        if std::path::Path::new(value)
-            .extension()
-            .map_or(false, |ext| ext.eq_ignore_ascii_case("toml"))
-        {
-            if !value.contains('=') {
-                tip.push_str(&format!(
-                    "
-
-It looks like you were trying to pass a path to a configuration file.
-The path `{value}` does not point to a configuration file"
-                ));
-            }
-        } else if value.contains('=') {
-            tip.push_str(&format!(
-                "\n\n{}:\n\n{underlying_error}",
-                config_parse_error.description()
-            ));
-        }
-        let tip = tip.trim_end().to_owned().into();
-
-        new_error.insert(
-            clap::error::ContextKind::Suggested,
-            clap::error::ContextValue::StyledStrs(vec![tip]),
-        );
-
-        Err(new_error)
-    }
-}
-
 fn resolve_output_format(
     output_format: Option<SerializationFormat>,
     show_sources: Option<bool>,
@@ -959,12 +642,14 @@ fn resolve_output_format(
 #[allow(clippy::struct_excessive_bools)]
 pub struct CheckArguments {
     pub add_noqa: bool,
+    pub config: Option<PathBuf>,
     pub diff: bool,
     pub ecosystem_ci: bool,
     pub exit_non_zero_on_fix: bool,
     pub exit_zero: bool,
     pub files: Vec<PathBuf>,
     pub ignore_noqa: bool,
+    pub isolated: bool,
     pub no_cache: bool,
     pub output_file: Option<PathBuf>,
     pub show_files: bool,
@@ -981,234 +666,45 @@ pub struct FormatArguments {
     pub check: bool,
     pub no_cache: bool,
     pub diff: bool,
+    pub config: Option<PathBuf>,
     pub files: Vec<PathBuf>,
+    pub isolated: bool,
     pub stdin_filename: Option<PathBuf>,
-    pub range: Option<FormatRange>,
 }
 
-/// A text range specified by line and column numbers.
-#[derive(Copy, Clone, Debug)]
-pub struct FormatRange {
-    start: LineColumn,
-    end: LineColumn,
-}
-
-impl FormatRange {
-    /// Converts the line:column range to a byte offset range specific for `source`.
-    ///
-    /// Returns an empty range if the start range is past the end of `source`.
-    pub(super) fn to_text_range(self, source: &str, line_index: &LineIndex) -> TextRange {
-        let start_byte_offset = line_index.offset(self.start.line, self.start.column, source);
-        let end_byte_offset = line_index.offset(self.end.line, self.end.column, source);
-
-        TextRange::new(start_byte_offset, end_byte_offset)
-    }
-}
-
-impl FromStr for FormatRange {
-    type Err = FormatRangeParseError;
-
-    fn from_str(value: &str) -> Result<Self, Self::Err> {
-        let (start, end) = value.split_once('-').unwrap_or((value, ""));
-
-        let start = if start.is_empty() {
-            LineColumn::default()
-        } else {
-            start.parse().map_err(FormatRangeParseError::InvalidStart)?
-        };
-
-        let end = if end.is_empty() {
-            LineColumn {
-                line: OneIndexed::MAX,
-                column: OneIndexed::MAX,
-            }
-        } else {
-            end.parse().map_err(FormatRangeParseError::InvalidEnd)?
-        };
-
-        if start > end {
-            return Err(FormatRangeParseError::StartGreaterThanEnd(start, end));
-        }
-
-        Ok(FormatRange { start, end })
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum FormatRangeParseError {
-    InvalidStart(LineColumnParseError),
-    InvalidEnd(LineColumnParseError),
-
-    StartGreaterThanEnd(LineColumn, LineColumn),
-}
-
-impl std::fmt::Display for FormatRangeParseError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let tip = "  tip:".bold().green();
-        match self {
-            FormatRangeParseError::StartGreaterThanEnd(start, end) => {
-                write!(
-                    f,
-                    "the start position '{start_invalid}' is greater than the end position '{end_invalid}'.\n  {tip} Try switching start and end: '{end}-{start}'",
-                    start_invalid=start.to_string().bold().yellow(),
-                    end_invalid=end.to_string().bold().yellow(),
-                    start=start.to_string().green().bold(),
-                    end=end.to_string().green().bold()
-                )
-            }
-            FormatRangeParseError::InvalidStart(inner) => inner.write(f, true),
-            FormatRangeParseError::InvalidEnd(inner) => inner.write(f, false),
-        }
-    }
-}
-
-impl std::error::Error for FormatRangeParseError {}
-
-#[derive(Copy, Clone, Debug)]
-pub struct LineColumn {
-    pub line: OneIndexed,
-    pub column: OneIndexed,
-}
-
-impl std::fmt::Display for LineColumn {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{line}:{column}", line = self.line, column = self.column)
-    }
-}
-
-impl Default for LineColumn {
-    fn default() -> Self {
-        LineColumn {
-            line: OneIndexed::MIN,
-            column: OneIndexed::MIN,
-        }
-    }
-}
-
-impl PartialOrd for LineColumn {
-    #[inline]
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for LineColumn {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.line
-            .cmp(&other.line)
-            .then(self.column.cmp(&other.column))
-    }
-}
-
-impl PartialEq for LineColumn {
-    fn eq(&self, other: &Self) -> bool {
-        self.cmp(other) == Ordering::Equal
-    }
-}
-
-impl Eq for LineColumn {}
-
-impl FromStr for LineColumn {
-    type Err = LineColumnParseError;
-
-    fn from_str(value: &str) -> Result<Self, Self::Err> {
-        let (line, column) = value.split_once(':').unwrap_or((value, "1"));
-
-        let line: usize = line.parse().map_err(LineColumnParseError::LineParseError)?;
-        let column: usize = column
-            .parse()
-            .map_err(LineColumnParseError::ColumnParseError)?;
-
-        match (OneIndexed::new(line), OneIndexed::new(column)) {
-            (Some(line), Some(column)) => Ok(LineColumn { line, column }),
-            (Some(line), None) => Err(LineColumnParseError::ZeroColumnIndex { line }),
-            (None, Some(column)) => Err(LineColumnParseError::ZeroLineIndex { column }),
-            (None, None) => Err(LineColumnParseError::ZeroLineAndColumnIndex),
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum LineColumnParseError {
-    ZeroLineIndex { column: OneIndexed },
-    ZeroColumnIndex { line: OneIndexed },
-    ZeroLineAndColumnIndex,
-    LineParseError(std::num::ParseIntError),
-    ColumnParseError(std::num::ParseIntError),
-}
-
-impl LineColumnParseError {
-    fn write(&self, f: &mut std::fmt::Formatter, start_range: bool) -> std::fmt::Result {
-        let tip = "tip:".bold().green();
-
-        let range = if start_range { "start" } else { "end" };
-
-        match self {
-            LineColumnParseError::ColumnParseError(inner) => {
-                write!(f, "the {range}s column is not a valid number ({inner})'\n  {tip} The format is 'line:column'.")
-            }
-            LineColumnParseError::LineParseError(inner) => {
-                write!(f, "the {range} line is not a valid number ({inner})\n  {tip} The format is 'line:column'.")
-            }
-            LineColumnParseError::ZeroColumnIndex { line } => {
-                write!(
-                    f,
-                    "the {range} column is 0, but it should be 1 or greater.\n  {tip} The column numbers start at 1.\n  {tip} Try {suggestion} instead.",
-                    suggestion=format!("{line}:1").green().bold()
-                )
-            }
-            LineColumnParseError::ZeroLineIndex { column } => {
-                write!(
-                    f,
-                    "the {range} line is 0, but it should be 1 or greater.\n  {tip} The line numbers start at 1.\n  {tip} Try {suggestion} instead.",
-                    suggestion=format!("1:{column}").green().bold()
-                )
-            }
-            LineColumnParseError::ZeroLineAndColumnIndex => {
-                write!(
-                    f,
-                    "the {range} line and column are both 0, but they should be 1 or greater.\n  {tip} The line and column numbers start at 1.\n  {tip} Try {suggestion} instead.",
-                    suggestion="1:1".to_string().green().bold()
-                )
-            }
-        }
-    }
-}
-
-/// Configuration overrides provided via dedicated CLI flags:
-/// `--line-length`, `--respect-gitignore`, etc.
+/// CLI settings that function as configuration overrides.
 #[derive(Clone, Default)]
 #[allow(clippy::struct_excessive_bools)]
-struct ExplicitConfigOverrides {
-    dummy_variable_rgx: Option<Regex>,
-    exclude: Option<Vec<FilePattern>>,
-    extend_exclude: Option<Vec<FilePattern>>,
-    extend_fixable: Option<Vec<RuleSelector>>,
-    extend_ignore: Option<Vec<RuleSelector>>,
-    extend_select: Option<Vec<RuleSelector>>,
-    extend_unfixable: Option<Vec<RuleSelector>>,
-    fixable: Option<Vec<RuleSelector>>,
-    ignore: Option<Vec<RuleSelector>>,
-    line_length: Option<LineLength>,
-    per_file_ignores: Option<Vec<PatternPrefixPair>>,
-    extend_per_file_ignores: Option<Vec<PatternPrefixPair>>,
-    preview: Option<PreviewMode>,
-    respect_gitignore: Option<bool>,
-    select: Option<Vec<RuleSelector>>,
-    target_version: Option<PythonVersion>,
-    unfixable: Option<Vec<RuleSelector>>,
+pub struct CliOverrides {
+    pub dummy_variable_rgx: Option<Regex>,
+    pub exclude: Option<Vec<FilePattern>>,
+    pub extend_exclude: Option<Vec<FilePattern>>,
+    pub extend_fixable: Option<Vec<RuleSelector>>,
+    pub extend_ignore: Option<Vec<RuleSelector>>,
+    pub extend_select: Option<Vec<RuleSelector>>,
+    pub extend_unfixable: Option<Vec<RuleSelector>>,
+    pub fixable: Option<Vec<RuleSelector>>,
+    pub ignore: Option<Vec<RuleSelector>>,
+    pub line_length: Option<LineLength>,
+    pub per_file_ignores: Option<Vec<PatternPrefixPair>>,
+    pub extend_per_file_ignores: Option<Vec<PatternPrefixPair>>,
+    pub preview: Option<PreviewMode>,
+    pub respect_gitignore: Option<bool>,
+    pub select: Option<Vec<RuleSelector>>,
+    pub target_version: Option<PythonVersion>,
+    pub unfixable: Option<Vec<RuleSelector>>,
     // TODO(charlie): Captured in pyproject.toml as a default, but not part of `Settings`.
-    cache_dir: Option<PathBuf>,
-    fix: Option<bool>,
-    fix_only: Option<bool>,
-    unsafe_fixes: Option<UnsafeFixes>,
-    force_exclude: Option<bool>,
-    output_format: Option<SerializationFormat>,
-    show_fixes: Option<bool>,
-    extension: Option<Vec<ExtensionPair>>,
+    pub cache_dir: Option<PathBuf>,
+    pub fix: Option<bool>,
+    pub fix_only: Option<bool>,
+    pub unsafe_fixes: Option<UnsafeFixes>,
+    pub force_exclude: Option<bool>,
+    pub output_format: Option<SerializationFormat>,
+    pub show_fixes: Option<bool>,
+    pub extension: Option<Vec<ExtensionPair>>,
 }
 
-impl ConfigurationTransformer for ExplicitConfigOverrides {
+impl ConfigurationTransformer for CliOverrides {
     fn transform(&self, mut config: Configuration) -> Configuration {
         if let Some(cache_dir) = &self.cache_dir {
             config.cache_dir = Some(cache_dir.clone());

crates/ruff/src/cache.rs

@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 use std::fs::{self, File};
 use std::hash::Hasher;
-use std::io::{self, BufReader, Write};
+use std::io::{self, BufReader, BufWriter, Write};
 use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::Mutex;
@@ -15,7 +15,6 @@ use rayon::iter::ParallelIterator;
 use rayon::iter::{IntoParallelIterator, ParallelBridge};
 use rustc_hash::FxHashMap;
 use serde::{Deserialize, Serialize};
-use tempfile::NamedTempFile;
 
 use ruff_cache::{CacheKey, CacheKeyHasher};
 use ruff_diagnostics::{DiagnosticKind, Fix};
@@ -166,29 +165,15 @@ impl Cache {
             return Ok(());
         }
 
-        // Write the cache to a temporary file first and then rename it for an "atomic" write.
-        // Protects against data loss if the process is killed during the write and races between different ruff
-        // processes, resulting in a corrupted cache file. https://github.com/astral-sh/ruff/issues/8147#issuecomment-1943345964
-        let mut temp_file =
-            NamedTempFile::new_in(self.path.parent().expect("Write path must have a parent"))
-                .context("Failed to create temporary file")?;
-
-        // Serialize to in-memory buffer because hyperfine benchmark showed that it's faster than
-        // using a `BufWriter` and our cache files are small enough that streaming isn't necessary.
-        let serialized =
-            bincode::serialize(&self.package).context("Failed to serialize cache data")?;
-        temp_file
-            .write_all(&serialized)
-            .context("Failed to write serialized cache to temporary file.")?;
-
-        temp_file.persist(&self.path).with_context(|| {
+        let file = File::create(&self.path)
+            .with_context(|| format!("Failed to create cache file '{}'", self.path.display()))?;
+        let writer = BufWriter::new(file);
+        bincode::serialize_into(writer, &self.package).with_context(|| {
             format!(
-                "Failed to rename temporary cache file to {}",
+                "Failed to serialise cache to file '{}'",
                 self.path.display()
             )
-        })?;
-
-        Ok(())
+        })
     }
 
     /// Applies the pending changes without storing the cache to disk.
@@ -383,7 +368,7 @@ pub(crate) fn init(path: &Path) -> Result<()> {
     let gitignore_path = path.join(".gitignore");
     if !gitignore_path.exists() {
         let mut file = fs::File::create(gitignore_path)?;
-        file.write_all(b"# Automatically created by ruff.\n*\n")?;
+        file.write_all(b"*")?;
     }
 
     Ok(())
@@ -1065,7 +1050,6 @@ mod tests {
                 &self.settings.formatter,
                 PySourceType::Python,
                 FormatMode::Write,
-                None,
                 Some(cache),
             )
         }

crates/ruff/src/commands/add_noqa.rs

@@ -12,17 +12,17 @@ use ruff_linter::warn_user_once;
 use ruff_python_ast::{PySourceType, SourceType};
 use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig, ResolvedFile};
 
-use crate::args::ConfigArguments;
+use crate::args::CliOverrides;
 
 /// Add `noqa` directives to a collection of files.
 pub(crate) fn add_noqa(
     files: &[PathBuf],
     pyproject_config: &PyprojectConfig,
-    config_arguments: &ConfigArguments,
+    overrides: &CliOverrides,
 ) -> Result<usize> {
     // Collect all the files to check.
     let start = Instant::now();
-    let (paths, resolver) = python_files_in_path(files, pyproject_config, config_arguments)?;
+    let (paths, resolver) = python_files_in_path(files, pyproject_config, overrides)?;
     let duration = start.elapsed();
     debug!("Identified files to lint in: {:?}", duration);
 

crates/ruff/src/commands/check.rs

@@ -24,7 +24,7 @@ use ruff_workspace::resolver::{
     match_exclusion, python_files_in_path, PyprojectConfig, ResolvedFile,
 };
 
-use crate::args::ConfigArguments;
+use crate::args::CliOverrides;
 use crate::cache::{Cache, PackageCacheMap, PackageCaches};
 use crate::diagnostics::Diagnostics;
 use crate::panic::catch_unwind;
@@ -34,7 +34,7 @@ use crate::panic::catch_unwind;
 pub(crate) fn check(
     files: &[PathBuf],
     pyproject_config: &PyprojectConfig,
-    config_arguments: &ConfigArguments,
+    overrides: &CliOverrides,
     cache: flags::Cache,
     noqa: flags::Noqa,
     fix_mode: flags::FixMode,
@@ -42,7 +42,7 @@ pub(crate) fn check(
 ) -> Result<Diagnostics> {
     // Collect all the Python files to check.
     let start = Instant::now();
-    let (paths, resolver) = python_files_in_path(files, pyproject_config, config_arguments)?;
+    let (paths, resolver) = python_files_in_path(files, pyproject_config, overrides)?;
     debug!("Identified files to lint in: {:?}", start.elapsed());
 
     if paths.is_empty() {
@@ -233,7 +233,7 @@ mod test {
     use ruff_workspace::resolver::{PyprojectConfig, PyprojectDiscoveryStrategy};
     use ruff_workspace::Settings;
 
-    use crate::args::ConfigArguments;
+    use crate::args::CliOverrides;
 
     use super::check;
 
@@ -272,7 +272,7 @@ mod test {
             // Notebooks are not included by default
             &[tempdir.path().to_path_buf(), notebook],
             &pyproject_config,
-            &ConfigArguments::default(),
+            &CliOverrides::default(),
             flags::Cache::Disabled,
             flags::Noqa::Disabled,
             flags::FixMode::Generate,

crates/ruff/src/commands/check_stdin.rs

@@ -6,7 +6,7 @@ use ruff_linter::packaging;
 use ruff_linter::settings::flags;
 use ruff_workspace::resolver::{match_exclusion, python_file_at_path, PyprojectConfig, Resolver};
 
-use crate::args::ConfigArguments;
+use crate::args::CliOverrides;
 use crate::diagnostics::{lint_stdin, Diagnostics};
 use crate::stdin::{parrot_stdin, read_from_stdin};
 
@@ -14,7 +14,7 @@ use crate::stdin::{parrot_stdin, read_from_stdin};
 pub(crate) fn check_stdin(
     filename: Option<&Path>,
     pyproject_config: &PyprojectConfig,
-    overrides: &ConfigArguments,
+    overrides: &CliOverrides,
     noqa: flags::Noqa,
     fix_mode: flags::FixMode,
 ) -> Result<Diagnostics> {

crates/ruff/src/commands/format.rs

@@ -23,13 +23,12 @@ use ruff_linter::rules::flake8_quotes::settings::Quote;
 use ruff_linter::source_kind::{SourceError, SourceKind};
 use ruff_linter::warn_user_once;
 use ruff_python_ast::{PySourceType, SourceType};
-use ruff_python_formatter::{format_module_source, format_range, FormatModuleError, QuoteStyle};
-use ruff_source_file::LineIndex;
+use ruff_python_formatter::{format_module_source, FormatModuleError, QuoteStyle};
 use ruff_text_size::{TextLen, TextRange, TextSize};
 use ruff_workspace::resolver::{match_exclusion, python_files_in_path, ResolvedFile, Resolver};
 use ruff_workspace::FormatterSettings;
 
-use crate::args::{ConfigArguments, FormatArguments, FormatRange};
+use crate::args::{CliOverrides, FormatArguments};
 use crate::cache::{Cache, FileCacheKey, PackageCacheMap, PackageCaches};
 use crate::panic::{catch_unwind, PanicError};
 use crate::resolve::resolve;
@@ -60,25 +59,24 @@ impl FormatMode {
 /// Format a set of files, and return the exit status.
 pub(crate) fn format(
     cli: FormatArguments,
-    config_arguments: &ConfigArguments,
+    overrides: &CliOverrides,
+    log_level: LogLevel,
 ) -> Result<ExitStatus> {
-    let pyproject_config = resolve(config_arguments, cli.stdin_filename.as_deref())?;
+    let pyproject_config = resolve(
+        cli.isolated,
+        cli.config.as_deref(),
+        overrides,
+        cli.stdin_filename.as_deref(),
+    )?;
     let mode = FormatMode::from_cli(&cli);
     let files = resolve_default_files(cli.files, false);
-    let (paths, resolver) = python_files_in_path(&files, &pyproject_config, config_arguments)?;
+    let (paths, resolver) = python_files_in_path(&files, &pyproject_config, overrides)?;
 
     if paths.is_empty() {
         warn_user_once!("No Python files found under the given path(s)");
         return Ok(ExitStatus::Success);
     }
 
-    if cli.range.is_some() && paths.len() > 1 {
-        return Err(anyhow::anyhow!(
-            "The `--range` option is only supported when formatting a single file but the specified paths resolve to {} files.",
-            paths.len()
-        ));
-    }
-
     warn_incompatible_formatter_settings(&resolver);
 
     // Discover the package root for each Python file.
@@ -141,14 +139,7 @@ pub(crate) fn format(
 
                     Some(
                         match catch_unwind(|| {
-                            format_path(
-                                path,
-                                &settings.formatter,
-                                source_type,
-                                mode,
-                                cli.range,
-                                cache,
-                            )
+                            format_path(path, &settings.formatter, source_type, mode, cache)
                         }) {
                             Ok(inner) => inner.map(|result| FormatPathResult {
                                 path: resolved_file.path().to_path_buf(),
@@ -197,7 +188,7 @@ pub(crate) fn format(
     }
 
     // Report on the formatting changes.
-    if config_arguments.log_level >= LogLevel::Default {
+    if log_level >= LogLevel::Default {
         if mode.is_diff() {
             // Allow piping the diff to e.g. a file by writing the summary to stderr
             results.write_summary(&mut stderr().lock())?;
@@ -235,7 +226,6 @@ pub(crate) fn format_path(
     settings: &FormatterSettings,
     source_type: PySourceType,
     mode: FormatMode,
-    range: Option<FormatRange>,
     cache: Option<&Cache>,
 ) -> Result<FormatResult, FormatCommandError> {
     if let Some(cache) = cache {
@@ -260,12 +250,8 @@ pub(crate) fn format_path(
         }
     };
 
-    // Don't write back to the cache if formatting a range.
-    let cache = cache.filter(|_| range.is_none());
-
     // Format the source.
-    let format_result = match format_source(&unformatted, source_type, Some(path), settings, range)?
-    {
+    let format_result = match format_source(&unformatted, source_type, Some(path), settings)? {
         FormattedSource::Formatted(formatted) => match mode {
             FormatMode::Write => {
                 let mut writer = File::create(path).map_err(|err| {
@@ -333,31 +319,12 @@ pub(crate) fn format_source(
     source_type: PySourceType,
     path: Option<&Path>,
     settings: &FormatterSettings,
-    range: Option<FormatRange>,
 ) -> Result<FormattedSource, FormatCommandError> {
     match &source_kind {
         SourceKind::Python(unformatted) => {
             let options = settings.to_format_options(source_type, unformatted);
 
-            let formatted = if let Some(range) = range {
-                let line_index = LineIndex::from_source_text(unformatted);
-                let byte_range = range.to_text_range(unformatted, &line_index);
-                format_range(unformatted, byte_range, options).map(|formatted_range| {
-                    let mut formatted = unformatted.to_string();
-                    formatted.replace_range(
-                        std::ops::Range::<usize>::from(formatted_range.source_range()),
-                        formatted_range.as_code(),
-                    );
-
-                    formatted
-                })
-            } else {
-                // Using `Printed::into_code` requires adding `ruff_formatter` as a direct dependency, and I suspect that Rust can optimize the closure away regardless.
-                #[allow(clippy::redundant_closure_for_method_calls)]
-                format_module_source(unformatted, options).map(|formatted| formatted.into_code())
-            };
-
-            let formatted = formatted.map_err(|err| {
+            let formatted = format_module_source(unformatted, options).map_err(|err| {
                 if let FormatModuleError::ParseError(err) = err {
                     DisplayParseError::from_source_kind(
                         err,
@@ -370,6 +337,7 @@ pub(crate) fn format_source(
                 }
             })?;
 
+            let formatted = formatted.into_code();
             if formatted.len() == unformatted.len() && formatted == *unformatted {
                 Ok(FormattedSource::Unchanged)
             } else {
@@ -381,12 +349,6 @@ pub(crate) fn format_source(
                 return Ok(FormattedSource::Unchanged);
             }
 
-            if range.is_some() {
-                return Err(FormatCommandError::RangeFormatNotebook(
-                    path.map(Path::to_path_buf),
-                ));
-            }
-
             let options = settings.to_format_options(source_type, notebook.source_code());
 
             let mut output: Option<String> = None;
@@ -527,7 +489,7 @@ impl<'a> FormatResults<'a> {
             })
             .sorted_unstable_by_key(|(path, _, _)| *path)
         {
-            write!(f, "{}", unformatted.diff(formatted, Some(path)).unwrap())?;
+            unformatted.diff(formatted, Some(path), f)?;
         }
 
         Ok(())
@@ -627,7 +589,6 @@ pub(crate) enum FormatCommandError {
     Format(Option<PathBuf>, FormatModuleError),
     Write(Option<PathBuf>, SourceError),
     Diff(Option<PathBuf>, io::Error),
-    RangeFormatNotebook(Option<PathBuf>),
 }
 
 impl FormatCommandError {
@@ -645,8 +606,7 @@ impl FormatCommandError {
             | Self::Read(path, _)
             | Self::Format(path, _)
             | Self::Write(path, _)
-            | Self::Diff(path, _)
-            | Self::RangeFormatNotebook(path) => path.as_deref(),
+            | Self::Diff(path, _) => path.as_deref(),
         }
     }
 }
@@ -668,10 +628,9 @@ impl Display for FormatCommandError {
                 } else {
                     write!(
                         f,
-                        "{header} {error}",
-                        header = "Encountered error:".bold(),
-                        error = err
-                            .io_error()
+                        "{} {}",
+                        "Encountered error:".bold(),
+                        err.io_error()
                             .map_or_else(|| err.to_string(), std::string::ToString::to_string)
                     )
                 }
@@ -689,7 +648,7 @@ impl Display for FormatCommandError {
                         ":".bold()
                     )
                 } else {
-                    write!(f, "{header} {err}", header = "Failed to read:".bold())
+                    write!(f, "{}{} {err}", "Failed to read".bold(), ":".bold())
                 }
             }
             Self::Write(path, err) => {
@@ -702,7 +661,7 @@ impl Display for FormatCommandError {
                         ":".bold()
                     )
                 } else {
-                    write!(f, "{header} {err}", header = "Failed to write:".bold())
+                    write!(f, "{}{} {err}", "Failed to write".bold(), ":".bold())
                 }
             }
             Self::Format(path, err) => {
@@ -715,7 +674,7 @@ impl Display for FormatCommandError {
                         ":".bold()
                     )
                 } else {
-                    write!(f, "{header} {err}", header = "Failed to format:".bold())
+                    write!(f, "{}{} {err}", "Failed to format".bold(), ":".bold())
                 }
             }
             Self::Diff(path, err) => {
@@ -730,25 +689,9 @@ impl Display for FormatCommandError {
                 } else {
                     write!(
                         f,
-                        "{header} {err}",
-                        header = "Failed to generate diff:".bold(),
-                    )
-                }
-            }
-            Self::RangeFormatNotebook(path) => {
-                if let Some(path) = path {
-                    write!(
-                        f,
-                        "{header}{path}{colon} Range formatting isn't supported for notebooks.",
-                        header = "Failed to format ".bold(),
-                        path = fs::relativize_path(path).bold(),
-                        colon = ":".bold()
-                    )
-                } else {
-                    write!(
-                        f,
-                        "{header} Range formatting isn't supported for notebooks",
-                        header = "Failed to format:".bold()
+                        "{}{} {err}",
+                        "Failed to generate diff".bold(),
+                        ":".bold()
                     )
                 }
             }

crates/ruff/src/commands/format_stdin.rs

@@ -9,7 +9,7 @@ use ruff_python_ast::{PySourceType, SourceType};
 use ruff_workspace::resolver::{match_exclusion, python_file_at_path, Resolver};
 use ruff_workspace::FormatterSettings;
 
-use crate::args::{ConfigArguments, FormatArguments, FormatRange};
+use crate::args::{CliOverrides, FormatArguments};
 use crate::commands::format::{
     format_source, warn_incompatible_formatter_settings, FormatCommandError, FormatMode,
     FormatResult, FormattedSource,
@@ -19,11 +19,13 @@ use crate::stdin::{parrot_stdin, read_from_stdin};
 use crate::ExitStatus;
 
 /// Run the formatter over a single file, read from `stdin`.
-pub(crate) fn format_stdin(
-    cli: &FormatArguments,
-    config_arguments: &ConfigArguments,
-) -> Result<ExitStatus> {
-    let pyproject_config = resolve(config_arguments, cli.stdin_filename.as_deref())?;
+pub(crate) fn format_stdin(cli: &FormatArguments, overrides: &CliOverrides) -> Result<ExitStatus> {
+    let pyproject_config = resolve(
+        cli.isolated,
+        cli.config.as_deref(),
+        overrides,
+        cli.stdin_filename.as_deref(),
+    )?;
 
     let mut resolver = Resolver::new(&pyproject_config);
     warn_incompatible_formatter_settings(&resolver);
@@ -32,7 +34,7 @@ pub(crate) fn format_stdin(
 
     if resolver.force_exclude() {
         if let Some(filename) = cli.stdin_filename.as_deref() {
-            if !python_file_at_path(filename, &mut resolver, config_arguments)? {
+            if !python_file_at_path(filename, &mut resolver, overrides)? {
                 if mode.is_write() {
                     parrot_stdin()?;
                 }
@@ -67,7 +69,7 @@ pub(crate) fn format_stdin(
     };
 
     // Format the file.
-    match format_source_code(path, cli.range, settings, source_type, mode) {
+    match format_source_code(path, settings, source_type, mode) {
         Ok(result) => match mode {
             FormatMode::Write => Ok(ExitStatus::Success),
             FormatMode::Check | FormatMode::Diff => {
@@ -88,7 +90,6 @@ pub(crate) fn format_stdin(
 /// Format source code read from `stdin`.
 fn format_source_code(
     path: Option<&Path>,
-    range: Option<FormatRange>,
     settings: &FormatterSettings,
     source_type: PySourceType,
     mode: FormatMode,
@@ -106,7 +107,7 @@ fn format_source_code(
     };
 
     // Format the source.
-    let formatted = format_source(&source_kind, source_type, path, settings, range)?;
+    let formatted = format_source(&source_kind, source_type, path, settings)?;
 
     match &formatted {
         FormattedSource::Formatted(formatted) => match mode {
@@ -118,13 +119,9 @@ fn format_source_code(
             }
             FormatMode::Check => {}
             FormatMode::Diff => {
-                use std::io::Write;
-                write!(
-                    &mut stdout().lock(),
-                    "{}",
-                    source_kind.diff(formatted, path).unwrap()
-                )
-                .map_err(|err| FormatCommandError::Diff(path.map(Path::to_path_buf), err))?;
+                source_kind
+                    .diff(formatted, path, &mut stdout().lock())
+                    .map_err(|err| FormatCommandError::Diff(path.map(Path::to_path_buf), err))?;
             }
         },
         FormattedSource::Unchanged => {

crates/ruff/src/commands/show_files.rs

@@ -7,17 +7,17 @@ use itertools::Itertools;
 use ruff_linter::warn_user_once;
 use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig, ResolvedFile};
 
-use crate::args::ConfigArguments;
+use crate::args::CliOverrides;
 
 /// Show the list of files to be checked based on current settings.
 pub(crate) fn show_files(
     files: &[PathBuf],
     pyproject_config: &PyprojectConfig,
-    config_arguments: &ConfigArguments,
+    overrides: &CliOverrides,
     writer: &mut impl Write,
 ) -> Result<()> {
     // Collect all files in the hierarchy.
-    let (paths, _resolver) = python_files_in_path(files, pyproject_config, config_arguments)?;
+    let (paths, _resolver) = python_files_in_path(files, pyproject_config, overrides)?;
 
     if paths.is_empty() {
         warn_user_once!("No Python files found under the given path(s)");

crates/ruff/src/commands/show_settings.rs

@@ -6,17 +6,17 @@ use itertools::Itertools;
 
 use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig, ResolvedFile};
 
-use crate::args::ConfigArguments;
+use crate::args::CliOverrides;
 
 /// Print the user-facing configuration settings.
 pub(crate) fn show_settings(
     files: &[PathBuf],
     pyproject_config: &PyprojectConfig,
-    config_arguments: &ConfigArguments,
+    overrides: &CliOverrides,
     writer: &mut impl Write,
 ) -> Result<()> {
     // Collect all files in the hierarchy.
-    let (paths, resolver) = python_files_in_path(files, pyproject_config, config_arguments)?;
+    let (paths, resolver) = python_files_in_path(files, pyproject_config, overrides)?;
 
     // Print the list of files.
     let Some(path) = paths
@@ -31,9 +31,9 @@ pub(crate) fn show_settings(
 
     let settings = resolver.resolve(&path);
 
-    writeln!(writer, "Resolved settings for: \"{}\"", path.display())?;
+    writeln!(writer, "Resolved settings for: {path:?}")?;
     if let Some(settings_path) = pyproject_config.path.as_ref() {
-        writeln!(writer, "Settings path: \"{}\"", settings_path.display())?;
+        writeln!(writer, "Settings path: {settings_path:?}")?;
     }
     write!(writer, "{settings}")?;
 

crates/ruff/src/diagnostics.rs

@@ -3,7 +3,6 @@
 use std::borrow::Cow;
 use std::fs::File;
 use std::io;
-use std::io::Write;
 use std::ops::{Add, AddAssign};
 use std::path::Path;
 
@@ -290,10 +289,10 @@ pub(crate) fn lint_path(
                 match fix_mode {
                     flags::FixMode::Apply => transformed.write(&mut File::create(path)?)?,
                     flags::FixMode::Diff => {
-                        write!(
+                        source_kind.diff(
+                            transformed.as_ref(),
+                            Some(path),
                             &mut io::stdout().lock(),
-                            "{}",
-                            source_kind.diff(&transformed, Some(path)).unwrap()
                         )?;
                     }
                     flags::FixMode::Generate => {}
@@ -443,11 +442,7 @@ pub(crate) fn lint_stdin(
                 flags::FixMode::Diff => {
                     // But only write a diff if it's non-empty.
                     if !fixed.is_empty() {
-                        write!(
-                            &mut io::stdout().lock(),
-                            "{}",
-                            source_kind.diff(&transformed, path).unwrap()
-                        )?;
+                        source_kind.diff(transformed.as_ref(), path, &mut io::stdout().lock())?;
                     }
                 }
                 flags::FixMode::Generate => {}

crates/ruff/src/lib.rs

@@ -7,7 +7,6 @@ use std::process::ExitCode;
 use std::sync::mpsc::channel;
 
 use anyhow::Result;
-use args::GlobalConfigArgs;
 use clap::CommandFactory;
 use colored::Colorize;
 use log::warn;
@@ -19,7 +18,7 @@ use ruff_linter::settings::types::SerializationFormat;
 use ruff_linter::{fs, warn_user, warn_user_once};
 use ruff_workspace::Settings;
 
-use crate::args::{Args, CheckCommand, Command, FormatCommand};
+use crate::args::{Args, CheckCommand, Command, FormatCommand, HelpFormat};
 use crate::printer::{Flags as PrinterFlags, Printer};
 
 pub mod args;
@@ -115,12 +114,20 @@ fn resolve_default_files(files: Vec<PathBuf>, is_stdin: bool) -> Vec<PathBuf> {
     }
 }
 
+/// Get the actual value of the `format` desired from either `output_format`
+/// or `format`, and warn the user if they're using the deprecated form.
+fn resolve_help_output_format(output_format: HelpFormat, format: Option<HelpFormat>) -> HelpFormat {
+    if format.is_some() {
+        warn_user!("The `--format` argument is deprecated. Use `--output-format` instead.");
+    }
+    format.unwrap_or(output_format)
+}
+
 pub fn run(
     Args {
         command,
-        global_options,
+        log_level_args,
     }: Args,
-    deprecated_alias_warning: Option<&'static str>,
 ) -> Result<ExitStatus> {
     {
         let default_panic_hook = std::panic::take_hook();
@@ -148,11 +155,8 @@ pub fn run(
     #[cfg(windows)]
     assert!(colored::control::set_virtual_terminal(true).is_ok());
 
-    set_up_logging(global_options.log_level())?;
-
-    if let Some(deprecated_alias_warning) = deprecated_alias_warning {
-        warn_user!("{}", deprecated_alias_warning);
-    }
+    let log_level = LogLevel::from(&log_level_args);
+    set_up_logging(&log_level)?;
 
     match command {
         Command::Version { output_format } => {
@@ -162,8 +166,10 @@ pub fn run(
         Command::Rule {
             rule,
             all,
-            output_format,
+            format,
+            mut output_format,
         } => {
+            output_format = resolve_help_output_format(output_format, format);
             if all {
                 commands::rule::rules(output_format)?;
             }
@@ -176,39 +182,48 @@ pub fn run(
             commands::config::config(option.as_deref())?;
             Ok(ExitStatus::Success)
         }
-        Command::Linter { output_format } => {
+        Command::Linter {
+            format,
+            mut output_format,
+        } => {
+            output_format = resolve_help_output_format(output_format, format);
             commands::linter::linter(output_format)?;
             Ok(ExitStatus::Success)
         }
         Command::Clean => {
-            commands::clean::clean(global_options.log_level())?;
+            commands::clean::clean(log_level)?;
             Ok(ExitStatus::Success)
         }
         Command::GenerateShellCompletion { shell } => {
             shell.generate(&mut Args::command(), &mut stdout());
             Ok(ExitStatus::Success)
         }
-        Command::Check(args) => check(args, global_options),
-        Command::Format(args) => format(args, global_options),
+        Command::Check(args) => check(args, log_level),
+        Command::Format(args) => format(args, log_level),
     }
 }
 
-fn format(args: FormatCommand, global_options: GlobalConfigArgs) -> Result<ExitStatus> {
-    let (cli, config_arguments) = args.partition(global_options)?;
+fn format(args: FormatCommand, log_level: LogLevel) -> Result<ExitStatus> {
+    let (cli, overrides) = args.partition();
 
     if is_stdin(&cli.files, cli.stdin_filename.as_deref()) {
-        commands::format_stdin::format_stdin(&cli, &config_arguments)
+        commands::format_stdin::format_stdin(&cli, &overrides)
     } else {
-        commands::format::format(cli, &config_arguments)
+        commands::format::format(cli, &overrides, log_level)
     }
 }
 
-pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<ExitStatus> {
-    let (cli, config_arguments) = args.partition(global_options)?;
+pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
+    let (cli, overrides) = args.partition();
 
     // Construct the "default" settings. These are used when no `pyproject.toml`
     // files are present, or files are injected from outside of the hierarchy.
-    let pyproject_config = resolve::resolve(&config_arguments, cli.stdin_filename.as_deref())?;
+    let pyproject_config = resolve::resolve(
+        cli.isolated,
+        cli.config.as_deref(),
+        &overrides,
+        cli.stdin_filename.as_deref(),
+    )?;
 
     let mut writer: Box<dyn Write> = match cli.output_file {
         Some(path) if !cli.watch => {
@@ -224,21 +239,11 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
     let files = resolve_default_files(cli.files, is_stdin);
 
     if cli.show_settings {
-        commands::show_settings::show_settings(
-            &files,
-            &pyproject_config,
-            &config_arguments,
-            &mut writer,
-        )?;
+        commands::show_settings::show_settings(&files, &pyproject_config, &overrides, &mut writer)?;
         return Ok(ExitStatus::Success);
     }
     if cli.show_files {
-        commands::show_files::show_files(
-            &files,
-            &pyproject_config,
-            &config_arguments,
-            &mut writer,
-        )?;
+        commands::show_files::show_files(&files, &pyproject_config, &overrides, &mut writer)?;
         return Ok(ExitStatus::Success);
     }
 
@@ -297,9 +302,8 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
         if !fix_mode.is_generate() {
             warn_user!("--fix is incompatible with --add-noqa.");
         }
-        let modifications =
-            commands::add_noqa::add_noqa(&files, &pyproject_config, &config_arguments)?;
-        if modifications > 0 && config_arguments.log_level >= LogLevel::Default {
+        let modifications = commands::add_noqa::add_noqa(&files, &pyproject_config, &overrides)?;
+        if modifications > 0 && log_level >= LogLevel::Default {
             let s = if modifications == 1 { "" } else { "s" };
             #[allow(clippy::print_stderr)]
             {
@@ -311,17 +315,13 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
 
     let printer = Printer::new(
         output_format,
-        config_arguments.log_level,
+        log_level,
         fix_mode,
         unsafe_fixes,
         printer_flags,
     );
 
-    // the settings should already be combined with the CLI overrides at this point
-    // TODO(jane): let's make this `PreviewMode`
-    // TODO: this should reference the global preview mode once https://github.com/astral-sh/ruff/issues/8232
-    //   is resolved.
-    let preview = pyproject_config.settings.linter.preview.is_enabled();
+    let preview = overrides.preview.unwrap_or_default().is_enabled();
 
     if cli.watch {
         if output_format != SerializationFormat::default(preview) {
@@ -348,7 +348,7 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
         let messages = commands::check::check(
             &files,
             &pyproject_config,
-            &config_arguments,
+            &overrides,
             cache.into(),
             noqa.into(),
             fix_mode,
@@ -368,8 +368,12 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
                     };
 
                     if matches!(change_kind, ChangeKind::Configuration) {
-                        pyproject_config =
-                            resolve::resolve(&config_arguments, cli.stdin_filename.as_deref())?;
+                        pyproject_config = resolve::resolve(
+                            cli.isolated,
+                            cli.config.as_deref(),
+                            &overrides,
+                            cli.stdin_filename.as_deref(),
+                        )?;
                     }
                     Printer::clear_screen()?;
                     printer.write_to_user("File change detected...\n");
@@ -377,7 +381,7 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
                     let messages = commands::check::check(
                         &files,
                         &pyproject_config,
-                        &config_arguments,
+                        &overrides,
                         cache.into(),
                         noqa.into(),
                         fix_mode,
@@ -394,7 +398,7 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
             commands::check_stdin::check_stdin(
                 cli.stdin_filename.map(fs::normalize_path).as_deref(),
                 &pyproject_config,
-                &config_arguments,
+                &overrides,
                 noqa.into(),
                 fix_mode,
             )?
@@ -402,7 +406,7 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
             commands::check::check(
                 &files,
                 &pyproject_config,
-                &config_arguments,
+                &overrides,
                 cache.into(),
                 noqa.into(),
                 fix_mode,

crates/ruff/src/main.rs

@@ -27,42 +27,26 @@ pub fn main() -> ExitCode {
     let mut args =
         argfile::expand_args_from(args, argfile::parse_fromfile, argfile::PREFIX).unwrap();
 
-    // We can't use `warn_user` here because logging isn't set up at this point
-    // and we also don't know if the user runs ruff with quiet.
-    // Keep the message and pass it to `run` that is responsible for emitting the warning.
-    let deprecated_alias_warning = match args.get(1).and_then(|arg| arg.to_str()) {
-        // Deprecated aliases that are handled by clap
-        Some("--explain") => {
-            Some("`ruff --explain <RULE>` is deprecated. Use `ruff rule <RULE>` instead.")
-        }
-        Some("--clean") => {
-            Some("`ruff --clean` is deprecated. Use `ruff clean` instead.")
-        }
-        Some("--generate-shell-completion") => {
-            Some("`ruff --generate-shell-completion <SHELL>` is deprecated. Use `ruff generate-shell-completion <SHELL>` instead.")
-        }
-        // Deprecated `ruff` alias to `ruff check`
-        // Clap doesn't support default subcommands but we want to run `check` by
-        // default for convenience and backwards-compatibility, so we just
-        // preprocess the arguments accordingly before passing them to Clap.
-        Some(arg) if !Command::has_subcommand(arg)
+    // Clap doesn't support default subcommands but we want to run `check` by
+    // default for convenience and backwards-compatibility, so we just
+    // preprocess the arguments accordingly before passing them to Clap.
+    if let Some(arg) = args.get(1) {
+        if arg
+            .to_str()
+            .is_some_and(|arg| !Command::has_subcommand(rewrite_legacy_subcommand(arg)))
             && arg != "-h"
             && arg != "--help"
             && arg != "-V"
             && arg != "--version"
-            && arg != "help" => {
-
-            {
-                args.insert(1, "check".into());
-                Some("`ruff <path>` is deprecated. Use `ruff check <path>` instead.")
-            }
-        },
-        _ => None
-    };
+            && arg != "help"
+        {
+            args.insert(1, "check".into());
+        }
+    }
 
     let args = Args::parse_from(args);
 
-    match run(args, deprecated_alias_warning) {
+    match run(args) {
         Ok(code) => code.into(),
         Err(err) => {
             #[allow(clippy::print_stderr)]
@@ -81,3 +65,12 @@ pub fn main() -> ExitCode {
         }
     }
 }
+
+fn rewrite_legacy_subcommand(cmd: &str) -> &str {
+    match cmd {
+        "--explain" => "rule",
+        "--clean" => "clean",
+        "--generate-shell-completion" => "generate-shell-completion",
+        cmd => cmd,
+    }
+}

crates/ruff/src/resolve.rs

@@ -1,4 +1,4 @@
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 use anyhow::Result;
 use log::debug;
@@ -11,17 +11,19 @@ use ruff_workspace::resolver::{
     Relativity,
 };
 
-use crate::args::ConfigArguments;
+use crate::args::CliOverrides;
 
 /// Resolve the relevant settings strategy and defaults for the current
 /// invocation.
 pub fn resolve(
-    config_arguments: &ConfigArguments,
+    isolated: bool,
+    config: Option<&Path>,
+    overrides: &CliOverrides,
     stdin_filename: Option<&Path>,
 ) -> Result<PyprojectConfig> {
     // First priority: if we're running in isolated mode, use the default settings.
-    if config_arguments.isolated {
-        let config = config_arguments.transform(Configuration::default());
+    if isolated {
+        let config = overrides.transform(Configuration::default());
         let settings = config.into_settings(&path_dedot::CWD)?;
         debug!("Isolated mode, not reading any pyproject.toml");
         return Ok(PyprojectConfig::new(
@@ -34,8 +36,12 @@ pub fn resolve(
     // Second priority: the user specified a `pyproject.toml` file. Use that
     // `pyproject.toml` for _all_ configuration, and resolve paths relative to the
     // current working directory. (This matches ESLint's behavior.)
-    if let Some(pyproject) = config_arguments.config_file() {
-        let settings = resolve_root_settings(pyproject, Relativity::Cwd, config_arguments)?;
+    if let Some(pyproject) = config
+        .map(|config| config.display().to_string())
+        .map(|config| shellexpand::full(&config).map(|config| PathBuf::from(config.as_ref())))
+        .transpose()?
+    {
+        let settings = resolve_root_settings(&pyproject, Relativity::Cwd, overrides)?;
         debug!(
             "Using user-specified configuration file at: {}",
             pyproject.display()
@@ -43,7 +49,7 @@ pub fn resolve(
         return Ok(PyprojectConfig::new(
             PyprojectDiscoveryStrategy::Fixed,
             settings,
-            Some(pyproject.to_path_buf()),
+            Some(pyproject),
         ));
     }
 
@@ -61,7 +67,7 @@ pub fn resolve(
             "Using configuration file (via parent) at: {}",
             pyproject.display()
         );
-        let settings = resolve_root_settings(&pyproject, Relativity::Parent, config_arguments)?;
+        let settings = resolve_root_settings(&pyproject, Relativity::Parent, overrides)?;
         return Ok(PyprojectConfig::new(
             PyprojectDiscoveryStrategy::Hierarchical,
             settings,
@@ -78,7 +84,7 @@ pub fn resolve(
             "Using configuration file (via cwd) at: {}",
             pyproject.display()
         );
-        let settings = resolve_root_settings(&pyproject, Relativity::Cwd, config_arguments)?;
+        let settings = resolve_root_settings(&pyproject, Relativity::Cwd, overrides)?;
         return Ok(PyprojectConfig::new(
             PyprojectDiscoveryStrategy::Hierarchical,
             settings,
@@ -91,7 +97,7 @@ pub fn resolve(
     // "closest" `pyproject.toml` file for every Python file later on, so these act
     // as the "default" settings.)
     debug!("Using Ruff default settings");
-    let config = config_arguments.transform(Configuration::default());
+    let config = overrides.transform(Configuration::default());
     let settings = config.into_settings(&path_dedot::CWD)?;
     Ok(PyprojectConfig::new(
         PyprojectDiscoveryStrategy::Hierarchical,

crates/ruff/tests/deprecation.rs

@@ -12,10 +12,9 @@ const STDIN: &str = "l = 1";
 fn ruff_check(show_source: Option<bool>, output_format: Option<String>) -> Command {
     let mut cmd = Command::new(get_cargo_bin(BIN_NAME));
     let output_format = output_format.unwrap_or(format!("{}", SerializationFormat::default(false)));
-    cmd.arg("check")
-        .arg("--output-format")
-        .arg(output_format)
-        .arg("--no-cache");
+    cmd.arg("--output-format");
+    cmd.arg(output_format);
+    cmd.arg("--no-cache");
     match show_source {
         Some(true) => {
             cmd.arg("--show-source");

crates/ruff/tests/format.rs

@@ -7,15 +7,10 @@ use std::str;
 
 use anyhow::Result;
 use insta_cmd::{assert_cmd_snapshot, get_cargo_bin};
-use regex::escape;
 use tempfile::TempDir;
 
 const BIN_NAME: &str = "ruff";
 
-fn tempdir_filter(tempdir: &TempDir) -> String {
-    format!(r"{}\\?/?", escape(tempdir.path().to_str().unwrap()))
-}
-
 #[test]
 fn default_options() {
     assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
@@ -95,182 +90,6 @@ fn format_warn_stdin_filename_with_files() {
     "###);
 }
 
-#[test]
-fn nonexistent_config_file() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config", "foo.toml", "."]), @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'foo.toml' for '--config <CONFIG_OPTION>'
-
-      tip: A `--config` flag must either be a path to a `.toml` configuration file
-           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-           option
-
-    It looks like you were trying to pass a path to a configuration file.
-    The path `foo.toml` does not point to a configuration file
-
-    For more information, try '--help'.
-    "###);
-}
-
-#[test]
-fn config_override_rejected_if_invalid_toml() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config", "foo = bar", "."]), @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'foo = bar' for '--config <CONFIG_OPTION>'
-
-      tip: A `--config` flag must either be a path to a `.toml` configuration file
-           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-           option
-
-    The supplied argument is not valid TOML:
-
-    TOML parse error at line 1, column 7
-      |
-    1 | foo = bar
-      |       ^
-    invalid string
-    expected `"`, `'`
-
-    For more information, try '--help'.
-    "###);
-}
-
-#[test]
-fn too_many_config_files() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_dot_toml = tempdir.path().join("ruff.toml");
-    let ruff2_dot_toml = tempdir.path().join("ruff2.toml");
-    fs::File::create(&ruff_dot_toml)?;
-    fs::File::create(&ruff2_dot_toml)?;
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .arg("format")
-        .arg("--config")
-        .arg(&ruff_dot_toml)
-        .arg("--config")
-        .arg(&ruff2_dot_toml)
-        .arg("."), @r###"
-            success: false
-            exit_code: 2
-            ----- stdout -----
-
-            ----- stderr -----
-            ruff failed
-              Cause: You cannot specify more than one configuration file on the command line.
-
-              tip: remove either `--config=[TMP]/ruff.toml` or `--config=[TMP]/ruff2.toml`.
-                   For more information, try `--help`.
-
-            "###);
-    });
-    Ok(())
-}
-
-#[test]
-fn config_file_and_isolated() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_dot_toml = tempdir.path().join("ruff.toml");
-    fs::File::create(&ruff_dot_toml)?;
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .arg("format")
-        .arg("--config")
-        .arg(&ruff_dot_toml)
-        .arg("--isolated")
-        .arg("."), @r###"
-        success: false
-        exit_code: 2
-        ----- stdout -----
-
-        ----- stderr -----
-        ruff failed
-          Cause: The argument `--config=[TMP]/ruff.toml` cannot be used with `--isolated`
-
-          tip: You cannot specify a configuration file and also specify `--isolated`,
-               as `--isolated` causes ruff to ignore all configuration files.
-               For more information, try `--help`.
-
-        "###);
-    });
-    Ok(())
-}
-
-#[test]
-fn config_override_via_cli() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(&ruff_toml, "line-length = 100")?;
-    let fixture = r#"
-def foo():
-    print("looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong string")
-
-    "#;
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .arg("format")
-        .arg("--config")
-        .arg(&ruff_toml)
-        // This overrides the long line length set in the config file
-        .args(["--config", "line-length=80"])
-        .arg("-")
-        .pass_stdin(fixture), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    def foo():
-        print(
-            "looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong string"
-        )
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
-#[test]
-fn config_doubly_overridden_via_cli() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(&ruff_toml, "line-length = 70")?;
-    let fixture = r#"
-def foo():
-    print("looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong string")
-
-    "#;
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .arg("format")
-        .arg("--config")
-        .arg(&ruff_toml)
-        // This overrides the long line length set in the config file...
-        .args(["--config", "line-length=80"])
-        // ...but this overrides them both:
-        .args(["--line-length", "100"])
-        .arg("-")
-        .pass_stdin(fixture), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    def foo():
-        print("looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong string")
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
 #[test]
 fn format_options() -> Result<()> {
     let tempdir = TempDir::new()?;
@@ -358,52 +177,58 @@ def f(x):
     '''
     pass
 "#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    def f(x):
-        """
-        Something about `f`. And an example:
+success: true
+exit_code: 0
+----- stdout -----
+def f(x):
+    """
+    Something about `f`. And an example:
 
-        .. code-block:: python
+    .. code-block:: python
 
-            foo, bar, quux = (
-                this_is_a_long_line(
-                    lion,
-                    hippo,
-                    lemur,
-                    bear,
-                )
-            )
-
-        Another example:
-
-        ```py
-        foo, bar, quux = (
-            this_is_a_long_line(
-                lion,
-                hippo,
-                lemur,
-                bear,
-            )
+        (
+            foo,
+            bar,
+            quux,
+        ) = this_is_a_long_line(
+            lion,
+            hippo,
+            lemur,
+            bear,
         )
-        ```
 
-        And another:
+    Another example:
 
-        >>> foo, bar, quux = (
-        ...     this_is_a_long_line(
-        ...         lion,
-        ...         hippo,
-        ...         lemur,
-        ...         bear,
-        ...     )
-        ... )
-        """
-        pass
+    ```py
+    (
+        foo,
+        bar,
+        quux,
+    ) = this_is_a_long_line(
+        lion,
+        hippo,
+        lemur,
+        bear,
+    )
+    ```
 
-    ----- stderr -----
-    "###);
+    And another:
+
+    >>> (
+    ...     foo,
+    ...     bar,
+    ...     quux,
+    ... ) = this_is_a_long_line(
+    ...     lion,
+    ...     hippo,
+    ...     lemur,
+    ...     bear,
+    ... )
+    """
+    pass
+
+----- stderr -----
+"###);
     Ok(())
 }
 
@@ -523,7 +348,7 @@ from module import =
     ----- stdout -----
 
     ----- stderr -----
-    error: Failed to parse main.py:2:20: Unexpected token =
+    error: Failed to parse main.py:2:20: Unexpected token '='
     "###);
 
     Ok(())
@@ -683,9 +508,11 @@ if __name__ == '__main__':
         say_hy("dear Ruff contributor")
 
     ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
       - 'extend-select' -> 'lint.extend-select'
       - 'ignore' -> 'lint.ignore'
+
+
     "###);
     Ok(())
 }
@@ -724,9 +551,11 @@ if __name__ == '__main__':
         say_hy("dear Ruff contributor")
 
     ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
       - 'extend-select' -> 'lint.extend-select'
       - 'ignore' -> 'lint.ignore'
+
+
     "###);
     Ok(())
 }
@@ -1719,322 +1548,3 @@ include = ["*.ipy"]
     "###);
     Ok(())
 }
-
-#[test]
-fn range_formatting() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=2:8-2:14"])
-        .arg("-")
-        .pass_stdin(r#"
-def foo(arg1, arg2,):
-    print("Shouldn't format this" )
-
-"#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    def foo(
-        arg1,
-        arg2,
-    ):
-        print("Shouldn't format this" )
-
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn range_formatting_unicode() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=2:21-3"])
-        .arg("-")
-        .pass_stdin(r#"
-def foo(arg1="👋🏽" ): print("Format this" )
-"#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    def foo(arg1="👋🏽" ):
-        print("Format this")
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn range_formatting_multiple_files() -> std::io::Result<()> {
-    let tempdir = TempDir::new()?;
-    let file1 = tempdir.path().join("file1.py");
-
-    fs::write(
-        &file1,
-        r#"
-def file1(arg1, arg2,):
-    print("Shouldn't format this" )
-
-"#,
-    )?;
-
-    let file2 = tempdir.path().join("file2.py");
-
-    fs::write(
-        &file2,
-        r#"
-def file2(arg1, arg2,):
-    print("Shouldn't format this" )
-
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--range=1:8-1:15"])
-        .arg(file1)
-        .arg(file2),  @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    ruff failed
-      Cause: The `--range` option is only supported when formatting a single file but the specified paths resolve to 2 files.
-    "###);
-
-    Ok(())
-}
-
-#[test]
-fn range_formatting_out_of_bounds() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=100:40-200:1"])
-        .arg("-")
-        .pass_stdin(r#"
-def foo(arg1, arg2,):
-    print("Shouldn't format this" )
-
-"#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    def foo(arg1, arg2,):
-        print("Shouldn't format this" )
-
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn range_start_larger_than_end() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=90-50"])
-        .arg("-")
-        .pass_stdin(r#"
-def foo(arg1, arg2,):
-    print("Shouldn't format this" )
-
-"#), @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value '90-50' for '--range <RANGE>': the start position '90:1' is greater than the end position '50:1'.
-        tip: Try switching start and end: '50:1-90:1'
-
-    For more information, try '--help'.
-    "###);
-}
-
-#[test]
-fn range_line_numbers_only() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=2-3"])
-        .arg("-")
-        .pass_stdin(r#"
-def foo(arg1, arg2,):
-    print("Shouldn't format this" )
-
-"#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    def foo(
-        arg1,
-        arg2,
-    ):
-        print("Shouldn't format this" )
-
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn range_start_only() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=3"])
-        .arg("-")
-        .pass_stdin(r#"
-def foo(arg1, arg2,):
-    print("Should format this" )
-
-"#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    def foo(arg1, arg2,):
-        print("Should format this")
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn range_end_only() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=-3"])
-        .arg("-")
-        .pass_stdin(r#"
-def foo(arg1, arg2,):
-    print("Should format this" )
-
-"#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    def foo(
-        arg1,
-        arg2,
-    ):
-        print("Should format this" )
-
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn range_missing_line() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=1-:20"])
-        .arg("-")
-        .pass_stdin(r#"
-def foo(arg1, arg2,):
-    print("Should format this" )
-
-"#), @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value '1-:20' for '--range <RANGE>': the end line is not a valid number (cannot parse integer from empty string)
-      tip: The format is 'line:column'.
-
-    For more information, try '--help'.
-    "###);
-}
-
-#[test]
-fn zero_line_number() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=0:2"])
-        .arg("-")
-        .pass_stdin(r#"
-def foo(arg1, arg2,):
-    print("Should format this" )
-
-"#), @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value '0:2' for '--range <RANGE>': the start line is 0, but it should be 1 or greater.
-      tip: The line numbers start at 1.
-      tip: Try 1:2 instead.
-
-    For more information, try '--help'.
-    "###);
-}
-
-#[test]
-fn column_and_line_zero() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py", "--range=0:0"])
-        .arg("-")
-        .pass_stdin(r#"
-def foo(arg1, arg2,):
-    print("Should format this" )
-
-"#), @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value '0:0' for '--range <RANGE>': the start line and column are both 0, but they should be 1 or greater.
-      tip: The line and column numbers start at 1.
-      tip: Try 1:1 instead.
-
-    For more information, try '--help'.
-    "###);
-}
-
-#[test]
-fn range_formatting_notebook() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--no-cache", "--stdin-filename", "main.ipynb", "--range=1-2"])
-        .arg("-")
-        .pass_stdin(r#"
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "ad6f36d9-4b7d-4562-8d00-f15a0f1fbb6d",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "x=1"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.12.0"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
-"#), @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: Failed to format main.ipynb: Range formatting isn't supported for notebooks.
-    "###);
-}

crates/ruff/tests/lint.rs

@@ -2,7 +2,6 @@
 
 #![cfg(not(target_family = "wasm"))]
 
-use regex::escape;
 use std::fs;
 use std::process::Command;
 use std::str;
@@ -12,11 +11,7 @@ use insta_cmd::{assert_cmd_snapshot, get_cargo_bin};
 use tempfile::TempDir;
 
 const BIN_NAME: &str = "ruff";
-const STDIN_BASE_OPTIONS: &[&str] = &["check", "--no-cache", "--output-format", "concise"];
-
-fn tempdir_filter(tempdir: &TempDir) -> String {
-    format!(r"{}\\?/?", escape(tempdir.path().to_str().unwrap()))
-}
+const STDIN_BASE_OPTIONS: &[&str] = &["--no-cache", "--output-format", "concise"];
 
 #[test]
 fn top_level_options() -> Result<()> {
@@ -32,32 +27,29 @@ inline-quotes = "single"
 "#,
     )?;
 
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(STDIN_BASE_OPTIONS)
-            .arg("--config")
-            .arg(&ruff_toml)
-            .args(["--stdin-filename", "test.py"])
-            .arg("-")
-            .pass_stdin(r#"a = "abcba".strip("aba")"#), @r###"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        test.py:1:5: Q000 [*] Double quotes found but single quotes preferred
-        test.py:1:5: B005 Using `.strip()` with multi-character strings is misleading
-        test.py:1:19: Q000 [*] Double quotes found but single quotes preferred
-        Found 3 errors.
-        [*] 2 fixable with the `--fix` option.
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .args(STDIN_BASE_OPTIONS)
+        .arg("--config")
+        .arg(&ruff_toml)
+        .args(["--stdin-filename", "test.py"])
+        .arg("-")
+        .pass_stdin(r#"a = "abcba".strip("aba")"#), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    test.py:1:5: Q000 [*] Double quotes found but single quotes preferred
+    test.py:1:5: B005 Using `.strip()` with multi-character strings is misleading
+    test.py:1:19: Q000 [*] Double quotes found but single quotes preferred
+    Found 3 errors.
+    [*] 2 fixable with the `--fix` option.
 
-        ----- stderr -----
-        warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `[TMP]/ruff.toml`:
-          - 'extend-select' -> 'lint.extend-select'
-          - 'flake8-quotes' -> 'lint.flake8-quotes'
-        "###);
-    });
+    ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
+      - 'extend-select' -> 'lint.extend-select'
+      - 'flake8-quotes' -> 'lint.flake8-quotes'
 
+
+    "###);
     Ok(())
 }
 
@@ -76,9 +68,6 @@ inline-quotes = "single"
 "#,
     )?;
 
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
     assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
         .args(STDIN_BASE_OPTIONS)
         .arg("--config")
@@ -96,8 +85,6 @@ inline-quotes = "single"
 
     ----- stderr -----
     "###);
-    });
-
     Ok(())
 }
 
@@ -116,9 +103,6 @@ inline-quotes = "single"
 "#,
     )?;
 
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
     assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
         .args(STDIN_BASE_OPTIONS)
         .arg("--config")
@@ -135,11 +119,11 @@ inline-quotes = "single"
     [*] 2 fixable with the `--fix` option.
 
     ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `[TMP]/ruff.toml`:
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
       - 'extend-select' -> 'lint.extend-select'
-    "###);
-    });
 
+
+    "###);
     Ok(())
 }
 
@@ -162,9 +146,6 @@ inline-quotes = "single"
 "#,
     )?;
 
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
     assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
         .args(STDIN_BASE_OPTIONS)
         .arg("--config")
@@ -181,11 +162,11 @@ inline-quotes = "single"
     [*] 2 fixable with the `--fix` option.
 
     ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `[TMP]/ruff.toml`:
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
       - 'flake8-quotes' -> 'lint.flake8-quotes'
-    "###);
-    });
 
+
+    "###);
     Ok(())
 }
 
@@ -241,11 +222,9 @@ OTHER = "OTHER"
 
     fs::write(out_dir.join("a.py"), r#"a = "a""#)?;
 
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
     assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
         .current_dir(tempdir.path())
+        .arg("check")
         .args(STDIN_BASE_OPTIONS)
         .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
         // Explicitly pass test.py, should be linted regardless of it being excluded by lint.exclude
@@ -262,11 +241,11 @@ OTHER = "OTHER"
     [*] 3 fixable with the `--fix` option.
 
     ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
       - 'extend-select' -> 'lint.extend-select'
-    "###);
-    });
 
+
+    "###);
     Ok(())
 }
 
@@ -287,11 +266,9 @@ inline-quotes = "single"
 "#,
     )?;
 
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
     assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
         .current_dir(tempdir.path())
+        .arg("check")
         .args(STDIN_BASE_OPTIONS)
         .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
         .args(["--stdin-filename", "generated.py"])
@@ -311,11 +288,11 @@ if __name__ == "__main__":
     [*] 2 fixable with the `--fix` option.
 
     ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
       - 'extend-select' -> 'lint.extend-select'
-    "###);
-    });
 
+
+    "###);
     Ok(())
 }
 
@@ -334,9 +311,6 @@ max-line-length = 100
 "#,
     )?;
 
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
     assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
         .args(STDIN_BASE_OPTIONS)
         .arg("--config")
@@ -356,12 +330,12 @@ _ = "---------------------------------------------------------------------------
     Found 1 error.
 
     ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `[TMP]/ruff.toml`:
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
       - 'select' -> 'lint.select'
       - 'pycodestyle' -> 'lint.pycodestyle'
-    "###);
-    });
 
+
+    "###);
     Ok(())
 }
 
@@ -379,11 +353,9 @@ inline-quotes = "single"
 "#,
     )?;
 
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
     assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
         .current_dir(tempdir.path())
+        .arg("check")
         .args(STDIN_BASE_OPTIONS)
         .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
         .args(["--stdin-filename", "generated.py"])
@@ -405,11 +377,11 @@ if __name__ == "__main__":
     [*] 1 fixable with the `--fix` option.
 
     ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
       - 'extend-select' -> 'lint.extend-select'
-    "###);
-    });
 
+
+    "###);
     Ok(())
 }
 
@@ -427,11 +399,9 @@ inline-quotes = "single"
 "#,
     )?;
 
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
     assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
         .current_dir(tempdir.path())
+        .arg("check")
         .args(STDIN_BASE_OPTIONS)
         .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
         .args(["--stdin-filename", "generated.py"])
@@ -453,11 +423,11 @@ if __name__ == "__main__":
     [*] 1 fixable with the `--fix` option.
 
     ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`:
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
       - 'extend-select' -> 'lint.extend-select'
-    "###);
-    });
 
+
+    "###);
     Ok(())
 }
 
@@ -486,11 +456,9 @@ ignore = ["D203", "D212"]
 "#,
     )?;
 
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
     assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
         .current_dir(sub_dir)
+        .arg("check")
         .args(STDIN_BASE_OPTIONS)
         , @r###"
     success: true
@@ -500,364 +468,9 @@ ignore = ["D203", "D212"]
     ----- stderr -----
     warning: No Python files found under the given path(s)
     "###);
-    });
-
     Ok(())
 }
 
-#[test]
-fn nonexistent_config_file() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "foo.toml", "."]), @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'foo.toml' for '--config <CONFIG_OPTION>'
-
-      tip: A `--config` flag must either be a path to a `.toml` configuration file
-           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-           option
-
-    It looks like you were trying to pass a path to a configuration file.
-    The path `foo.toml` does not point to a configuration file
-
-    For more information, try '--help'.
-    "###);
-}
-
-#[test]
-fn config_override_rejected_if_invalid_toml() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "foo = bar", "."]), @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'foo = bar' for '--config <CONFIG_OPTION>'
-
-      tip: A `--config` flag must either be a path to a `.toml` configuration file
-           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-           option
-
-    The supplied argument is not valid TOML:
-
-    TOML parse error at line 1, column 7
-      |
-    1 | foo = bar
-      |       ^
-    invalid string
-    expected `"`, `'`
-
-    For more information, try '--help'.
-    "###);
-}
-
-#[test]
-fn too_many_config_files() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_dot_toml = tempdir.path().join("ruff.toml");
-    let ruff2_dot_toml = tempdir.path().join("ruff2.toml");
-    fs::File::create(&ruff_dot_toml)?;
-    fs::File::create(&ruff2_dot_toml)?;
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_dot_toml)
-        .arg("--config")
-        .arg(&ruff2_dot_toml)
-        .arg("."), @r###"
-        success: false
-        exit_code: 2
-        ----- stdout -----
-
-        ----- stderr -----
-        ruff failed
-          Cause: You cannot specify more than one configuration file on the command line.
-
-          tip: remove either `--config=[TMP]/ruff.toml` or `--config=[TMP]/ruff2.toml`.
-               For more information, try `--help`.
-
-        "###);
-    });
-    Ok(())
-}
-
-#[test]
-fn extend_passed_via_config_argument() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "extend = 'foo.toml'", "."]), @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'extend = 'foo.toml'' for '--config <CONFIG_OPTION>'
-
-      tip: Cannot include `extend` in a --config flag value
-
-    For more information, try '--help'.
-    "###);
-}
-
-#[test]
-fn config_file_and_isolated() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_dot_toml = tempdir.path().join("ruff.toml");
-    fs::File::create(&ruff_dot_toml)?;
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_dot_toml)
-        .arg("--isolated")
-        .arg("."), @r###"
-        success: false
-        exit_code: 2
-        ----- stdout -----
-
-        ----- stderr -----
-        ruff failed
-          Cause: The argument `--config=[TMP]/ruff.toml` cannot be used with `--isolated`
-
-          tip: You cannot specify a configuration file and also specify `--isolated`,
-               as `--isolated` causes ruff to ignore all configuration files.
-               For more information, try `--help`.
-
-        "###);
-    });
-    Ok(())
-}
-
-#[test]
-fn config_override_via_cli() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-line-length = 100
-
-[lint]
-select = ["I"]
-
-[lint.isort]
-combine-as-imports = true
-        "#,
-    )?;
-    let fixture = r#"
-from foo import (
-    aaaaaaaaaaaaaaaaaaa,
-    bbbbbbbbbbb as bbbbbbbbbbbbbbbb,
-    cccccccccccccccc,
-    ddddddddddd as ddddddddddddd,
-    eeeeeeeeeeeeeee,
-    ffffffffffff as ffffffffffffff,
-    ggggggggggggg,
-    hhhhhhh as hhhhhhhhhhh,
-    iiiiiiiiiiiiii,
-    jjjjjjjjjjjjj as jjjjjj,
-)
-
-x = "longer_than_90_charactersssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss"
-"#;
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .args(["--config", "line-length=90"])
-        .args(["--config", "lint.extend-select=['E501', 'F841']"])
-        .args(["--config", "lint.isort.combine-as-imports = false"])
-        .arg("-")
-        .pass_stdin(fixture), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:2:1: I001 [*] Import block is un-sorted or un-formatted
-    -:15:91: E501 Line too long (97 > 90)
-    Found 2 errors.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
-#[test]
-fn valid_toml_but_nonexistent_option_provided_via_config_argument() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args([".", "--config", "extend-select=['F481']"]),  // No such code as F481!
-        @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'extend-select=['F481']' for '--config <CONFIG_OPTION>'
-
-      tip: A `--config` flag must either be a path to a `.toml` configuration file
-           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-           option
-
-    Could not parse the supplied argument as a `ruff.toml` configuration option:
-
-    Unknown rule selector: `F481`
-
-    For more information, try '--help'.
-    "###);
-}
-
-#[test]
-fn each_toml_option_requires_a_new_flag_1() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        // commas can't be used to delimit different config overrides;
-        // you need a new --config flag for each override
-        .args([".", "--config", "extend-select=['F841'], line-length=90"]),
-        @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'extend-select=['F841'], line-length=90' for '--config <CONFIG_OPTION>'
-
-      tip: A `--config` flag must either be a path to a `.toml` configuration file
-           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-           option
-
-    The supplied argument is not valid TOML:
-
-    TOML parse error at line 1, column 23
-      |
-    1 | extend-select=['F841'], line-length=90
-      |                       ^
-    expected newline, `#`
-
-    For more information, try '--help'.
-    "###);
-}
-
-#[test]
-fn each_toml_option_requires_a_new_flag_2() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        // spaces *also* can't be used to delimit different config overrides;
-        // you need a new --config flag for each override
-        .args([".", "--config", "extend-select=['F841'] line-length=90"]),
-        @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    error: invalid value 'extend-select=['F841'] line-length=90' for '--config <CONFIG_OPTION>'
-
-      tip: A `--config` flag must either be a path to a `.toml` configuration file
-           or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-           option
-
-    The supplied argument is not valid TOML:
-
-    TOML parse error at line 1, column 24
-      |
-    1 | extend-select=['F841'] line-length=90
-      |                        ^
-    expected newline, `#`
-
-    For more information, try '--help'.
-    "###);
-}
-
-#[test]
-fn config_doubly_overridden_via_cli() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-line-length = 100
-
-[lint]
-select=["E501"]
-"#,
-    )?;
-    let fixture = "x = 'longer_than_90_charactersssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss'";
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        // The --line-length flag takes priority over both the config file
-        // and the `--config="line-length=110"` flag,
-        // despite them both being specified after this flag on the command line:
-        .args(["--line-length", "90"])
-        .arg("--config")
-        .arg(&ruff_toml)
-        .args(["--config", "line-length=110"])
-        .arg("-")
-        .pass_stdin(fixture), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:91: E501 Line too long (97 > 90)
-    Found 1 error.
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
-#[test]
-fn complex_config_setting_overridden_via_cli() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(&ruff_toml, "lint.select = ['N801']")?;
-    let fixture = "class violates_n801: pass";
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .args(["--config", "lint.per-file-ignores = {'generated.py' = ['N801']}"])
-        .args(["--stdin-filename", "generated.py"])
-        .arg("-")
-        .pass_stdin(fixture), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
-#[test]
-fn deprecated_config_option_overridden_via_cli() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--config", "select=['N801']", "-"])
-        .pass_stdin("class lowercase: ..."),
-        @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:7: N801 Class name `lowercase` should use CapWords convention
-    Found 1 error.
-
-    ----- stderr -----
-    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your `--config` CLI arguments:
-      - 'select' -> 'lint.select'
-    "###);
-}
-
 #[test]
 fn extension() -> Result<()> {
     let tempdir = TempDir::new()?;
@@ -911,11 +524,9 @@ include = ["*.ipy"]
 "#,
     )?;
 
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
     assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
         .current_dir(tempdir.path())
+        .arg("check")
         .args(STDIN_BASE_OPTIONS)
         .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
         .args(["--extension", "ipy:ipynb"])
@@ -929,240 +540,5 @@ include = ["*.ipy"]
 
     ----- stderr -----
     "###);
-    });
-
-    Ok(())
-}
-
-#[test]
-fn file_noqa_external() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-external = ["AAA"]
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"
-# flake8: noqa: AAA101, BBB102
-import os
-"#), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:3:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    warning: Invalid rule code provided to `# ruff: noqa` at -:2: BBB102
-    "###);
-    });
-
-    Ok(())
-}
-
-#[test]
-fn required_version_exact_mismatch() -> Result<()> {
-    let version = env!("CARGO_PKG_VERSION");
-
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-required-version = "0.1.0"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/"), (version, "[VERSION]")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"
-import os
-"#), @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    ruff failed
-      Cause: Required version `==0.1.0` does not match the running version `[VERSION]`
-    "###);
-    });
-
-    Ok(())
-}
-
-#[test]
-fn required_version_exact_match() -> Result<()> {
-    let version = env!("CARGO_PKG_VERSION");
-
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        format!(
-            r#"
-required-version = "{version}"
-"#
-        ),
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/"), (version, "[VERSION]")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"
-import os
-"#), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:2:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    "###);
-    });
-
-    Ok(())
-}
-
-#[test]
-fn required_version_bound_mismatch() -> Result<()> {
-    let version = env!("CARGO_PKG_VERSION");
-
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        format!(
-            r#"
-required-version = ">{version}"
-"#
-        ),
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/"), (version, "[VERSION]")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"
-import os
-"#), @r###"
-    success: false
-    exit_code: 2
-    ----- stdout -----
-
-    ----- stderr -----
-    ruff failed
-      Cause: Required version `>[VERSION]` does not match the running version `[VERSION]`
-    "###);
-    });
-
-    Ok(())
-}
-
-#[test]
-fn required_version_bound_match() -> Result<()> {
-    let version = env!("CARGO_PKG_VERSION");
-
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-required-version = ">=0.1.0"
-"#,
-    )?;
-
-    insta::with_settings!({
-        filters => vec![(tempdir_filter(&tempdir).as_str(), "[TMP]/"), (version, "[VERSION]")]
-    }, {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"
-import os
-"#), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:2:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    "###);
-    });
-
-    Ok(())
-}
-
-/// Expand environment variables in `--config` paths provided via the CLI.
-#[test]
-fn config_expand() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        ruff_toml,
-        r#"
-[lint]
-select = ["F"]
-ignore = ["F841"]
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg("${NAME}.toml")
-        .env("NAME", "ruff")
-        .arg("-")
-        .current_dir(tempdir.path())
-        .pass_stdin(r#"
-import os
-
-def func():
-    x = 1
-"#), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:2:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    "###);
-
     Ok(())
 }

crates/ruff/tests/resolve_files.rs

@@ -39,8 +39,10 @@ fn check_project_include_defaults() {
         [BASEPATH]/include-test/subdirectory/c.py
 
         ----- stderr -----
-        warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `nested-project/pyproject.toml`:
+        warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
           - 'select' -> 'lint.select'
+
+
         "###);
     });
 }

crates/ruff/tests/show_settings.rs

@@ -4,29 +4,25 @@ use std::process::Command;
 
 const BIN_NAME: &str = "ruff";
 
+#[cfg(not(target_os = "windows"))]
+const TEST_FILTERS: &[(&str, &str)] = &[
+    ("\"[^\\*\"]*/pyproject.toml", "\"[BASEPATH]/pyproject.toml"),
+    ("\".*/crates", "\"[BASEPATH]/crates"),
+    ("\".*/\\.ruff_cache", "\"[BASEPATH]/.ruff_cache"),
+    ("\".*/ruff\"", "\"[BASEPATH]\""),
+];
+#[cfg(target_os = "windows")]
+const TEST_FILTERS: &[(&str, &str)] = &[
+    (r#""[^\*"]*\\pyproject.toml"#, "\"[BASEPATH]/pyproject.toml"),
+    (r#"".*\\crates"#, "\"[BASEPATH]/crates"),
+    (r#"".*\\\.ruff_cache"#, "\"[BASEPATH]/.ruff_cache"),
+    (r#"".*\\ruff""#, "\"[BASEPATH]\""),
+    (r#"\\+(\w\w|\s|")"#, "/$1"),
+];
+
 #[test]
 fn display_default_settings() {
-    // Navigate from the crate directory to the workspace root.
-    let base_path = Path::new(env!("CARGO_MANIFEST_DIR"))
-        .parent()
-        .unwrap()
-        .parent()
-        .unwrap();
-    let base_path = base_path.to_string_lossy();
-
-    // Escape the backslashes for the regex.
-    let base_path = regex::escape(&base_path);
-
-    #[cfg(not(target_os = "windows"))]
-    let test_filters = &[(base_path.as_ref(), "[BASEPATH]")];
-
-    #[cfg(target_os = "windows")]
-    let test_filters = &[
-        (base_path.as_ref(), "[BASEPATH]"),
-        (r#"\\+(\w\w|\s|\.|")"#, "/$1"),
-    ];
-
-    insta::with_settings!({ filters => test_filters.to_vec() }, {
+    insta::with_settings!({ filters => TEST_FILTERS.to_vec() }, {
         assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
             .args(["check", "--show-settings", "unformatted.py"]).current_dir(Path::new("./resources/test/fixtures")));
     });

crates/ruff/tests/snapshots/integration_test__explain_status_codes_f401.snap

@@ -3,7 +3,7 @@ source: crates/ruff/tests/integration_test.rs
 info:
   program: ruff
   args:
-    - rule
+    - "--explain"
     - F401
 ---
 success: true
@@ -25,15 +25,6 @@ import cycles. They also increase the cognitive load of reading the code.
 If an import statement is used to check for the availability or existence
 of a module, consider using `importlib.util.find_spec` instead.
 
-If an import statement is used to re-export a symbol as part of a module's
-public interface, consider using a "redundant" import alias, which
-instructs Ruff (and other tools) to respect the re-export, and avoid
-marking it as unused, as in:
-
-```python
-from module import member as member
-```
-
 ## Example
 ```python
 import numpy as np  # unused import
@@ -60,11 +51,11 @@ else:
 ```
 
 ## Options
-- `lint.ignore-init-module-imports`
+- `lint.pyflakes.extend-generics`
 
 ## References
 - [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)
 - [Python documentation: `importlib.util.find_spec`](https://docs.python.org/3/library/importlib.html#importlib.util.find_spec)
-- [Typing documentation: interface conventions](https://typing.readthedocs.io/en/latest/source/libraries.html#library-interface-public-and-private-symbols)
 
 ----- stderr -----
+

crates/ruff/tests/snapshots/show_settings__display_default_settings.snap

@@ -44,6 +44,7 @@ file_resolver.exclude = [
 	"__pypackages__",
 	"_build",
 	"buck-out",
+	"build",
 	"dist",
 	"node_modules",
 	"site-packages",
@@ -52,7 +53,6 @@ file_resolver.exclude = [
 file_resolver.extend_exclude = [
 	"crates/ruff_linter/resources/",
 	"crates/ruff_python_formatter/resources/",
-	"crates/ruff_python_parser/resources/",
 ]
 file_resolver.force_exclude = false
 file_resolver.include = [
@@ -205,9 +205,7 @@ linter.external = []
 linter.ignore_init_module_imports = false
 linter.logger_objects = []
 linter.namespace_packages = []
-linter.src = [
-	"[BASEPATH]",
-]
+linter.src = ["[BASEPATH]"]
 linter.tab_size = 4
 linter.line_length = 88
 linter.task_tags = [
@@ -232,7 +230,7 @@ linter.flake8_bandit.check_typed_exception = false
 linter.flake8_bugbear.extend_immutable_calls = []
 linter.flake8_builtins.builtins_ignorelist = []
 linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
-linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}(-\d{4})*
+linter.flake8_copyright.notice_rgx = (?i)Copyright\s+(\(C\)\s+)?\d{4}(-\d{4})*
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0
@@ -312,7 +310,6 @@ linter.isort.section_order = [
 	known { type = first_party },
 	known { type = local_folder },
 ]
-linter.isort.default_section = known { type = third_party }
 linter.isort.no_sections = false
 linter.isort.from_first = false
 linter.isort.length_sort = false
@@ -367,3 +364,4 @@ formatter.docstring_code_format = disabled
 formatter.docstring_code_line_width = dynamic
 
 ----- stderr -----
+

crates/ruff/tests/version.rs

@@ -1,105 +0,0 @@
-//! Tests for the --version command
-use std::fs;
-use std::process::Command;
-
-use anyhow::Result;
-use insta_cmd::{assert_cmd_snapshot, get_cargo_bin};
-use tempfile::TempDir;
-
-const BIN_NAME: &str = "ruff";
-const VERSION_FILTER: [(&str, &str); 1] = [(
-    r"\d+\.\d+\.\d+(\+\d+)?( \(\w{9} \d\d\d\d-\d\d-\d\d\))?",
-    "[VERSION]",
-)];
-
-#[test]
-fn version_basics() {
-    insta::with_settings!({filters => VERSION_FILTER.to_vec()}, {
-        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME)).arg("version"), @r###"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        ruff [VERSION]
-
-        ----- stderr -----
-        "###
-        );
-    });
-}
-
-/// `--config` is a global option,
-/// so it's allowed to pass --config to subcommands such as `version`
-/// -- the flag is simply ignored
-#[test]
-fn config_option_allowed_but_ignored() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_dot_toml = tempdir.path().join("ruff.toml");
-    fs::File::create(&ruff_dot_toml)?;
-    insta::with_settings!({filters => VERSION_FILTER.to_vec()}, {
-        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME))
-                .arg("version")
-                .arg("--config")
-                .arg(&ruff_dot_toml)
-                .args(["--config", "lint.isort.extra-standard-library = ['foo', 'bar']"]), @r###"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        ruff [VERSION]
-
-        ----- stderr -----
-        "###
-        );
-    });
-    Ok(())
-}
-#[test]
-fn config_option_ignored_but_validated() {
-    insta::with_settings!({filters => VERSION_FILTER.to_vec()}, {
-        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME))
-                .arg("version")
-                .args(["--config", "foo = bar"]), @r###"
-        success: false
-        exit_code: 2
-        ----- stdout -----
-
-        ----- stderr -----
-        error: invalid value 'foo = bar' for '--config <CONFIG_OPTION>'
-
-          tip: A `--config` flag must either be a path to a `.toml` configuration file
-               or a TOML `<KEY> = <VALUE>` pair overriding a specific configuration
-               option
-
-        The supplied argument is not valid TOML:
-
-        TOML parse error at line 1, column 7
-          |
-        1 | foo = bar
-          |       ^
-        invalid string
-        expected `"`, `'`
-
-        For more information, try '--help'.
-        "###
-        );
-    });
-}
-
-/// `--isolated` is also a global option,
-#[test]
-fn isolated_option_allowed() {
-    insta::with_settings!({filters => VERSION_FILTER.to_vec()}, {
-        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME)).arg("version").arg("--isolated"), @r###"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        ruff [VERSION]
-
-        ----- stderr -----
-        "###
-        );
-    });
-}

crates/ruff_benchmark/Cargo.toml

@@ -13,7 +13,6 @@ license = { workspace = true }
 
 [lib]
 bench = false
-doctest = false
 
 [[bench]]
 name = "linter"

crates/ruff_dev/src/format_dev.rs

@@ -27,7 +27,7 @@ use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
 use tracing_subscriber::EnvFilter;
 
-use ruff::args::{ConfigArguments, FormatArguments, FormatCommand, GlobalConfigArgs, LogLevelArgs};
+use ruff::args::{CliOverrides, FormatArguments, FormatCommand, LogLevelArgs};
 use ruff::resolve::resolve;
 use ruff_formatter::{FormatError, LineWidth, PrintError};
 use ruff_linter::logging::LogLevel;
@@ -38,21 +38,26 @@ use ruff_python_formatter::{
 use ruff_python_parser::ParseError;
 use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig, ResolvedFile, Resolver};
 
-fn parse_cli(dirs: &[PathBuf]) -> anyhow::Result<(FormatArguments, ConfigArguments)> {
+fn parse_cli(dirs: &[PathBuf]) -> anyhow::Result<(FormatArguments, CliOverrides)> {
     let args_matches = FormatCommand::command()
         .no_binary_name(true)
         .get_matches_from(dirs);
     let arguments: FormatCommand = FormatCommand::from_arg_matches(&args_matches)?;
-    let (cli, config_arguments) = arguments.partition(GlobalConfigArgs::default())?;
-    Ok((cli, config_arguments))
+    let (cli, overrides) = arguments.partition();
+    Ok((cli, overrides))
 }
 
 /// Find the [`PyprojectConfig`] to use for formatting.
 fn find_pyproject_config(
     cli: &FormatArguments,
-    config_arguments: &ConfigArguments,
+    overrides: &CliOverrides,
 ) -> anyhow::Result<PyprojectConfig> {
-    let mut pyproject_config = resolve(config_arguments, cli.stdin_filename.as_deref())?;
+    let mut pyproject_config = resolve(
+        cli.isolated,
+        cli.config.as_deref(),
+        overrides,
+        cli.stdin_filename.as_deref(),
+    )?;
     // We don't want to format pyproject.toml
     pyproject_config.settings.file_resolver.include = FilePatternSet::try_from_iter([
         FilePattern::Builtin("*.py"),
@@ -67,9 +72,9 @@ fn find_pyproject_config(
 fn ruff_check_paths<'a>(
     pyproject_config: &'a PyprojectConfig,
     cli: &FormatArguments,
-    config_arguments: &ConfigArguments,
+    overrides: &CliOverrides,
 ) -> anyhow::Result<(Vec<Result<ResolvedFile, ignore::Error>>, Resolver<'a>)> {
-    let (paths, resolver) = python_files_in_path(&cli.files, pyproject_config, config_arguments)?;
+    let (paths, resolver) = python_files_in_path(&cli.files, pyproject_config, overrides)?;
     Ok((paths, resolver))
 }
 

crates/ruff_dev/src/generate_docs.rs

@@ -26,9 +26,9 @@ pub(crate) fn main(args: &Args) -> Result<()> {
     for rule in Rule::iter() {
         if let Some(explanation) = rule.explanation() {
             let mut output = String::new();
-
             output.push_str(&format!("# {} ({})", rule.as_ref(), rule.noqa_code()));
             output.push('\n');
+            output.push('\n');
 
             let (linter, _) = Linter::parse_code(&rule.noqa_code().to_string()).unwrap();
             if linter.url().is_some() {
@@ -37,22 +37,6 @@ pub(crate) fn main(args: &Args) -> Result<()> {
                 output.push('\n');
             }
 
-            if rule.is_deprecated() {
-                output.push_str(
-                    r"**Warning: This rule is deprecated and will be removed in a future release.**",
-                );
-                output.push('\n');
-                output.push('\n');
-            }
-
-            if rule.is_removed() {
-                output.push_str(
-                    r"**Warning: This rule has been removed and its documentation is only available for historical reasons.**",
-                );
-                output.push('\n');
-                output.push('\n');
-            }
-
             let fix_availability = rule.fixable();
             if matches!(
                 fix_availability,

crates/ruff_dev/src/generate_rules_table.rs

@@ -3,7 +3,6 @@
 //! Used for <https://docs.astral.sh/ruff/rules/>.
 
 use itertools::Itertools;
-use ruff_linter::codes::RuleGroup;
 use std::borrow::Cow;
 use strum::IntoEnumIterator;
 
@@ -15,10 +14,6 @@ use ruff_workspace::options_base::OptionsMetadata;
 
 const FIX_SYMBOL: &str = "🛠️";
 const PREVIEW_SYMBOL: &str = "🧪";
-const REMOVED_SYMBOL: &str = "❌";
-const WARNING_SYMBOL: &str = "⚠️";
-const STABLE_SYMBOL: &str = "✔️";
-const SPACER: &str = "&nbsp;&nbsp;&nbsp;&nbsp;";
 
 fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>, linter: &Linter) {
     table_out.push_str("| Code | Name | Message | |");
@@ -26,33 +21,20 @@ fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>,
     table_out.push_str("| ---- | ---- | ------- | ------: |");
     table_out.push('\n');
     for rule in rules {
-        let status_token = match rule.group() {
-            RuleGroup::Removed => {
-                format!("<span title='Rule has been removed'>{REMOVED_SYMBOL}</span>")
-            }
-            RuleGroup::Deprecated => {
-                format!("<span title='Rule has been deprecated'>{WARNING_SYMBOL}</span>")
-            }
-            #[allow(deprecated)]
-            RuleGroup::Preview | RuleGroup::Nursery => {
-                format!("<span title='Rule is in preview'>{PREVIEW_SYMBOL}</span>")
-            }
-            RuleGroup::Stable => {
-                // A full opacity checkmark is a bit aggressive for indicating stable
-                format!("<span title='Rule is stable' style='opacity: 0.6'>{STABLE_SYMBOL}</span>")
-            }
-        };
-
         let fix_token = match rule.fixable() {
             FixAvailability::Always | FixAvailability::Sometimes => {
                 format!("<span title='Automatic fix available'>{FIX_SYMBOL}</span>")
             }
             FixAvailability::None => {
-                format!("<span title='Automatic fix not available' style='opacity: 0.1' aria-hidden='true'>{FIX_SYMBOL}</span>")
+                format!("<span style='opacity: 0.1' aria-hidden='true'>{FIX_SYMBOL}</span>")
             }
         };
-
-        let tokens = format!("{status_token} {fix_token}");
+        let preview_token = if rule.is_preview() || rule.is_nursery() {
+            format!("<span title='Rule is in preview'>{PREVIEW_SYMBOL}</span>")
+        } else {
+            format!("<span style='opacity: 0.1' aria-hidden='true'>{PREVIEW_SYMBOL}</span>")
+        };
+        let status_token = format!("{fix_token} {preview_token}");
 
         let rule_name = rule.as_ref();
 
@@ -66,20 +48,9 @@ fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>,
             Cow::Borrowed(message)
         };
 
-        // Start and end of style spans
-        let mut ss = "";
-        let mut se = "";
-        if rule.is_removed() {
-            ss = "<span style='opacity: 0.5', title='This rule has been removed'>";
-            se = "</span>";
-        } else if rule.is_deprecated() {
-            ss = "<span style='opacity: 0.8', title='This rule has been deprecated'>";
-            se = "</span>";
-        }
-
         #[allow(clippy::or_fun_call)]
         table_out.push_str(&format!(
-            "| {ss}{0}{1}{se} {{ #{0}{1} }} | {ss}{2}{se} | {ss}{3}{se} | {ss}{4}{se} |",
+            "| {0}{1} {{ #{0}{1} }} | {2} | {3} | {4} |",
             linter.common_prefix(),
             linter.code_for_rule(rule).unwrap(),
             rule.explanation()
@@ -87,7 +58,7 @@ fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>,
                 .then_some(format_args!("[{rule_name}](rules/{rule_name}.md)"))
                 .unwrap_or(format_args!("{rule_name}")),
             message,
-            tokens,
+            status_token,
         ));
         table_out.push('\n');
     }
@@ -98,33 +69,15 @@ pub(crate) fn generate() -> String {
     // Generate the table string.
     let mut table_out = String::new();
 
-    table_out.push_str("### Legend");
+    table_out.push_str(&format!(
+        "The {FIX_SYMBOL} emoji indicates that a rule is automatically fixable by the `--fix` command-line option."));
+    table_out.push('\n');
     table_out.push('\n');
 
     table_out.push_str(&format!(
-        "{SPACER}{STABLE_SYMBOL}{SPACER} The rule is stable."
+        "The {PREVIEW_SYMBOL} emoji indicates that a rule is in [\"preview\"](faq.md#what-is-preview)."
     ));
-    table_out.push_str("<br />");
-
-    table_out.push_str(&format!(
-        "{SPACER}{PREVIEW_SYMBOL}{SPACER} The rule is unstable and is in [\"preview\"](faq.md#what-is-preview)."
-    ));
-    table_out.push_str("<br />");
-
-    table_out.push_str(&format!(
-        "{SPACER}{WARNING_SYMBOL}{SPACER} The rule has been deprecated and will be removed in a future release."
-    ));
-    table_out.push_str("<br />");
-
-    table_out.push_str(&format!(
-        "{SPACER}{REMOVED_SYMBOL}{SPACER} The rule has been removed only the documentation is available."
-    ));
-    table_out.push_str("<br />");
-
-    table_out.push_str(&format!(
-        "{SPACER}{FIX_SYMBOL}{SPACER} The rule is automatically fixable by the `--fix` command-line option."
-    ));
-    table_out.push_str("<br />");
+    table_out.push('\n');
     table_out.push('\n');
 
     for linter in Linter::iter() {

crates/ruff_dev/src/main.rs

@@ -4,8 +4,8 @@
 
 use anyhow::Result;
 use clap::{Parser, Subcommand};
-use ruff::{args::GlobalConfigArgs, check};
-use ruff_linter::logging::set_up_logging;
+use ruff::check;
+use ruff_linter::logging::{set_up_logging, LogLevel};
 use std::process::ExitCode;
 
 mod format_dev;
@@ -28,8 +28,6 @@ const ROOT_DIR: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../../");
 struct Args {
     #[command(subcommand)]
     command: Command,
-    #[clap(flatten)]
-    global_options: GlobalConfigArgs,
 }
 
 #[derive(Subcommand)]
@@ -59,6 +57,8 @@ enum Command {
     Repeat {
         #[clap(flatten)]
         args: ruff::args::CheckCommand,
+        #[clap(flatten)]
+        log_level_args: ruff::args::LogLevelArgs,
         /// Run this many times
         #[clap(long)]
         repeat: usize,
@@ -75,12 +75,9 @@ enum Command {
 }
 
 fn main() -> Result<ExitCode> {
-    let Args {
-        command,
-        global_options,
-    } = Args::parse();
+    let args = Args::parse();
     #[allow(clippy::print_stdout)]
-    match command {
+    match args.command {
         Command::GenerateAll(args) => generate_all::main(&args)?,
         Command::GenerateJSONSchema(args) => generate_json_schema::main(&args)?,
         Command::GenerateRulesTable => println!("{}", generate_rules_table::generate()),
@@ -92,12 +89,14 @@ fn main() -> Result<ExitCode> {
         Command::PrintTokens(args) => print_tokens::main(&args)?,
         Command::RoundTrip(args) => round_trip::main(&args)?,
         Command::Repeat {
-            args: subcommand_args,
+            args,
             repeat,
+            log_level_args,
         } => {
-            set_up_logging(global_options.log_level())?;
+            let log_level = LogLevel::from(&log_level_args);
+            set_up_logging(&log_level)?;
             for _ in 0..repeat {
-                check(subcommand_args.clone(), global_options.clone())?;
+                check(args.clone(), log_level)?;
             }
         }
         Command::FormatDev(args) => {

crates/ruff_diagnostics/Cargo.toml

@@ -11,7 +11,6 @@ repository = { workspace = true }
 license = { workspace = true }
 
 [lib]
-doctest = false
 
 [dependencies]
 ruff_text_size = { path = "../ruff_text_size" }

crates/ruff_formatter/src/builders.rs

@@ -308,8 +308,11 @@ impl std::fmt::Debug for Token {
 /// assert_eq!(printed.as_code(), r#""Hello 'Ruff'""#);
 /// assert_eq!(printed.sourcemap(), [
 ///     SourceMarker { source: TextSize::new(0), dest: TextSize::new(0) },
+///     SourceMarker { source: TextSize::new(0), dest: TextSize::new(7) },
 ///     SourceMarker { source: TextSize::new(8), dest: TextSize::new(7) },
+///     SourceMarker { source: TextSize::new(8), dest: TextSize::new(13) },
 ///     SourceMarker { source: TextSize::new(14), dest: TextSize::new(13) },
+///     SourceMarker { source: TextSize::new(14), dest: TextSize::new(14) },
 ///     SourceMarker { source: TextSize::new(20), dest: TextSize::new(14) },
 /// ]);
 ///
@@ -325,30 +328,24 @@ pub struct SourcePosition(TextSize);
 
 impl<Context> Format<Context> for SourcePosition {
     fn fmt(&self, f: &mut Formatter<Context>) -> FormatResult<()> {
-        if let Some(FormatElement::SourcePosition(last_position)) = f.buffer.elements().last() {
-            if *last_position == self.0 {
-                return Ok(());
-            }
-        }
-
         f.write_element(FormatElement::SourcePosition(self.0));
 
         Ok(())
     }
 }
 
-/// Creates a text from a dynamic string.
-///
+/// Creates a text from a dynamic string with its optional start-position in the source document.
 /// This is done by allocating a new string internally.
-pub fn text(text: &str) -> Text {
+pub fn text(text: &str, position: Option<TextSize>) -> Text {
     debug_assert_no_newlines(text);
 
-    Text { text }
+    Text { text, position }
 }
 
 #[derive(Eq, PartialEq)]
 pub struct Text<'a> {
     text: &'a str,
+    position: Option<TextSize>,
 }
 
 impl<Context> Format<Context> for Text<'_>
@@ -356,6 +353,10 @@ where
     Context: FormatContext,
 {
     fn fmt(&self, f: &mut Formatter<Context>) -> FormatResult<()> {
+        if let Some(source_position) = self.position {
+            f.write_element(FormatElement::SourcePosition(source_position));
+        }
+
         f.write_element(FormatElement::Text {
             text: self.text.to_string().into_boxed_str(),
             text_width: TextWidth::from_text(self.text, f.options().indent_width()),
@@ -2285,7 +2286,7 @@ impl<Context, T> std::fmt::Debug for FormatWith<Context, T> {
 ///                 let mut join = f.join_with(&separator);
 ///
 ///                 for item in &self.items {
-///                     join.entry(&format_with(|f| write!(f, [text(item)])));
+///                     join.entry(&format_with(|f| write!(f, [text(item, None)])));
 ///                 }
 ///                 join.finish()
 ///             })),
@@ -2370,7 +2371,7 @@ where
 /// let mut count = 0;
 ///
 /// let value = format_once(|f| {
-///     write!(f, [text(&std::format!("Formatted {count}."))])
+///     write!(f, [text(&std::format!("Formatted {count}."), None)])
 /// });
 ///
 /// format!(SimpleFormatContext::default(), [value]).expect("Formatting once works fine");

crates/ruff_formatter/src/format_element/document.rs

@@ -346,7 +346,10 @@ impl Format<IrFormatContext<'_>> for &[FormatElement] {
                 }
 
                 FormatElement::SourcePosition(position) => {
-                    write!(f, [text(&std::format!("source_position({position:?})"))])?;
+                    write!(
+                        f,
+                        [text(&std::format!("source_position({position:?})"), None)]
+                    )?;
                 }
 
                 FormatElement::LineSuffixBoundary => {
@@ -357,7 +360,7 @@ impl Format<IrFormatContext<'_>> for &[FormatElement] {
                     write!(f, [token("best_fitting(")])?;
 
                     if *mode != BestFittingMode::FirstLine {
-                        write!(f, [text(&std::format!("mode: {mode:?}, "))])?;
+                        write!(f, [text(&std::format!("mode: {mode:?}, "), None)])?;
                     }
 
                     write!(f, [token("[")])?;
@@ -389,14 +392,17 @@ impl Format<IrFormatContext<'_>> for &[FormatElement] {
                             write!(
                                 f,
                                 [
-                                    text(&std::format!("<interned {index}>")),
+                                    text(&std::format!("<interned {index}>"), None),
                                     space(),
                                     &&**interned,
                                 ]
                             )?;
                         }
                         Some(reference) => {
-                            write!(f, [text(&std::format!("<ref interned *{reference}>"))])?;
+                            write!(
+                                f,
+                                [text(&std::format!("<ref interned *{reference}>"), None)]
+                            )?;
                         }
                     }
                 }
@@ -415,7 +421,7 @@ impl Format<IrFormatContext<'_>> for &[FormatElement] {
                                     f,
                                     [
                                         token("<END_TAG_WITHOUT_START<"),
-                                        text(&std::format!("{:?}", tag.kind())),
+                                        text(&std::format!("{:?}", tag.kind()), None),
                                         token(">>"),
                                     ]
                                 )?;
@@ -430,9 +436,9 @@ impl Format<IrFormatContext<'_>> for &[FormatElement] {
                                         token(")"),
                                         soft_line_break_or_space(),
                                         token("ERROR<START_END_TAG_MISMATCH<start: "),
-                                        text(&std::format!("{start_kind:?}")),
+                                        text(&std::format!("{start_kind:?}"), None),
                                         token(", end: "),
-                                        text(&std::format!("{:?}", tag.kind())),
+                                        text(&std::format!("{:?}", tag.kind()), None),
                                         token(">>")
                                     ]
                                 )?;
@@ -464,7 +470,7 @@ impl Format<IrFormatContext<'_>> for &[FormatElement] {
                                 f,
                                 [
                                     token("align("),
-                                    text(&count.to_string()),
+                                    text(&count.to_string(), None),
                                     token(","),
                                     space(),
                                 ]
@@ -476,7 +482,7 @@ impl Format<IrFormatContext<'_>> for &[FormatElement] {
                                 f,
                                 [
                                     token("line_suffix("),
-                                    text(&std::format!("{reserved_width:?}")),
+                                    text(&std::format!("{reserved_width:?}"), None),
                                     token(","),
                                     space(),
                                 ]
@@ -493,7 +499,11 @@ impl Format<IrFormatContext<'_>> for &[FormatElement] {
                             if let Some(group_id) = group.id() {
                                 write!(
                                     f,
-                                    [text(&std::format!("\"{group_id:?}\"")), token(","), space(),]
+                                    [
+                                        text(&std::format!("\"{group_id:?}\""), None),
+                                        token(","),
+                                        space(),
+                                    ]
                                 )?;
                             }
 
@@ -514,7 +524,11 @@ impl Format<IrFormatContext<'_>> for &[FormatElement] {
                             if let Some(group_id) = id {
                                 write!(
                                     f,
-                                    [text(&std::format!("\"{group_id:?}\"")), token(","), space(),]
+                                    [
+                                        text(&std::format!("\"{group_id:?}\""), None),
+                                        token(","),
+                                        space(),
+                                    ]
                                 )?;
                             }
                         }
@@ -547,7 +561,7 @@ impl Format<IrFormatContext<'_>> for &[FormatElement] {
                                 f,
                                 [
                                     token("indent_if_group_breaks("),
-                                    text(&std::format!("\"{id:?}\"")),
+                                    text(&std::format!("\"{id:?}\""), None),
                                     token(","),
                                     space(),
                                 ]
@@ -567,7 +581,11 @@ impl Format<IrFormatContext<'_>> for &[FormatElement] {
                             if let Some(group_id) = condition.group_id {
                                 write!(
                                     f,
-                                    [text(&std::format!("\"{group_id:?}\"")), token(","), space()]
+                                    [
+                                        text(&std::format!("\"{group_id:?}\""), None),
+                                        token(","),
+                                        space(),
+                                    ]
                                 )?;
                             }
                         }
@@ -577,7 +595,7 @@ impl Format<IrFormatContext<'_>> for &[FormatElement] {
                                 f,
                                 [
                                     token("label("),
-                                    text(&std::format!("\"{label_id:?}\"")),
+                                    text(&std::format!("\"{label_id:?}\""), None),
                                     token(","),
                                     space(),
                                 ]
@@ -646,7 +664,7 @@ impl Format<IrFormatContext<'_>> for &[FormatElement] {
                     ContentArrayEnd,
                     token(")"),
                     soft_line_break_or_space(),
-                    text(&std::format!("<START_WITHOUT_END<{top:?}>>")),
+                    text(&std::format!("<START_WITHOUT_END<{top:?}>>"), None),
                 ]
             )?;
         }
@@ -789,7 +807,7 @@ impl Format<IrFormatContext<'_>> for Condition {
                 f,
                 [
                     token("if_group_fits_on_line("),
-                    text(&std::format!("\"{id:?}\"")),
+                    text(&std::format!("\"{id:?}\""), None),
                     token(")")
                 ]
             ),
@@ -798,7 +816,7 @@ impl Format<IrFormatContext<'_>> for Condition {
                 f,
                 [
                     token("if_group_breaks("),
-                    text(&std::format!("\"{id:?}\"")),
+                    text(&std::format!("\"{id:?}\""), None),
                     token(")")
                 ]
             ),

crates/ruff_formatter/src/format_extensions.rs

@@ -32,7 +32,7 @@ pub trait MemoizeFormat<Context> {
     ///         let value = self.value.get();
     ///         self.value.set(value + 1);
     ///
-    ///         write!(f, [text(&std::format!("Formatted {value} times."))])
+    ///         write!(f, [text(&std::format!("Formatted {value} times."), None)])
     ///     }
     /// }
     ///
@@ -110,7 +110,7 @@ where
     ///         write!(f, [
     ///             token("Count:"),
     ///             space(),
-    ///             text(&std::format!("{current}")),
+    ///             text(&std::format!("{current}"), None),
     ///             hard_line_break()
     ///         ])?;
     ///

crates/ruff_formatter/src/lib.rs

@@ -41,7 +41,7 @@ use std::marker::PhantomData;
 use std::num::{NonZeroU16, NonZeroU8, TryFromIntError};
 
 use crate::format_element::document::Document;
-use crate::printer::{Printer, PrinterOptions};
+use crate::printer::{Printer, PrinterOptions, SourceMapGeneration};
 pub use arguments::{Argument, Arguments};
 pub use buffer::{
     Buffer, BufferExtensions, BufferSnapshot, Inspect, RemoveSoftLinesBuffer, VecBuffer,
@@ -53,7 +53,7 @@ pub use crate::diagnostics::{ActualStart, FormatError, InvalidDocumentError, Pri
 pub use format_element::{normalize_newlines, FormatElement, LINE_TERMINATORS};
 pub use group_id::GroupId;
 use ruff_macros::CacheKey;
-use ruff_text_size::{TextLen, TextRange, TextSize};
+use ruff_text_size::{TextRange, TextSize};
 
 #[derive(Debug, Eq, PartialEq, Clone, Copy, Hash, CacheKey)]
 #[cfg_attr(
@@ -269,6 +269,7 @@ impl FormatOptions for SimpleFormatOptions {
             line_width: self.line_width,
             indent_style: self.indent_style,
             indent_width: self.indent_width,
+            source_map_generation: SourceMapGeneration::Enabled,
             ..PrinterOptions::default()
         }
     }
@@ -431,129 +432,6 @@ impl Printed {
     pub fn take_verbatim_ranges(&mut self) -> Vec<TextRange> {
         std::mem::take(&mut self.verbatim_ranges)
     }
-
-    /// Slices the formatted code to the sub-slices that covers the passed `source_range` in `source`.
-    ///
-    /// The implementation uses the source map generated during formatting to find the closest range
-    /// in the formatted document that covers `source_range` or more. The returned slice
-    /// matches the `source_range` exactly (except indent, see below) if the formatter emits [`FormatElement::SourcePosition`] for
-    /// the range's offsets.
-    ///
-    /// ## Indentation
-    /// The indentation before `source_range.start` is replaced with the indentation returned by the formatter
-    /// to fix up incorrectly intended code.
-    ///
-    /// Returns the entire document if the source map is empty.
-    ///
-    /// # Panics
-    /// If `source_range` points to offsets that are not in the bounds of `source`.
-    #[must_use]
-    pub fn slice_range(self, source_range: TextRange, source: &str) -> PrintedRange {
-        let mut start_marker: Option<SourceMarker> = None;
-        let mut end_marker: Option<SourceMarker> = None;
-
-        // Note: The printer can generate multiple source map entries for the same source position.
-        // For example if you have:
-        // * token("a + b")
-        // * `source_position(276)`
-        // * `token(")")`
-        // * `source_position(276)`
-        // *  `hard_line_break`
-        // The printer uses the source position 276 for both the tokens `)` and the `\n` because
-        // there were multiple `source_position` entries in the IR with the same offset.
-        // This can happen if multiple nodes start or end at the same position. A common example
-        // for this are expressions and expression statement that always end at the same offset.
-        //
-        // Warning: Source markers are often emitted sorted by their source position but it's not guaranteed
-        // and depends on the emitted `IR`.
-        // They are only guaranteed to be sorted in increasing order by their destination position.
-        for marker in self.sourcemap {
-            // Take the closest start marker, but skip over start_markers that have the same start.
-            if marker.source <= source_range.start()
-                && !start_marker.is_some_and(|existing| existing.source >= marker.source)
-            {
-                start_marker = Some(marker);
-            }
-
-            if marker.source >= source_range.end()
-                && !end_marker.is_some_and(|existing| existing.source <= marker.source)
-            {
-                end_marker = Some(marker);
-            }
-        }
-
-        let (source_start, formatted_start) = start_marker
-            .map(|marker| (marker.source, marker.dest))
-            .unwrap_or_default();
-
-        let (source_end, formatted_end) = end_marker
-            .map_or((source.text_len(), self.code.text_len()), |marker| {
-                (marker.source, marker.dest)
-            });
-
-        let source_range = TextRange::new(source_start, source_end);
-        let formatted_range = TextRange::new(formatted_start, formatted_end);
-
-        // Extend both ranges to include the indentation
-        let source_range = extend_range_to_include_indent(source_range, source);
-        let formatted_range = extend_range_to_include_indent(formatted_range, &self.code);
-
-        PrintedRange {
-            code: self.code[formatted_range].to_string(),
-            source_range,
-        }
-    }
-}
-
-/// Extends `range` backwards (by reducing `range.start`) to include any directly preceding whitespace (`\t` or ` `).
-///
-/// # Panics
-/// If `range.start` is out of `source`'s bounds.
-fn extend_range_to_include_indent(range: TextRange, source: &str) -> TextRange {
-    let whitespace_len: TextSize = source[..usize::from(range.start())]
-        .chars()
-        .rev()
-        .take_while(|c| matches!(c, ' ' | '\t'))
-        .map(TextLen::text_len)
-        .sum();
-
-    TextRange::new(range.start() - whitespace_len, range.end())
-}
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-pub struct PrintedRange {
-    code: String,
-    source_range: TextRange,
-}
-
-impl PrintedRange {
-    pub fn new(code: String, source_range: TextRange) -> Self {
-        Self { code, source_range }
-    }
-
-    pub fn empty() -> Self {
-        Self {
-            code: String::new(),
-            source_range: TextRange::default(),
-        }
-    }
-
-    /// The formatted code.
-    pub fn as_code(&self) -> &str {
-        &self.code
-    }
-
-    /// The range the formatted code corresponds to in the source document.
-    pub fn source_range(&self) -> TextRange {
-        self.source_range
-    }
-
-    #[must_use]
-    pub fn with_code(self, code: String) -> Self {
-        Self { code, ..self }
-    }
 }
 
 /// Public return type of the formatter
@@ -575,7 +453,7 @@ pub type FormatResult<F> = Result<F, FormatError>;
 /// impl Format<SimpleFormatContext> for Paragraph {
 ///     fn fmt(&self, f: &mut Formatter<SimpleFormatContext>) -> FormatResult<()> {
 ///         write!(f, [
-///             text(&self.0),
+///             text(&self.0, None),
 ///             hard_line_break(),
 ///         ])
 ///     }

crates/ruff_formatter/src/printer/line_suffixes.rs

@@ -21,7 +21,8 @@ impl<'a> LineSuffixes<'a> {
     /// Takes all the pending line suffixes.
     pub(super) fn take_pending<'l>(
         &'l mut self,
-    ) -> impl DoubleEndedIterator<Item = LineSuffixEntry<'a>> + 'l + ExactSizeIterator {
+    ) -> impl Iterator<Item = LineSuffixEntry<'a>> + DoubleEndedIterator + 'l + ExactSizeIterator
+    {
         self.suffixes.drain(..)
     }
 

crates/ruff_formatter/src/printer/mod.rs

@@ -4,7 +4,7 @@ use drop_bomb::DebugDropBomb;
 use unicode_width::UnicodeWidthChar;
 
 pub use printer_options::*;
-use ruff_text_size::{TextLen, TextSize};
+use ruff_text_size::{Ranged, TextLen, TextSize};
 
 use crate::format_element::document::Document;
 use crate::format_element::tag::{Condition, GroupMode};
@@ -60,10 +60,7 @@ impl<'a> Printer<'a> {
         document: &'a Document,
         indent: u16,
     ) -> PrintResult<Printed> {
-        let indentation = Indention::Level(indent);
-        self.state.pending_indent = indentation;
-
-        let mut stack = PrintCallStack::new(PrintElementArgs::new(indentation));
+        let mut stack = PrintCallStack::new(PrintElementArgs::new(Indention::Level(indent)));
         let mut queue: PrintQueue<'a> = PrintQueue::new(document.as_ref());
 
         loop {
@@ -76,9 +73,6 @@ impl<'a> Printer<'a> {
             }
         }
 
-        // Push any pending marker
-        self.push_marker();
-
         Ok(Printed::new(
             self.state.buffer,
             None,
@@ -100,38 +94,42 @@ impl<'a> Printer<'a> {
         let args = stack.top();
 
         match element {
-            FormatElement::Space => self.print_text(Text::Token(" ")),
-            FormatElement::Token { text } => self.print_text(Text::Token(text)),
-            FormatElement::Text { text, text_width } => self.print_text(Text::Text {
-                text,
-                text_width: *text_width,
-            }),
-            FormatElement::SourceCodeSlice { slice, text_width } => {
-                let text = slice.text(self.source_code);
-                self.print_text(Text::Text {
+            FormatElement::Space => self.print_text(Text::Token(" "), None),
+            FormatElement::Token { text } => self.print_text(Text::Token(text), None),
+            FormatElement::Text { text, text_width } => self.print_text(
+                Text::Text {
                     text,
                     text_width: *text_width,
-                });
+                },
+                None,
+            ),
+            FormatElement::SourceCodeSlice { slice, text_width } => {
+                let text = slice.text(self.source_code);
+                self.print_text(
+                    Text::Text {
+                        text,
+                        text_width: *text_width,
+                    },
+                    Some(slice.range()),
+                );
             }
             FormatElement::Line(line_mode) => {
                 if args.mode().is_flat()
                     && matches!(line_mode, LineMode::Soft | LineMode::SoftOrSpace)
                 {
                     if line_mode == &LineMode::SoftOrSpace {
-                        self.print_text(Text::Token(" "));
+                        self.print_text(Text::Token(" "), None);
                     }
                 } else if self.state.line_suffixes.has_pending() {
                     self.flush_line_suffixes(queue, stack, Some(element));
                 } else {
                     // Only print a newline if the current line isn't already empty
                     if self.state.line_width > 0 {
-                        self.push_marker();
                         self.print_char('\n');
                     }
 
                     // Print a second line break if this is an empty line
                     if line_mode == &LineMode::Empty {
-                        self.push_marker();
                         self.print_char('\n');
                     }
 
@@ -144,11 +142,8 @@ impl<'a> Printer<'a> {
             }
 
             FormatElement::SourcePosition(position) => {
-                // The printer defers printing indents until the next text
-                // is printed. Pushing the marker now would mean that the
-                // mapped range includes the indent range, which we don't want.
-                // Queue the source map position and emit it when printing the next character
-                self.state.pending_source_position = Some(*position);
+                self.state.source_position = *position;
+                self.push_marker();
             }
 
             FormatElement::LineSuffixBoundary => {
@@ -440,7 +435,7 @@ impl<'a> Printer<'a> {
         Ok(print_mode)
     }
 
-    fn print_text(&mut self, text: Text) {
+    fn print_text(&mut self, text: Text, source_range: Option<TextRange>) {
         if !self.state.pending_indent.is_empty() {
             let (indent_char, repeat_count) = match self.options.indent_style() {
                 IndentStyle::Tab => ('\t', 1),
@@ -463,6 +458,19 @@ impl<'a> Printer<'a> {
             }
         }
 
+        // Insert source map markers before and after the token
+        //
+        // If the token has source position information the start marker
+        // will use the start position of the original token, and the end
+        // marker will use that position + the text length of the token
+        //
+        // If the token has no source position (was created by the formatter)
+        // both the start and end marker will use the last known position
+        // in the input source (from state.source_position)
+        if let Some(range) = source_range {
+            self.state.source_position = range.start();
+        }
+
         self.push_marker();
 
         match text {
@@ -485,24 +493,29 @@ impl<'a> Printer<'a> {
                 }
             }
         }
+
+        if let Some(range) = source_range {
+            self.state.source_position = range.end();
+        }
+
+        self.push_marker();
     }
 
     fn push_marker(&mut self) {
-        let Some(source_position) = self.state.pending_source_position.take() else {
+        if self.options.source_map_generation.is_disabled() {
             return;
-        };
+        }
 
         let marker = SourceMarker {
-            source: source_position,
+            source: self.state.source_position,
             dest: self.state.buffer.text_len(),
         };
 
-        if self
-            .state
-            .source_markers
-            .last()
-            .map_or(true, |last| last != &marker)
-        {
+        if let Some(last) = self.state.source_markers.last() {
+            if last != &marker {
+                self.state.source_markers.push(marker);
+            }
+        } else {
             self.state.source_markers.push(marker);
         }
     }
@@ -874,7 +887,7 @@ enum FillPairLayout {
 struct PrinterState<'a> {
     buffer: String,
     source_markers: Vec<SourceMarker>,
-    pending_source_position: Option<TextSize>,
+    source_position: TextSize,
     pending_indent: Indention,
     measured_group_fits: bool,
     line_width: u32,
@@ -1729,7 +1742,7 @@ a",
         let result = format_with_options(
             &format_args![
                 token("function main() {"),
-                block_indent(&text("let x = `This is a multiline\nstring`;")),
+                block_indent(&text("let x = `This is a multiline\nstring`;", None)),
                 token("}"),
                 hard_line_break()
             ],
@@ -1746,7 +1759,7 @@ a",
     fn it_breaks_a_group_if_a_string_contains_a_newline() {
         let result = format(&FormatArrayElements {
             items: vec![
-                &text("`This is a string spanning\ntwo lines`"),
+                &text("`This is a string spanning\ntwo lines`", None),
                 &token("\"b\""),
             ],
         });

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

@@ -14,6 +14,10 @@ pub struct PrinterOptions {
 
     /// The type of line ending to apply to the printed input
     pub line_ending: LineEnding,
+
+    /// Whether the printer should build a source map that allows mapping positions in the source document
+    /// to positions in the formatted document.
+    pub source_map_generation: SourceMapGeneration,
 }
 
 impl<'a, O> From<&'a O> for PrinterOptions

crates/ruff_formatter/src/printer/queue.rs

@@ -78,28 +78,27 @@ impl<'a> PrintQueue<'a> {
 impl<'a> Queue<'a> for PrintQueue<'a> {
     fn pop(&mut self) -> Option<&'a FormatElement> {
         let elements = self.element_slices.last_mut()?;
-        elements.next().or_else(
-            #[cold]
-            || {
-                self.element_slices.pop();
-                let elements = self.element_slices.last_mut()?;
-                elements.next()
-            },
-        )
+        elements.next().or_else(|| {
+            self.element_slices.pop();
+            let elements = self.element_slices.last_mut()?;
+            elements.next()
+        })
     }
 
     fn top_with_interned(&self) -> Option<&'a FormatElement> {
         let mut slices = self.element_slices.iter().rev();
         let slice = slices.next()?;
 
-        slice.as_slice().first().or_else(
-            #[cold]
-            || {
-                slices
-                    .next()
-                    .and_then(|next_elements| next_elements.as_slice().first())
-            },
-        )
+        match slice.as_slice().first() {
+            Some(element) => Some(element),
+            None => {
+                if let Some(next_elements) = slices.next() {
+                    next_elements.as_slice().first()
+                } else {
+                    None
+                }
+            }
+        }
     }
 
     fn extend_back(&mut self, elements: &'a [FormatElement]) {
@@ -147,30 +146,24 @@ impl<'a, 'print> FitsQueue<'a, 'print> {
 
 impl<'a, 'print> Queue<'a> for FitsQueue<'a, 'print> {
     fn pop(&mut self) -> Option<&'a FormatElement> {
-        self.queue.pop().or_else(
-            #[cold]
-            || {
-                if let Some(next_slice) = self.rest_elements.next_back() {
-                    self.queue.extend_back(next_slice.as_slice());
-                    self.queue.pop()
-                } else {
-                    None
-                }
-            },
-        )
+        self.queue.pop().or_else(|| {
+            if let Some(next_slice) = self.rest_elements.next_back() {
+                self.queue.extend_back(next_slice.as_slice());
+                self.queue.pop()
+            } else {
+                None
+            }
+        })
     }
 
     fn top_with_interned(&self) -> Option<&'a FormatElement> {
-        self.queue.top_with_interned().or_else(
-            #[cold]
-            || {
-                if let Some(next_elements) = self.rest_elements.as_slice().last() {
-                    next_elements.as_slice().first()
-                } else {
-                    None
-                }
-            },
-        )
+        self.queue.top_with_interned().or_else(|| {
+            if let Some(next_elements) = self.rest_elements.as_slice().last() {
+                next_elements.as_slice().first()
+            } else {
+                None
+            }
+        })
     }
 
     fn extend_back(&mut self, elements: &'a [FormatElement]) {

crates/ruff_index/Cargo.toml

@@ -11,7 +11,6 @@ repository = { workspace = true }
 license = { workspace = true }
 
 [lib]
-doctest = false
 
 [dependencies]
 ruff_macros = { path = "../ruff_macros" }

crates/ruff_linter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.3.1"
+version = "0.1.14"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -60,6 +60,7 @@ regex = { workspace = true }
 result-like = { workspace = true }
 rustc-hash = { workspace = true }
 schemars = { workspace = true, optional = true }
+semver = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 similar = { workspace = true }
@@ -84,8 +85,6 @@ tempfile = { workspace = true }
 [features]
 default = []
 schemars = ["dep:schemars"]
-# Enables rules for internal integration tests
-test-rules = []
 
 [lints]
 workspace = true

crates/ruff_linter/resources/test/fixtures/eradicate/ERA001.py

@@ -28,11 +28,3 @@ dictionary = {
 }
 
 #import os  # noqa
-
-# case 1:
-# try:
-# try:  # with comment
-# try: print()
-# except:
-# except Foo:
-# except Exception as e: print(e)

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

@@ -1,87 +1,31 @@
 import os
 import subprocess
 import time
-from pathlib import Path
-
-# Violation cases:
 
 
-async def func():
+async def foo():
     open("foo")
 
 
-async def func():
+async def foo():
     time.sleep(1)
 
 
-async def func():
+async def foo():
     subprocess.run("foo")
 
 
-async def func():
+async def foo():
     subprocess.call("foo")
 
 
-async def func():
+async def foo():
     subprocess.foo(0)
 
 
-async def func():
+async def foo():
     os.wait4(10)
 
 
-async def func():
+async def foo():
     os.wait(12)
-
-
-# Violation cases for pathlib:
-
-
-async def func():
-    Path("foo").open()  # ASYNC101
-
-
-async def func():
-    p = Path("foo")
-    p.open()  # ASYNC101
-
-
-async def func():
-    with Path("foo").open() as f:  # ASYNC101
-        pass
-
-
-async def func() -> None:
-    p = Path("foo")
-
-    async def bar():
-        p.open()  # ASYNC101
-
-
-async def func() -> None:
-    (p1, p2) = (Path("foo"), Path("bar"))
-
-    p1.open()  # ASYNC101
-
-
-# Non-violation cases for pathlib:
-
-
-class Foo:
-    def open(self):
-        pass
-
-
-async def func():
-    Foo().open()  # OK
-
-
-async def func():
-    def open():
-        pass
-
-    open()  # OK
-
-
-def func():
-    Path("foo").open()  # OK

crates/ruff_linter/resources/test/fixtures/flake8_bandit/S308.py

@@ -1,22 +0,0 @@
-from django.utils.safestring import mark_safe
-
-
-def some_func():
-    return mark_safe('<script>alert("evil!")</script>')
-
-
-@mark_safe
-def some_func():
-    return '<script>alert("evil!")</script>'
-
-
-from django.utils.html import mark_safe
-
-
-def some_func():
-    return mark_safe('<script>alert("evil!")</script>')
-
-
-@mark_safe
-def some_func():
-    return '<script>alert("evil!")</script>'

crates/ruff_linter/resources/test/fixtures/flake8_boolean_trap/FBT.py

@@ -119,16 +119,3 @@ def func(x: bool):
 
 
 settings(True)
-
-
-from dataclasses import dataclass, InitVar
-
-
-@dataclass
-class Fit:
-    force: InitVar[bool] = False
-
-    def __post_init__(self, force: bool) -> None:
-        print(force)
-
-Fit(force=True)

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

@@ -13,11 +13,3 @@ s = f"{set([f(x) for x in 'ab'])}"
 
 s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
 s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"
-
-s = set(  # comment
-    [x for x in range(3)]
-)
-
-s = set([  # comment
-    x for x in range(3)
-])

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

@@ -20,10 +20,3 @@ f"{dict(x='y') | dict(y='z')}"
 f"{ dict(x='y') | dict(y='z') }"
 f"a {dict(x='y') | dict(y='z')} b"
 f"a { dict(x='y') | dict(y='z') } b"
-
-dict(
-    # comment
-)
-
-tuple(  # comment
-)

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

@@ -8,11 +8,3 @@ t4 = tuple([
 t5 = tuple(
     (1, 2)
 )
-
-tuple(  # comment
-    [1, 2]
-)
-
-tuple([  # comment
-    1, 2
-])

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

@@ -2,12 +2,3 @@ l1 = list([1, 2])
 l2 = list((1, 2))
 l3 = list([])
 l4 = list(())
-
-
-list(  # comment
-    [1, 2]
-)
-
-list([  # comment
-    1, 2
-])

crates/ruff_linter/resources/test/fixtures/flake8_debugger/T100.py

@@ -7,19 +7,7 @@ from pdb import set_trace as st
 from celery.contrib.rdb import set_trace
 from celery.contrib import rdb
 import celery.contrib.rdb
-from debugpy import wait_for_client
-import debugpy
-from ptvsd import break_into_debugger
-from ptvsd import enable_attach
-from ptvsd import wait_for_attach
-import ptvsd
 
 breakpoint()
 st()
 set_trace()
-debugpy.breakpoint()
-wait_for_client()
-debugpy.listen(1234)
-enable_attach()
-break_into_debugger()
-wait_for_attach()

crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE790.py

@@ -207,23 +207,3 @@ class Repro:
     def stub(self) -> str:
         """Docstring"""
         ...
-
-
-class Repro(Protocol[int]):
-    def func(self) -> str:
-        """Docstring"""
-        ...
-
-    def impl(self) -> str:
-        """Docstring"""
-        return self.func()
-
-
-class Repro[int](Protocol):
-    def func(self) -> str:
-        """Docstring"""
-        ...
-
-    def impl(self) -> str:
-        """Docstring"""
-        return self.func()

crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI049.py

@@ -11,25 +11,13 @@ class _UnusedTypedDict2(typing.TypedDict):
 
 
 class _UsedTypedDict(TypedDict):
-    foo: bytes
+   foo: bytes
 
 
 class _CustomClass(_UsedTypedDict):
     bar: list[int]
 
-
 _UnusedTypedDict3 = TypedDict("_UnusedTypedDict3", {"foo": int})
 _UsedTypedDict3 = TypedDict("_UsedTypedDict3", {"bar": bytes})
 
-
 def uses_UsedTypedDict3(arg: _UsedTypedDict3) -> None: ...
-
-
-# In `.py` files, we don't flag unused definitions in class scopes (unlike in `.pyi`
-# files).
-class _CustomClass3:
-    class _UnusedTypeDict4(TypedDict):
-        pass
-
-    def method(self) -> None:
-        _CustomClass3._UnusedTypeDict4()

crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI049.pyi

@@ -35,13 +35,3 @@ _UnusedTypedDict3 = TypedDict("_UnusedTypedDict3", {"foo": int})
 _UsedTypedDict3 = TypedDict("_UsedTypedDict3", {"bar": bytes})
 
 def uses_UsedTypedDict3(arg: _UsedTypedDict3) -> None: ...
-
-
-# In `.pyi` files, we flag unused definitions in class scopes as well as in the global
-# scope (unlike in `.py` files).
-class _CustomClass3:
-    class _UnusedTypeDict4(TypedDict):
-        pass
-
-    def method(self) -> None:
-        _CustomClass3._UnusedTypeDict4()

crates/ruff_linter/resources/test/fixtures/flake8_raise/RSE102.py

@@ -93,15 +93,3 @@ def func():
 
 # OK
 raise func()
-
-
-# OK
-future = executor.submit(float, "a")
-if future.exception():
-    raise future.exception()
-
-
-# RSE102
-future = executor.submit(float, "a")
-if future.exception():
-    raise future.Exception()

crates/ruff_linter/resources/test/fixtures/flake8_return/RET505.py

@@ -103,14 +103,6 @@ def bar4(x):
             return None
 
 
-def fibo(n):
-    if n<2:
-        return n;
-    else:
-        last = 1;
-        last2 = 0;
-
-
 ###
 # Non-error
 ###
@@ -192,49 +184,3 @@ elif x == 2:
     y = "b"
 else:
     y = "c"
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/9732
-def sb(self):
-    if self._sb is not None: return self._sb
-    else: self._sb = '\033[01;%dm'; self._sa = '\033[0;0m';
-
-
-def indent(x, y, w, z):
-    if x:  # [no-else-return]
-        a = 1
-        return y
-    else:
-
-        c = 3
-        return z
-
-
-def indent(x, y, w, z):
-    if x:  # [no-else-return]
-        a = 1
-        return y
-    else:
-        # comment
-        c = 3
-        return z
-
-
-def indent(x, y, w, z):
-    if x:  # [no-else-return]
-        a = 1
-        return y
-    else:
-          # comment
-        c = 3
-        return z
-
-
-def indent(x, y, w, z):
-    if x:  # [no-else-return]
-        a = 1
-        return y
-    else:
-  # comment
-        c = 3
-        return z

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

@@ -193,11 +193,3 @@ def func():
         for y in range(5):
             g(x, idx)
             idx += 1
-
-async def func():
-    # OK (for loop is async)
-    idx = 0
-
-    async for x in async_gen():
-        g(x, idx)
-        idx += 1

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

@@ -143,8 +143,3 @@ elif c:  # but not on the second branch
 
 if a: b  # here's a comment
 elif c: b
-
-
-if(x > 200): pass
-elif(100 < x and x < 200 and 300 < y and y < 800):
-	pass

crates/ruff_linter/resources/test/fixtures/flake8_trio/TRIO100.py

@@ -1,27 +1,18 @@
 import trio
 
 
-async def func():
+async def foo():
     with trio.fail_after():
         ...
 
-
-async def func():
+async def foo():
     with trio.fail_at():
         await ...
 
-
-async def func():
+async def foo():
     with trio.move_on_after():
         ...
 
-
-async def func():
+async def foo():
     with trio.move_at():
         await ...
-
-
-async def func():
-    with trio.move_at():
-        async with trio.open_nursery() as nursery:
-            ...

crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TCH006_1.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from typing import TypeVar
+
+
+x: "int" | str  # TCH006
+x: ("int" | str) | "bool"  # TCH006
+
+
+def func():
+    x: "int" | str  # OK
+
+
+z: list[str, str | "int"] = []  # TCH006
+
+type A = Value["int" | str]  # OK
+
+OldS = TypeVar('OldS', int | 'str', str)  # TCH006

crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TCH006_2.py

@@ -0,0 +1,16 @@
+from typing import TypeVar
+
+
+x: "int" | str  # TCH006
+x: ("int" | str) | "bool"  # TCH006
+
+
+def func():
+    x: "int" | str  # OK
+
+
+z: list[str, str | "int"] = []  # TCH006
+
+type A = Value["int" | str]  # OK
+
+OldS = TypeVar('OldS', int | 'str', str)  # TCH006

crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TCH010_1.py

@@ -1,18 +0,0 @@
-from __future__ import annotations
-
-from typing import TypeVar
-
-
-x: "int" | str  # TCH010
-x: ("int" | str) | "bool"  # TCH010
-
-
-def func():
-    x: "int" | str  # OK
-
-
-z: list[str, str | "int"] = []  # TCH010
-
-type A = Value["int" | str]  # OK
-
-OldS = TypeVar('OldS', int | 'str', str)  # TCH010

crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TCH010_2.py

@@ -1,16 +0,0 @@
-from typing import TypeVar
-
-
-x: "int" | str  # TCH010
-x: ("int" | str) | "bool"  # TCH010
-
-
-def func():
-    x: "int" | str  # OK
-
-
-z: list[str, str | "int"] = []  # TCH010
-
-type A = Value["int" | str]  # OK
-
-OldS = TypeVar('OldS', int | 'str', str)  # TCH010

crates/ruff_linter/resources/test/fixtures/flake8_type_checking/init_var.py

@@ -1,18 +0,0 @@
-"""Test: avoid marking an `InitVar` as typing-only."""
-
-from __future__ import annotations
-
-from dataclasses import FrozenInstanceError, InitVar, dataclass
-from pathlib import Path
-
-
-@dataclass
-class C:
-    i: int
-    j: int = None
-    database: InitVar[Path] = None
-
-    err: FrozenInstanceError = None
-
-    def __post_init__(self, database):
-        ...

crates/ruff_linter/resources/test/fixtures/isort/default_section_user_defined.py

@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-import django.settings
-from library import foo
-import os
-import pytz
-import sys
-
-from . import local

crates/ruff_linter/resources/test/fixtures/isort/lines_after_imports.pyi

@@ -1,16 +0,0 @@
-from __future__ import annotations
-
-from typing import Any
-
-from requests import Session
-
-from my_first_party import my_first_party_object
-
-from . import my_local_folder_object
-
-
-
-class Thing(object):
-  name: str
-  def __init__(self, name: str):
-    self.name = name

crates/ruff_linter/resources/test/fixtures/isort/no_standard_library.py

@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-import os
-import django.settings
-from library import foo
-import pytz
-
-from . import local
-import sys

crates/ruff_linter/resources/test/fixtures/numpy/NPY002.py

@@ -19,11 +19,8 @@ numpy.random.seed()
 numpy.random.get_state()
 numpy.random.set_state()
 numpy.random.rand()
-numpy.random.ranf()
-numpy.random.sample()
 numpy.random.randn()
 numpy.random.randint()
-numpy.random.random()
 numpy.random.random_integers()
 numpy.random.random_sample()
 numpy.random.choice()
@@ -38,6 +35,7 @@ numpy.random.exponential()
 numpy.random.f()
 numpy.random.gamma()
 numpy.random.geometric()
+numpy.random.get_state()
 numpy.random.gumbel()
 numpy.random.hypergeometric()
 numpy.random.laplace()

crates/ruff_linter/resources/test/fixtures/pep8_naming/N804.py

@@ -50,29 +50,6 @@ class MetaClass(ABCMeta):
     def static_method(not_cls) -> bool:
         return False
 
-class ClsInArgsClass(ABCMeta):
-    def cls_as_argument(this, cls):
-        pass
-
-    def cls_as_pos_only_argument(this, cls, /):
-        pass
-
-    def cls_as_kw_only_argument(this, *, cls):
-        pass
-
-    def cls_as_varags(this, *cls):
-        pass
-
-    def cls_as_kwargs(this, **cls):
-        pass
-
-class RenamingInMethodBodyClass(ABCMeta):
-    def bad_method(this):
-        this = this
-        this
-
-    def bad_method(this):
-        self = this
 
 def func(x):
     return x

crates/ruff_linter/resources/test/fixtures/pep8_naming/N805.py

@@ -61,7 +61,7 @@ class PosOnlyClass:
     def good_method_pos_only(self, blah, /, something: str):
         pass
 
-    def bad_method_pos_only(this, blah, /, something: str):
+    def bad_method_pos_only(this, blah, /, self, something: str):
         pass
 
 
@@ -93,27 +93,3 @@ class ModelClass:
     @foobar.thisisstatic
     def badstatic(foo):
         pass
-
-class SelfInArgsClass:
-    def self_as_argument(this, self):
-        pass
-
-    def self_as_pos_only_argument(this, self, /):
-        pass
-
-    def self_as_kw_only_argument(this, *, self):
-        pass
-
-    def self_as_varags(this, *self):
-        pass
-
-    def self_as_kwargs(this, **self):
-        pass
-
-class RenamingInMethodBodyClass:
-    def bad_method(this):
-        this = this
-        this
-
-    def bad_method(this):
-        self = this

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

@@ -36,47 +36,35 @@ for i in list( # Comment
 ):  # PERF101
     pass
 
-for i in list(foo_dict):  # OK
+for i in list(foo_dict):  # Ok
     pass
 
-for i in list(1):  # OK
+for i in list(1):  # Ok
     pass
 
-for i in list(foo_int):  # OK
+for i in list(foo_int):  # Ok
     pass
 
 
 import itertools
 
-for i in itertools.product(foo_int):  # OK
+for i in itertools.product(foo_int):  # Ok
     pass
 
-for i in list(foo_list):  # OK
+for i in list(foo_list):  # Ok
     foo_list.append(i + 1)
 
 for i in list(foo_list):  # PERF101
     # Make sure we match the correct list
     other_list.append(i + 1)
 
-for i in list(foo_tuple):  # OK
+for i in list(foo_tuple):  # Ok
     foo_tuple.append(i + 1)
 
-for i in list(foo_set):  # OK
+for i in list(foo_set):  # Ok
     foo_set.append(i + 1)
 
 x, y, nested_tuple = (1, 2, (3, 4, 5))
 
 for i in list(nested_tuple):  # PERF101
     pass
-
-for i in list(foo_list):  # OK
-    if True:
-        foo_list.append(i + 1)
-
-for i in list(foo_list):  # OK
-    if True:
-        foo_list[i] = i + 1
-
-for i in list(foo_list):  # OK
-    if True:
-        del foo_list[i + 1]

crates/ruff_linter/resources/test/fixtures/pycodestyle/.editorconfig

@@ -1,8 +0,0 @@
-# These rules test for intentional "odd" formatting. Using a formatter fixes that
-[E{1,2,3}*.py]
-generated_code = true
-ij_formatter_enabled = false
-
-[W*.py]
-generated_code = true
-ij_formatter_enabled = false

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

@@ -147,9 +147,3 @@ ham[upper : ]
 
 #: E203:1:10
 ham[upper  :]
-
-#: Okay
-ham[lower +1 :, "columnname"]
-
-#: E203:1:13
-ham[lower + 1  :, "columnname"]

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

@@ -1,871 +0,0 @@
-"""Fixtures for the errors E301, E302, E303, E304, E305 and E306.
-Since these errors are about new lines, each test starts with either "No error" or "# E30X".
-Each test's end is signaled by a "# end" line.
-There should be no E30X error outside of a test's bound.
-"""
-
-
-# No error
-class Class:
-    pass
-# end
-
-
-# No error
-class Class:
-    """Docstring"""
-    def __init__(self) -> None:
-        pass
-# end
-
-
-# No error
-def func():
-    pass
-# end
-
-
-# No error
-# comment
-class Class:
-    pass
-# end
-
-
-# No error
-# comment
-def func():
-    pass
-# end
-
-
-# no error
-def foo():
-    pass
-
-
-def bar():
-    pass
-
-
-class Foo(object):
-    pass
-
-
-class Bar(object):
-    pass
-# end
-
-
-# No error
-class Class(object):
-
-    def func1():
-        pass
-
-    def func2():
-        pass
-# end
-
-
-# No error
-class Class(object):
-
-    def func1():
-        pass
-
-# comment
-    def func2():
-        pass
-# end
-
-
-# No error
-class Class:
-
-    def func1():
-        pass
-
-    # comment
-    def func2():
-        pass
-
-    # This is a
-    # ... multi-line comment
-
-    def func3():
-        pass
-
-
-# This is a
-# ... multi-line comment
-
-@decorator
-class Class:
-
-    def func1():
-        pass
-
-    # comment
-
-    def func2():
-        pass
-
-    @property
-    def func3():
-        pass
-
-# end
-
-
-# No error
-try:
-    from nonexistent import Bar
-except ImportError:
-    class Bar(object):
-        """This is a Bar replacement"""
-# end
-
-
-# No error
-def with_feature(f):
-    """Some decorator"""
-    wrapper = f
-    if has_this_feature(f):
-        def wrapper(*args):
-            call_feature(args[0])
-            return f(*args)
-    return wrapper
-# end
-
-
-# No error
-try:
-    next
-except NameError:
-    def next(iterator, default):
-        for item in iterator:
-            return item
-        return default
-# end
-
-
-# No error
-def fn():
-    pass
-
-
-class Foo():
-    """Class Foo"""
-
-    def fn():
-
-        pass
-# end
-
-
-# No error
-# comment
-def c():
-    pass
-
-
-# comment
-
-
-def d():
-    pass
-
-# This is a
-# ... multi-line comment
-
-# And this one is
-# ... a second paragraph
-# ... which spans on 3 lines
-
-
-# Function `e` is below
-# NOTE: Hey this is a testcase
-
-def e():
-    pass
-
-
-def fn():
-    print()
-
-    # comment
-
-    print()
-
-    print()
-
-# Comment 1
-
-# Comment 2
-
-
-# Comment 3
-
-def fn2():
-
-    pass
-# end
-
-
-# no error
-if __name__ == '__main__':
-    foo()
-# end
-
-
-# no error
-defaults = {}
-defaults.update({})
-# end
-
-
-# no error
-def foo(x):
-    classification = x
-    definitely = not classification
-# end
-
-
-# no error
-def bar(): pass
-def baz(): pass
-# end
-
-
-# no error
-def foo():
-    def bar(): pass
-    def baz(): pass
-# end
-
-
-# no error
-from typing import overload
-from typing import Union
-# end
-
-
-# no error
-@overload
-def f(x: int) -> int: ...
-@overload
-def f(x: str) -> str: ...
-# end
-
-
-# no error
-def f(x: Union[int, str]) -> Union[int, str]:
-    return x
-# end
-
-
-# no error
-from typing import Protocol
-
-
-class C(Protocol):
-    @property
-    def f(self) -> int: ...
-    @property
-    def g(self) -> str: ...
-# end
-
-
-# no error
-def f(
-    a,
-):
-    pass
-# end
-
-
-# no error
-if True:
-    class Class:
-        """Docstring"""
-
-        def function(self):
-            ...
-# end
-
-
-# no error
-if True:
-    def function(self):
-        ...
-# end
-
-
-# no error
-@decorator
-# comment
-@decorator
-def function():
-    pass
-# end
-
-
-# no error
-class Class:
-    def method(self):
-        if True:
-            def function():
-                pass
-# end
-
-
-# no error
-@decorator
-async def function(data: None) -> None:
-    ...
-# end
-
-
-# no error
-class Class:
-    def method():
-        """docstring"""
-        # comment
-        def function():
-            pass
-# end
-
-
-# no error
-try:
-    if True:
-        # comment
-        class Class:
-            pass
-
-except:
-    pass
-# end
-
-
-# no error
-def f():
-    def f():
-        pass
-# end
-
-
-# no error
-class MyClass:
-    # comment
-    def method(self) -> None:
-        pass
-# end
-
-
-# no error
-def function1():
-    # Comment
-    def function2():
-        pass
-# end
-
-
-# no error
-async def function1():
-    await function2()
-    async with function3():
-        pass
-# end
-
-
-# no error
-if (
-    cond1
-
-
-
-
-    and cond2
-):
-    pass
-#end
-
-
-# no error
-async def function1():
-  await function2()
-  async with function3():
-    pass
-# end
-
-
-# no error
-async def function1():
-	await function2()
-	async with function3():
-		pass
-# end
-
-
-# no error
-async def function1():
-	await function2()
-    async with function3():
-    	pass
-# end
-
-
-# no error
-class Test:
-    async
-
-    def a(self): pass
-# end
-
-
-# no error
-class Test:
-    def a():
-        pass
-# wrongly indented comment
-
-    def b():
-        pass
-# end
-
-
-# no error
-def test():
-    pass
-  
-  # Wrongly indented comment
-    pass
-# end
-
-
-# E301
-class Class(object):
-
-    def func1():
-        pass
-    def func2():
-        pass
-# end
-
-
-# E301
-class Class:
-
-    def fn1():
-        pass
-    # comment
-    def fn2():
-        pass
-# end
-
-
-# E301
-class Class:
-    """Class for minimal repo."""
-
-    columns = []
-    @classmethod
-    def cls_method(cls) -> None:
-        pass
-# end
-
-
-# E301
-class Class:
-    """Class for minimal repo."""
-
-    def method(cls) -> None:
-        pass
-    @classmethod
-    def cls_method(cls) -> None:
-        pass
-# end
-
-
-# E302
-"""Main module."""
-def fn():
-    pass
-# end
-
-
-# E302
-import sys
-def get_sys_path():
-    return sys.path
-# end
-
-
-# E302
-def a():
-    pass
-
-def b():
-    pass
-# end
-
-
-# E302
-def a():
-    pass
-
-# comment
-
-def b():
-    pass
-# end
-
-
-# E302
-def a():
-    pass
-
-async def b():
-    pass
-# end
-
-
-# E302
-async  def x():
-    pass
-
-async  def x(y: int = 1):
-    pass
-# end
-
-
-# E302
-def bar():
-    pass
-def baz(): pass
-# end
-
-
-# E302
-def bar(): pass
-def baz():
-    pass
-# end
-
-
-# E302
-def f():
-    pass
-
-# comment
-@decorator
-def g():
-    pass
-# end
-
-
-# E302
-class Test:
-	
-	pass
-	
-	def method1():
-		return 1
-		
-		
-	def method2():
-		return 22
-# end
-
-
-# E303
-def fn():
-    _ = None
-
-
-    # arbitrary comment
-
-    def inner():  # E306 not expected (pycodestyle detects E306)
-        pass
-# end
-
-
-# E303
-def fn():
-    _ = None
-
-
-    # arbitrary comment
-    def inner():  # E306 not expected (pycodestyle detects E306)
-        pass
-# end
-
-
-# E303
-print()
-
-
-
-print()
-# end
-
-
-# E303:5:1
-print()
-
-
-
-# comment
-
-print()
-# end
-
-
-# E303:5:5 E303:8:5
-def a():
-    print()
-
-
-    # comment
-
-
-    # another comment
-
-    print()
-# end
-
-
-# E303
-#!python
-
-
-
-"""This class docstring comes on line 5.
-It gives error E303: too many blank lines (3)
-"""
-# end
-
-
-# E303
-class Class:
-    def a(self):
-        pass
-
-
-    def b(self):
-        pass
-# end
-
-
-# E303
-if True:
-    a = 1
-
-
-    a = 2
-# end
-
-
-# E303
-class Test:
-
-
-    # comment
-
-
-    # another comment
-
-    def test(self): pass
-# end
-
-
-# E303
-class Test:
-    def a(self):
-        pass
-
-# wrongly indented comment
-
-
-    def b(self):
-        pass
-# end
-
-
-# E303
-def fn():
-    pass
-
- 
-    pass
-# end
-
-
-# E304
-@decorator
-
-def function():
-    pass
-# end
-
-
-# E304
-@decorator
-
-# comment    E304 not expected
-def function():
-    pass
-# end
-
-
-# E304
-@decorator
-
-# comment  E304 not expected
-
-
-# second comment  E304 not expected
-def function():
-    pass
-# end
-
-
-# E305:7:1
-def fn():
-    print()
-
-    # comment
-
-    # another comment
-fn()
-# end
-
-
-# E305
-class Class():
-    pass
-
-    # comment
-
-    # another comment
-a = 1
-# end
-
-
-# E305:8:1
-def fn():
-    print()
-
-    # comment
-
-    # another comment
-
-try:
-    fn()
-except Exception:
-    pass
-# end
-
-
-# E305:5:1
-def a():
-    print()
-
-# Two spaces before comments, too.
-if a():
-    a()
-# end
-
-
-#: E305:8:1
-# Example from https://github.com/PyCQA/pycodestyle/issues/400
-import stuff
-
-
-def main():
-    blah, blah
-
-if __name__ == '__main__':
-    main()
-# end
-
-
-# E306:3:5
-def a():
-    x = 1
-    def b():
-        pass
-# end
-
-
-#: E306:3:5
-async def a():
-    x = 1
-    def b():
-        pass
-# end
-
-
-#: E306:3:5 E306:5:9
-def a():
-    x = 2
-    def b():
-        x = 1
-        def c():
-            pass
-# end
-
-
-# E306:3:5 E306:6:5
-def a():
-    x = 1
-    class C:
-        pass
-    x = 2
-    def b():
-        pass
-# end
-
-
-# E306
-def foo():
-    def bar():
-        pass
-    def baz(): pass
-# end
-
-
-# E306:3:5
-def foo():
-    def bar(): pass
-    def baz():
-        pass
-# end
-
-
-# E306
-def a():
-    x = 2
-    @decorator
-    def b():
-        pass
-# end
-
-
-# E306
-def a():
-    x = 2
-    @decorator
-    async def b():
-        pass
-# end
-
-
-# E306
-def a():
-    x = 2
-    async def b():
-        pass
-# end

crates/ruff_linter/resources/test/fixtures/pycodestyle/E30.pyi

@@ -1,50 +0,0 @@
-import json
-
-from typing import Any, Sequence
-
-class MissingCommand(TypeError): ...
-class AnoherClass: ...
-
-def a(): ...
-
-@overload
-def a(arg: int): ...
- 
-@overload
-def a(arg: int, name: str): ...
-
-
-def grouped1(): ...
-def grouped2(): ...
-def grouped3( ): ...
-
-
-class BackendProxy:
-    backend_module: str
-    backend_object: str | None
-    backend: Any
-    
-    def grouped1(): ...
-    def grouped2(): ...
-    def grouped3( ): ...
-    @decorated
-    
-    def with_blank_line(): ...
-    
-    
-    def ungrouped(): ...
-a = "test"
-
-def function_def():
-    pass
-b = "test"
-
-
-def outer():
-     def inner():
-         pass
-     def inner2():
-         pass
-         
-class Foo: ...
-class Bar: ... 

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

@@ -1,62 +0,0 @@
-import json
-
-
-
-from typing import Any, Sequence
-
-
-class MissingCommand(TypeError): ...  # noqa: N818
-
-
-class BackendProxy:
-    backend_module: str
-    backend_object: str | None
-    backend: Any
-
-
-if __name__ == "__main__":
-    import abcd
-
-
-    abcd.foo()
-
-def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
-
-if TYPE_CHECKING:
-    import os
-
-
-
-    from typing_extensions import TypeAlias
-
-
-    abcd.foo()
-
-def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
-    ...
-
-if TYPE_CHECKING:
-    from typing_extensions import TypeAlias
-
-def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any:
-    ...
-
-
-def _exit(self) -> None: ...
-
-
-def _optional_commands(self) -> dict[str, bool]: ...
-
-
-def run(argv: Sequence[str]) -> int: ...
-
-
-def read_line(fd: int = 0) -> bytearray: ...
-
-
-def flush() -> None: ...
-
-
-from typing import Any, Sequence
-
-class MissingCommand(TypeError): ...  # noqa: N818

crates/ruff_linter/resources/test/fixtures/pycodestyle/E30_isort.pyi

@@ -1,62 +0,0 @@
-import json
-
-
-
-from typing import Any, Sequence
-
-
-class MissingCommand(TypeError): ...  # noqa: N818
-
-
-class BackendProxy:
-    backend_module: str
-    backend_object: str | None
-    backend: Any
-
-
-if __name__ == "__main__":
-    import abcd
-
-
-    abcd.foo()
-
-def __init__(self, backend_module: str, backend_obj: str | None) -> None: ...
-
-if TYPE_CHECKING:
-    import os
-
-
-
-    from typing_extensions import TypeAlias
-
-
-    abcd.foo()
-
-def __call__(self, name: str, *args: Any, **kwargs: Any) -> Any:
-    ...
-
-if TYPE_CHECKING:
-    from typing_extensions import TypeAlias
-
-def __call__2(self, name: str, *args: Any, **kwargs: Any) -> Any:
-    ...
-
-
-def _exit(self) -> None: ...
-
-
-def _optional_commands(self) -> dict[str, bool]: ...
-
-
-def run(argv: Sequence[str]) -> int: ...
-
-
-def read_line(fd: int = 0) -> bytearray: ...
-
-
-def flush() -> None: ...
-
-
-from typing import Any, Sequence
-
-class MissingCommand(TypeError): ...  # noqa: N818

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

@@ -1,7 +0,0 @@
-import os
-
-os.environ["WORLD_SIZE"] = "1"
-os.putenv("CUDA_VISIBLE_DEVICES", "4")
-del os.environ["WORLD_SIZE"]
-
-import torch

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

@@ -1,15 +0,0 @@
-'''trailing whitespace 
-inside a multiline string'''
-
-f'''trailing whitespace 
-inside a multiline f-string'''
-
-# Trailing whitespace after `{`
-f'abc { 
-    1 + 2
-}'
-
-# Trailing whitespace after `2`
-f'abc {
-    1 + 2 
-}'

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

@@ -14,6 +14,3 @@ class Chassis(RobotModuleTemplate):
  " \
     \
     
-'''blank line with whitespace
- 
-inside a multiline string'''

crates/ruff_linter/resources/test/fixtures/pydocstyle/D413.py

@@ -57,15 +57,3 @@ def func():
 
     Returns:
         the value"""
-
-
-def func():
-    """Do something.
-
-    Args:
-        x: the value
-            with a hanging indent
-
-    Returns:
-        the value
-        """

crates/ruff_linter/resources/test/fixtures/pydocstyle/sections.py

@@ -562,46 +562,3 @@ def titlecase_sub_section_header():
 
         Returns:
     """
-
-
-def test_method_should_be_correctly_capitalized(parameters: list[str], other_parameters: dict[str, str]): # noqa: D213
-    """Test parameters and attributes sections are capitalized correctly.
-
-    Parameters
-    ----------
-    parameters:
-        A list of string parameters
-    other_parameters:
-        A dictionary of string attributes
-
-    Other Parameters
-    ----------
-    other_parameters:
-        A dictionary of string attributes
-    parameters:
-        A list of string parameters
-
-    """
-
-
-def test_lowercase_sub_section_header_should_be_valid(parameters: list[str], value: int):  # noqa: D213
-    """Test that lower case subsection header is valid even if it has the same name as section kind.
-
-    Parameters:
-    ----------
-    parameters:
-        A list of string parameters
-    value:
-        Some value
-    """
-
-
-def test_lowercase_sub_section_header_different_kind(returns: int):
-   """Test that lower case subsection header is valid even if it is of a different kind.
-
-   Parameters
-   -‐-----------------
-   returns:
-       some value
-
-   """

crates/ruff_linter/resources/test/fixtures/pygrep_hooks/PGH001_0.py

@@ -0,0 +1,9 @@
+from ast import literal_eval
+
+eval("3 + 4")
+
+literal_eval({1: 2})
+
+
+def fn() -> None:
+    eval("3 + 4")

crates/ruff_linter/resources/test/fixtures/pygrep_hooks/PGH001_1.py

@@ -0,0 +1,11 @@
+def eval(content: str) -> None:
+    pass
+
+
+eval("3 + 4")
+
+literal_eval({1: 2})
+
+
+def fn() -> None:
+    eval("3 + 4")

crates/ruff_linter/resources/test/fixtures/pygrep_hooks/PGH002_0.py

@@ -0,0 +1,10 @@
+import logging
+import warnings
+from warnings import warn
+
+warnings.warn("this is ok")
+warn("by itself is also ok")
+logging.warning("this is fine")
+
+logger = logging.getLogger(__name__)
+logger.warning("this is fine")

crates/ruff_linter/resources/test/fixtures/pygrep_hooks/PGH002_1.py

@@ -0,0 +1,8 @@
+import logging
+from logging import warn
+
+logging.warn("this is not ok")
+warn("not ok")
+
+logger = logging.getLogger(__name__)
+logger.warn("this is not ok")

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

@@ -0,0 +1,73 @@
+# OK
+
+1<2 and 'b' and 'c'
+
+1<2 or 'a' and 'b'
+
+1<2 and 'a'
+
+1<2 or 'a'
+
+2>1
+
+1<2 and 'a' or 'b' and 'c'
+
+1<2 and 'a' or 'b' or 'c'
+
+1<2 and 'a' or 'b' or 'c' or (lambda x: x+1)
+
+1<2 and 'a' or 'b' or (lambda x: x+1) or 'c'
+
+default = 'default'
+if (not isinstance(default, bool) and isinstance(default, int)) \
+        or (isinstance(default, str) and default):
+    pass
+
+docid, token = None, None
+(docid is None and token is None) or (docid is not None and token is not None)
+
+vendor, os_version = 'darwin', '14'
+vendor == "debian" and os_version in ["12"] or vendor == "ubuntu" and os_version in []
+
+# Don't emit if the parent is an `if` statement.
+if (task_id in task_dict and task_dict[task_id] is not task) \
+        or task_id in used_group_ids:
+    pass
+
+no_target, is_x64, target = True, False, 'target'
+if (no_target and not is_x64) or target == 'ARM_APPL_RUST_TARGET':
+    pass
+
+# Don't emit if the parent is a `bool_op` expression.
+isinstance(val, str) and ((len(val) == 7 and val[0] == "#") or val in enums.NamedColor)
+
+# Errors
+
+1<2 and 'a' or 'b'
+
+(lambda x: x+1) and 'a' or 'b'
+
+'a' and (lambda x: x+1) or 'orange'
+
+val = '#0000FF'
+(len(val) == 7 and val[0] == "#") or val in {'green'}
+
+marker = 'marker'
+isinstance(marker, dict) and 'field' in marker or marker in {}
+
+def has_oranges(oranges, apples=None) -> bool:
+    return apples and False or oranges
+
+[x for x in l if a and b or c]
+
+{x: y for x in l if a and b or c}
+
+{x for x in l if a and b or c}
+
+new_list = [
+    x
+    for sublist in all_lists
+    if a and b or c
+    for x in sublist
+    if (isinstance(operator, list) and x in operator) or x != operator
+]

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

@@ -91,9 +91,6 @@ class Apples:
     def __prepare__():
         pass
 
-    def __mro_entries__(self, bases):
-        pass
-
 
 def __foo_bar__():  # this is not checked by the [bad-dunder-name] rule
     ...

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

@@ -1,32 +0,0 @@
-from typing import Any
-
-
-d = {1: 1, 2: 2}
-d_tuple = {(1, 2): 3, (4, 5): 6}
-d_tuple_annotated: Any = {(1, 2): 3, (4, 5): 6}
-d_tuple_incorrect_tuple = {(1,): 3, (4, 5): 6}
-l = [1, 2]
-s1 = {1, 2}
-s2 = {1, 2, 3}
-
-# Errors
-for k, v in d:
-    pass
-
-for k, v in d_tuple_incorrect_tuple:
-    pass
-
-
-# Non errors
-for k, v in d.items():
-    pass
-for k in d.keys():
-    pass
-for i, v in enumerate(l):
-    pass
-for i, v in s1.intersection(s2):
-    pass
-for a, b in d_tuple: 
-    pass
-for a, b in d_tuple_annotated: 
-    pass

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

@@ -6,9 +6,8 @@ dictVarBad = os.getenv("AAA", {"a", 7})  # [invalid-envvar-default]
 print(os.getenv("TEST", False))  # [invalid-envvar-default]
 os.getenv("AA", "GOOD")
 os.getenv("AA", f"GOOD")
-os.getenv("AA", "GOOD" + "BAR")
+os.getenv("AA", "GOOD" + "BAD")
 os.getenv("AA", "GOOD" + 1)
-os.getenv("AA", "GOOD %s" % "BAR")
+os.getenv("AA", "GOOD %s" % "BAD")
 os.getenv("B", Z)
-os.getenv("AA", "GOOD" if Z else "BAR")
-os.getenv("AA", 1 if Z else "BAR")  # [invalid-envvar-default]
+