Add test cases

.
Basic nested range formatting
2023-09-22 15:50:34 +02:00 · 2023-09-21 16:58:54 +02:00 · 2023-09-21 15:23:17 +02:00 · 2023-09-21 13:38:05 +02:00 · 2023-09-21 13:37:52 +02:00 · 2023-09-21 13:28:59 +02:00
1048 changed files with 43528 additions and 82599 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,5 +9,5 @@ updates:
  - package-ecosystem: "cargo"
    directory: "/"
    schedule:
-      interval: "weekly"
+      interval: "daily"
    labels: ["internal"]
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -4,6 +4,7 @@ changelog:
    labels:
      - internal
      - documentation
+      - formatter
  categories:
    - title: Breaking Changes
      labels:
@@ -11,6 +12,7 @@ changelog:
    - title: Rules
      labels:
        - rule
+        - autofix
    - title: Settings
      labels:
        - configuration
@@ -18,9 +20,6 @@ changelog:
    - title: Bug Fixes
      labels:
        - bug
-    - title: Formatter
-      labels:
-        - formatter
    - title: Preview
      labels:
        - preview
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -43,7 +43,6 @@ jobs:
              - "!crates/ruff_dev/**"
              - "!crates/ruff_shrinking/**"
              - scripts/*
-              - .github/workflows/ci.yaml

            formatter:
              - Cargo.toml
@@ -58,7 +57,6 @@ jobs:
              - crates/ruff_python_parser/**
              - crates/ruff_dev/**
              - scripts/*
-              - .github/workflows/ci.yaml

  cargo-fmt:
    name: "cargo fmt"
@@ -84,9 +82,12 @@ jobs:
      - name: "Clippy (wasm)"
        run: cargo clippy -p ruff_wasm --target wasm32-unknown-unknown --all-features -- -D warnings

-  cargo-test-linux:
-    runs-on: ubuntu-latest
-    name: "cargo test (linux)"
+  cargo-test:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    name: "cargo test | ${{ matrix.os }}"
    steps:
      - uses: actions/checkout@v4
      - name: "Install Rust toolchain"
@@ -95,35 +96,46 @@ jobs:
        uses: taiki-e/install-action@v2
        with:
          tool: cargo-insta
+      - run: pip install black[d]==23.1.0
      - uses: Swatinem/rust-cache@v2
-      - name: "Run tests"
+      - name: "Run tests (Ubuntu)"
+        if: ${{ matrix.os == 'ubuntu-latest' }}
        run: cargo insta test --all --all-features --unreferenced reject
+      - name: "Run tests (Windows)"
+        if: ${{ matrix.os == 'windows-latest' }}
+        shell: bash
+        # We can't reject unreferenced snapshots on windows because flake8_executable can't run on windows
+        run: cargo insta test --all --all-features
+      - run: cargo test --package ruff_cli --test black_compatibility_test -- --ignored
+        # TODO: Skipped as it's currently broken. The resource were moved from the
+        # ruff_cli to ruff crate, but this test was not updated.
+        if: false
      # 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
+        if: ${{ matrix.os == 'ubuntu-latest' }}
        with:
          name: ruff
          path: target/debug/ruff

-  cargo-test-windows:
-    runs-on: windows-latest
-    name: "cargo test (windows)"
+  cargo-fuzz:
+    runs-on: ubuntu-latest
+    name: "cargo fuzz"
    steps:
      - uses: actions/checkout@v4
      - name: "Install Rust toolchain"
        run: rustup show
-      - name: "Install cargo insta"
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: "fuzz -> target"
+      - name: "Install cargo-fuzz"
        uses: taiki-e/install-action@v2
        with:
-          tool: cargo-insta
-      - uses: Swatinem/rust-cache@v2
-      - name: "Run tests"
-        shell: bash
-        # We can't reject unreferenced snapshots on windows because flake8_executable can't run on windows
-        run: cargo insta test --all --all-features
+          tool: cargo-fuzz@0.11
+      - run: cargo fuzz build -s none

  cargo-test-wasm:
    runs-on: ubuntu-latest
@@ -144,22 +156,6 @@ jobs:
          cd crates/ruff_wasm
          wasm-pack test --node

-  cargo-fuzz:
-    runs-on: ubuntu-latest
-    name: "cargo fuzz"
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: "fuzz -> target"
-      - name: "Install cargo-fuzz"
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-fuzz@0.11
-      - run: cargo fuzz build -s none
-
  scripts:
    name: "test scripts"
    runs-on: ubuntu-latest
@@ -181,10 +177,10 @@ jobs:
    name: "ecosystem"
    runs-on: ubuntu-latest
    needs:
-      - cargo-test-linux
+      - cargo-test
      - determine_changes
    # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' && needs.determine_changes.outputs.linter == 'true'
    steps:
      - uses: actions/checkout@v4
      - uses: actions/setup-python@v4
@@ -192,48 +188,27 @@ jobs:
          python-version: ${{ env.PYTHON_VERSION }}

      - uses: actions/download-artifact@v3
-        name: Download comparison Ruff binary
+        name: Download Ruff binary
        id: ruff-target
        with:
          name: ruff
          path: target/debug

      - uses: dawidd6/action-download-artifact@v2
-        name: Download baseline Ruff binary
+        name: Download base results
        with:
          name: ruff
          branch: ${{ github.event.pull_request.base.ref }}
          check_artifacts: true

-      - name: Install ruff-ecosystem
-        run: |
-          pip install ./python/ruff-ecosystem
-
-      - name: Run `ruff check` ecosystem check
-        if: ${{ needs.determine_changes.outputs.linter == 'true' }}
+      - name: Run ecosystem check
        run: |
          # Make executable, since artifact download doesn't preserve this
-          chmod +x ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff
+          chmod +x ruff ${{ steps.ruff-target.outputs.download-path }}/ruff

-          ruff-ecosystem check ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff --cache ./checkouts --output-format markdown | tee ecosystem-result-check
+          scripts/check_ecosystem.py ruff ${{ steps.ruff-target.outputs.download-path }}/ruff | tee ecosystem-result
+          cat ecosystem-result > $GITHUB_STEP_SUMMARY

-          cat ecosystem-result-check > $GITHUB_STEP_SUMMARY
-          cat ecosystem-result-check > ecosystem-result
-          echo "" >> ecosystem-result
-
-      - name: Run `ruff format` ecosystem check
-        if: ${{ needs.determine_changes.outputs.formatter == 'true' }}
-        run: |
-          # Make executable, since artifact download doesn't preserve this
-          chmod +x ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff
-
-          ruff-ecosystem format ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff --cache ./checkouts --output-format markdown | tee ecosystem-result-format
-
-          cat ecosystem-result-format > $GITHUB_STEP_SUMMARY
-          cat ecosystem-result-format >> ecosystem-result
-
-      - name: Export pull request number
-        run: |
          echo ${{ github.event.number }} > pr-number

      - uses: actions/upload-artifact@v3
@@ -255,12 +230,12 @@ jobs:
      - uses: actions/checkout@v4
      - name: "Install nightly Rust toolchain"
        # Only pinned to make caching work, update freely
-        run: rustup toolchain install nightly-2023-10-15
+        run: rustup toolchain install nightly-2023-06-08
      - uses: Swatinem/rust-cache@v2
      - name: "Install cargo-udeps"
        uses: taiki-e/install-action@cargo-udeps
      - name: "Run cargo-udeps"
-        run: cargo +nightly-2023-10-15 udeps
+        run: cargo +nightly-2023-06-08 udeps

  python-package:
    name: "python package"
@@ -367,45 +342,6 @@ jobs:
      - name: "Remove checkouts from cache"
        run: rm -r target/progress_projects

-  check-ruff-lsp:
-    name: "test ruff-lsp"
-    runs-on: ubuntu-latest
-    needs: cargo-test-linux
-    steps:
-      - uses: extractions/setup-just@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/checkout@v4
-        name: "Download ruff-lsp source"
-        with:
-          repository: "astral-sh/ruff-lsp"
-
-      - uses: actions/setup-python@v4
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-
-      - uses: actions/download-artifact@v3
-        name: Download development ruff binary
-        id: ruff-target
-        with:
-          name: ruff
-          path: target/debug
-
-      - name: Install ruff-lsp dependencies
-        run: |
-          just install
-
-      - name: Run ruff-lsp tests
-        run: |
-          # Setup development binary
-          pip uninstall --yes ruff
-          chmod +x ${{ steps.ruff-target.outputs.download-path }}/ruff
-          export PATH=${{ steps.ruff-target.outputs.download-path }}:$PATH
-          ruff version
-
-          just test
-
  benchmarks:
    runs-on: ubuntu-latest
    steps:
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -47,7 +47,7 @@ jobs:
        run: mkdocs build --strict -f mkdocs.generated.yml
      - name: "Deploy to Cloudflare Pages"
        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@v3.3.1
+        uses: cloudflare/wrangler-action@v3.1.1
        with:
          apiToken: ${{ secrets.CF_API_TOKEN }}
          accountId: ${{ secrets.CF_ACCOUNT_ID }}
--- a/.github/workflows/playground.yaml
+++ b/.github/workflows/playground.yaml
@@ -40,9 +40,8 @@ jobs:
        working-directory: playground
      - name: "Deploy to Cloudflare Pages"
        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@v3.3.1
+        uses: cloudflare/wrangler-action@v3.1.1
        with:
          apiToken: ${{ secrets.CF_API_TOKEN }}
          accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          # `github.head_ref` is only set during pull requests and for manual runs or tags we use `main` to deploy to production
-          command: pages deploy playground/dist --project-name=ruff-playground --branch ${{ github.head_ref || 'main' }} --commit-hash ${GITHUB_SHA}
+          command: pages deploy playground/dist --project-name=ruff-playground --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}
--- a/.gitignore
+++ b/.gitignore
@@ -208,9 +208,3 @@ cython_debug/
 # VIM
 .*.sw?
 .sw?
-
-# Custom re-inclusions for the resolver test cases
-!crates/ruff_python_resolver/resources/test/airflow/venv/
-!crates/ruff_python_resolver/resources/test/airflow/venv/lib
-!crates/ruff_python_resolver/resources/test/airflow/venv/lib/python3.11/site-packages/_watchdog_fsevents.cpython-311-darwin.so
-!crates/ruff_python_resolver/resources/test/airflow/venv/lib/python3.11/site-packages/orjson/orjson.cpython-311-darwin.so
--- a/.markdownlint.yaml
+++ b/.markdownlint.yaml
@@ -13,8 +13,3 @@ MD041: false

 # MD013/line-length
 MD013: false
-
-# MD024/no-duplicate-heading
-MD024:
-  # Allow when nested under different parents e.g. CHANGELOG.md
-  allow_different_nesting: true
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -23,11 +23,6 @@ repos:
      - id: mdformat
        additional_dependencies:
          - mdformat-mkdocs
-          - mdformat-admon
-        exclude: |
-          (?x)^(
-            docs/formatter/black.md
-          )$

  - repo: https://github.com/igorshubovych/markdownlint-cli
    rev: v0.33.0
--- a/BREAKING_CHANGES.md
+++ b/BREAKING_CHANGES.md
@@ -1,35 +1,5 @@
 # Breaking Changes

-## 0.1.0
-
-### The deprecated `format` setting has been removed
-
-Ruff previously used the `format` setting, `--format` CLI option, and `RUFF_FORMAT` environment variable to
-configure the output format of the CLI. This usage was deprecated in `v0.0.291` — the `format` setting is now used
-to control Ruff's code formatting. As of this release:
-
- The `format` setting cannot be used to configure the output format, use `output-format` instead
- The `RUFF_FORMAT` environment variable is ignored, use `RUFF_OUTPUT_FORMAT` instead
- The `--format` option has been removed from `ruff check`, use `--output-format` instead
-
-### Unsafe fixes are not applied by default ([#7769](https://github.com/astral-sh/ruff/pull/7769))
-
-Ruff labels fixes as "safe" and "unsafe". The meaning and intent of your code will be retained when applying safe
-fixes, but the meaning could be changed when applying unsafe fixes. Previously, unsafe fixes were always displayed
-and applied when fixing was enabled. Now, unsafe fixes are hidden by default and not applied. The `--unsafe-fixes`
-flag or `unsafe-fixes` configuration option can be used to enable unsafe fixes.
-
-See the [docs](https://docs.astral.sh/ruff/configuration/#fix-safety) for details.
-
-### Remove formatter-conflicting rules from the default rule set  ([#7900](https://github.com/astral-sh/ruff/pull/7900))
-
-Previously, Ruff enabled all implemented rules in Pycodestyle (`E`) by default. Ruff now only includes the
-Pycodestyle prefixes `E4`, `E7`, and `E9` to exclude rules that conflict with automatic formatters. Consequently,
-the stable rule set no longer includes `line-too-long` (`E501`) and `mixed-spaces-and-tabs` (`E101`). Other
-excluded Pycodestyle rules include whitespace enforcement in `E1` and `E2`; these rules are currently in preview, and are already omitted by default.
-
-This change only affects those using Ruff under its default rule set. Users that include `E` in their `select` will experience no change in behavior.
-
 ## 0.0.288

 ### Remove support for emoji identifiers ([#7212](https://github.com/astral-sh/ruff/pull/7212))
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,274 +0,0 @@
-# Changelog
-
-## 0.1.3
-
-This release includes a variety of improvements to the Ruff formatter, removing several known and
-unintentional deviations from Black.
-
-### Formatter
-
- Avoid space around pow for `None`, `True` and `False` ([#8189](https://github.com/astral-sh/ruff/pull/8189))
- Avoid sorting all paths in the format command ([#8181](https://github.com/astral-sh/ruff/pull/8181))
- Insert necessary blank line between class and leading comments ([#8224](https://github.com/astral-sh/ruff/pull/8224))
- Avoid introducing new parentheses in annotated assignments ([#8233](https://github.com/astral-sh/ruff/pull/8233))
- Refine the warnings about incompatible linter options ([#8196](https://github.com/astral-sh/ruff/pull/8196))
- Add test and basic implementation for formatter preview mode ([#8044](https://github.com/astral-sh/ruff/pull/8044))
- Refine warning about incompatible `isort` settings ([#8192](https://github.com/astral-sh/ruff/pull/8192))
- Only omit optional parentheses for starting or ending with parentheses ([#8238](https://github.com/astral-sh/ruff/pull/8238))
- Use source type to determine parser mode for formatting ([#8205](https://github.com/astral-sh/ruff/pull/8205))
- Don't warn about magic trailing comma when `isort.force-single-line` is true ([#8244](https://github.com/astral-sh/ruff/pull/8244))
- Use `SourceKind::diff` for formatter ([#8240](https://github.com/astral-sh/ruff/pull/8240))
- Fix `fmt:off` with trailing child comment ([#8234](https://github.com/astral-sh/ruff/pull/8234))
- Formatter parentheses support for `IpyEscapeCommand` ([#8207](https://github.com/astral-sh/ruff/pull/8207))
-
-### Linter
-
- \[`pylint`\] Add buffer methods to `bad-dunder-method-name` (`PLW3201`) exclusions ([#8190](https://github.com/astral-sh/ruff/pull/8190))
- Match rule prefixes from `external` codes setting in `unused-noqa` ([#8177](https://github.com/astral-sh/ruff/pull/8177))
- Use `line-length` setting for isort in lieu of `pycodestyle.max-line-length` ([#8235](https://github.com/astral-sh/ruff/pull/8235))
- Update fix for `unnecessary-paren-on-raise-exception` to unsafe for unknown types ([#8231](https://github.com/astral-sh/ruff/pull/8231))
- Correct quick fix message for `W605` ([#8255](https://github.com/astral-sh/ruff/pull/8255))
-
-### Documentation
-
- Fix typo in max-doc-length documentation ([#8201](https://github.com/astral-sh/ruff/pull/8201))
- Improve documentation around linter-formatter conflicts ([#8257](https://github.com/astral-sh/ruff/pull/8257))
- Fix link to error suppression documentation in `unused-noqa` ([#8172](https://github.com/astral-sh/ruff/pull/8172))
- Add `external` option to `unused-noqa` documentation ([#8171](https://github.com/astral-sh/ruff/pull/8171))
- Add title attribute to icons ([#8060](https://github.com/astral-sh/ruff/pull/8060))
- Clarify unsafe case in RSE102 ([#8256](https://github.com/astral-sh/ruff/pull/8256))
- Fix skipping formatting examples ([#8210](https://github.com/astral-sh/ruff/pull/8210))
- docs: fix name of `magic-trailing-comma` option in README ([#8200](https://github.com/astral-sh/ruff/pull/8200))
- Add note about scope of rule changing in versioning policy ([#8169](https://github.com/astral-sh/ruff/pull/8169))
- Document: Fix default lint rules ([#8218](https://github.com/astral-sh/ruff/pull/8218))
- Fix a wrong setting in configuration.md ([#8186](https://github.com/astral-sh/ruff/pull/8186))
- Fix misspelled TOML headers in the tutorial ([#8209](https://github.com/astral-sh/ruff/pull/8209))
-
-## 0.1.2
-
-This release includes the Beta version of the Ruff formatter — an extremely fast, Black-compatible Python formatter.
-Try it today with `ruff format`! [Check out the blog post](https://astral.sh/blog/the-ruff-formatter) and [read the docs](https://docs.astral.sh/ruff/formatter/).
-
-### Preview features
-
- \[`pylint`\] Implement `non-ascii-module-import` (`C2403`) ([#8056](https://github.com/astral-sh/ruff/pull/8056))
- \[`pylint`\] implement `non-ascii-name` (`C2401`) ([#8038](https://github.com/astral-sh/ruff/pull/8038))
- \[`pylint`\] Implement unnecessary-lambda (W0108) ([#7953](https://github.com/astral-sh/ruff/pull/7953))
- \[`refurb`\] Implement `read-whole-file` (`FURB101`) ([#7682](https://github.com/astral-sh/ruff/pull/7682))
- Add fix for `E223`, `E224`, and `E242` ([#8143](https://github.com/astral-sh/ruff/pull/8143))
- Add fix for `E225`, `E226`, `E227`, and `E228` ([#8136](https://github.com/astral-sh/ruff/pull/8136))
- Add fix for `E252` ([#8142](https://github.com/astral-sh/ruff/pull/8142))
- Add fix for `E261` ([#8114](https://github.com/astral-sh/ruff/pull/8114))
- Add fix for `E273` and `E274` ([#8144](https://github.com/astral-sh/ruff/pull/8144))
- Add fix for `E275` ([#8133](https://github.com/astral-sh/ruff/pull/8133))
- Update `SIM401` to catch ternary operations ([#7415](https://github.com/astral-sh/ruff/pull/7415))
- Update `E721` to allow `is` and `is` not for direct type comparisons ([#7905](https://github.com/astral-sh/ruff/pull/7905))
-
-### Rule changes
-
- Add `backports.strenum` to `deprecated-imports` ([#8113](https://github.com/astral-sh/ruff/pull/8113))
- Update `SIM112` to ignore `https_proxy`, `http_proxy`, and `no_proxy` ([#8140](https://github.com/astral-sh/ruff/pull/8140))
- Update fix for `literal-membership` (`PLR6201`) to be unsafe ([#8097](https://github.com/astral-sh/ruff/pull/8097))
- Update fix for  `mutable-argument-defaults` (`B006`) to be unsafe ([#8108](https://github.com/astral-sh/ruff/pull/8108))
-
-### Formatter
-
- Change `line-ending` default to `auto` ([#8057](https://github.com/astral-sh/ruff/pull/8057))
- Respect parenthesized generators in `has_own_parentheses` ([#8100](https://github.com/astral-sh/ruff/pull/8100))
- Add caching to formatter ([#8089](https://github.com/astral-sh/ruff/pull/8089))
- Remove `--line-length` option from `format` command ([#8131](https://github.com/astral-sh/ruff/pull/8131))
- Add formatter to `line-length` documentation ([#8150](https://github.com/astral-sh/ruff/pull/8150))
- Warn about incompatible formatter options ([#8088](https://github.com/astral-sh/ruff/pull/8088))
- Fix range of unparenthesized tuple subject in match statement ([#8101](https://github.com/astral-sh/ruff/pull/8101))
- Remove experimental formatter warning ([#8148](https://github.com/astral-sh/ruff/pull/8148))
- Don't move type param opening parenthesis comment ([#8163](https://github.com/astral-sh/ruff/pull/8163))
- Update versions in format benchmark script ([#8110](https://github.com/astral-sh/ruff/pull/8110))
- Avoid loading files for cached format results ([#8134](https://github.com/astral-sh/ruff/pull/8134))
-
-### CLI
-
- Show the `ruff format` command in help menus ([#8167](https://github.com/astral-sh/ruff/pull/8167))
- Add `ruff version` command with long version display ([#8034](https://github.com/astral-sh/ruff/pull/8034))
-
-### Configuration
-
- New `pycodestyle.max-line-length` option ([#8039](https://github.com/astral-sh/ruff/pull/8039))
-
-### Bug fixes
-
- Detect `sys.version_info` slices in `outdated-version-block` ([#8112](https://github.com/astral-sh/ruff/pull/8112))
- Avoid if-else simplification for `TYPE_CHECKING` blocks ([#8072](https://github.com/astral-sh/ruff/pull/8072))
- Avoid false-positive print separator diagnostic with starred argument ([#8079](https://github.com/astral-sh/ruff/pull/8079))
-
-### Documentation
-
- Fix message for `too-many-arguments` lint ([#8092](https://github.com/astral-sh/ruff/pull/8092))
- Fix `extend-unsafe-fixes` and `extend-safe-fixes` example ([#8139](https://github.com/astral-sh/ruff/pull/8139))
- Add links to `flake8-import-conventions` options ([#8115](https://github.com/astral-sh/ruff/pull/8115))
- Rework the documentation to incorporate the Ruff formatter ([#7732](https://github.com/astral-sh/ruff/pull/7732))
- Fix `Options` JSON schema description ([#8081](https://github.com/astral-sh/ruff/pull/8081))
- Fix typo (`pytext` -> `pytest`) ([#8117](https://github.com/astral-sh/ruff/pull/8117))
- Improve `magic-value-comparison` example in docs ([#8111](https://github.com/astral-sh/ruff/pull/8111))
-
-## 0.1.1
-
-### Rule changes
-
- Add unsafe fix for `escape-sequence-in-docstring` (`D301`) ([#7970](https://github.com/astral-sh/ruff/pull/7970))
-
-### Configuration
-
- Respect `#(deprecated)` attribute in configuration options ([#8035](https://github.com/astral-sh/ruff/pull/8035))
- Add `[format|lint].exclude` options ([#8000](https://github.com/astral-sh/ruff/pull/8000))
- Respect `tab-size` setting in formatter ([#8006](https://github.com/astral-sh/ruff/pull/8006))
- Add `lint.preview` ([#8002](https://github.com/astral-sh/ruff/pull/8002))
-
-### Preview features
-
- \[`pylint`\] Implement `literal-membership` (`PLR6201`) ([#7973](https://github.com/astral-sh/ruff/pull/7973))
- \[`pylint`\] Implement `too-many-boolean-expressions` (`PLR0916`) ([#7975](https://github.com/astral-sh/ruff/pull/7975))
- \[`pylint`\] Implement `misplaced-bare-raise` (`E0704`) ([#7961](https://github.com/astral-sh/ruff/pull/7961))
- \[`pylint`\] Implement `global-at-module-level` (`W0604`) ([#8058](https://github.com/astral-sh/ruff/pull/8058))
- \[`pylint`\] Implement `unspecified-encoding` (`PLW1514`) ([#7939](https://github.com/astral-sh/ruff/pull/7939))
- Add fix for `triple-single-quotes` (`D300`) ([#7967](https://github.com/astral-sh/ruff/pull/7967))
-
-### Formatter
-
- New code style badge for `ruff format` ([#7878](https://github.com/astral-sh/ruff/pull/7878))
- Fix comments outside expression parentheses ([#7873](https://github.com/astral-sh/ruff/pull/7873))
- Add `--target-version` to `ruff format` ([#8055](https://github.com/astral-sh/ruff/pull/8055))
- Skip over parentheses when detecting `in` keyword ([#8054](https://github.com/astral-sh/ruff/pull/8054))
- Add `--diff` option to `ruff format` ([#7937](https://github.com/astral-sh/ruff/pull/7937))
- Insert newline after nested function or class statements ([#7946](https://github.com/astral-sh/ruff/pull/7946))
- Use `pass` over ellipsis in non-function/class contexts ([#8049](https://github.com/astral-sh/ruff/pull/8049))
-
-### Bug fixes
-
- Lazily evaluate all PEP 695 type alias values ([#8033](https://github.com/astral-sh/ruff/pull/8033))
- Avoid failed assertion when showing fixes from stdin ([#8029](https://github.com/astral-sh/ruff/pull/8029))
- Avoid flagging HTTP and HTTPS literals in urllib-open ([#8046](https://github.com/astral-sh/ruff/pull/8046))
- Avoid flagging `bad-dunder-method-name` for `_` ([#8015](https://github.com/astral-sh/ruff/pull/8015))
- Remove Python 2-only methods from `URLOpen` audit ([#8047](https://github.com/astral-sh/ruff/pull/8047))
- Use set bracket replacement for `iteration-over-set` to preserve whitespace and comments ([#8001](https://github.com/astral-sh/ruff/pull/8001))
-
-### Documentation
-
- Update tutorial to match revised Ruff defaults ([#8066](https://github.com/astral-sh/ruff/pull/8066))
- Update rule `B005` docs ([#8028](https://github.com/astral-sh/ruff/pull/8028))
- Update GitHub actions example in docs to use `--output-format` ([#8014](https://github.com/astral-sh/ruff/pull/8014))
- Document `lint.preview` and `format.preview` ([#8032](https://github.com/astral-sh/ruff/pull/8032))
- Clarify that new rules should be added to `RuleGroup::Preview`. ([#7989](https://github.com/astral-sh/ruff/pull/7989))
-
-## 0.1.0
-
-This is the first release which uses the `CHANGELOG` file. See [GitHub Releases](https://github.com/astral-sh/ruff/releases) for prior changelog entries.
-
-Read Ruff's new [versioning policy](https://docs.astral.sh/ruff/versioning/).
-
-### Breaking changes
-
- Unsafe fixes are no longer displayed or applied without opt-in ([#7769](https://github.com/astral-sh/ruff/pull/7769))
- Drop formatting specific rules from the default set ([#7900](https://github.com/astral-sh/ruff/pull/7900))
- The deprecated `format` setting has been removed ([#7984](https://github.com/astral-sh/ruff/pull/7984))
-    - The `format` setting cannot be used to configure the output format, use `output-format` instead
-    - The `RUFF_FORMAT` environment variable is ignored, use `RUFF_OUTPUT_FORMAT` instead
-    - The `--format` option has been removed from `ruff check`, use `--output-format` instead
-
-### Rule changes
-
- Extend `reimplemented-starmap` (`FURB140`) to catch calls with a single and starred argument ([#7768](https://github.com/astral-sh/ruff/pull/7768))
- Improve cases covered by `RUF015` ([#7848](https://github.com/astral-sh/ruff/pull/7848))
- Update `SIM15` to allow `open` followed by `close` ([#7916](https://github.com/astral-sh/ruff/pull/7916))
- Respect `msgspec.Struct` default-copy semantics in `RUF012` ([#7786](https://github.com/astral-sh/ruff/pull/7786))
- Add `sqlalchemy` methods to \`flake8-boolean-trap\`\` exclusion list ([#7874](https://github.com/astral-sh/ruff/pull/7874))
- Add fix for `PLR1714` ([#7910](https://github.com/astral-sh/ruff/pull/7910))
- Add fix for `PIE804` ([#7884](https://github.com/astral-sh/ruff/pull/7884))
- Add fix for `PLC0208` ([#7887](https://github.com/astral-sh/ruff/pull/7887))
- Add fix for `PYI055` ([#7886](https://github.com/astral-sh/ruff/pull/7886))
- Update `non-pep695-type-alias` to require `--unsafe-fixes` outside of stub files ([#7836](https://github.com/astral-sh/ruff/pull/7836))
- Improve fix message for `UP018` ([#7913](https://github.com/astral-sh/ruff/pull/7913))
- Update `PLW3201` to support `Enum` [sunder names](https://docs.python.org/3/library/enum.html#supported-sunder-names) ([#7987](https://github.com/astral-sh/ruff/pull/7987))
-
-### Preview features
-
- Only show warnings for empty preview selectors when enabling rules ([#7842](https://github.com/astral-sh/ruff/pull/7842))
- Add `unnecessary-key-check` to simplify `key in dct and dct[key]` to `dct.get(key)` ([#7895](https://github.com/astral-sh/ruff/pull/7895))
- Add `assignment-in-assert` to prevent walrus expressions in assert statements ([#7856](https://github.com/astral-sh/ruff/pull/7856))
- \[`refurb`\] Add `single-item-membership-test` (`FURB171`) ([#7815](https://github.com/astral-sh/ruff/pull/7815))
- \[`pylint`\] Add `and-or-ternary` (`R1706`) ([#7811](https://github.com/astral-sh/ruff/pull/7811))
-
-_New rules are added in [preview](https://docs.astral.sh/ruff/preview/)._
-
-### Configuration
-
- Add `unsafe-fixes` setting ([#7769](https://github.com/astral-sh/ruff/pull/7769))
- Add `extend-safe-fixes` and `extend-unsafe-fixes` for promoting and demoting fixes ([#7841](https://github.com/astral-sh/ruff/pull/7841))
-
-### CLI
-
- Added `--unsafe-fixes` option for opt-in to display and apply unsafe fixes ([#7769](https://github.com/astral-sh/ruff/pull/7769))
- Fix use of deprecated `--format` option in warning ([#7837](https://github.com/astral-sh/ruff/pull/7837))
- Show changed files when running under `--check` ([#7788](https://github.com/astral-sh/ruff/pull/7788))
- Write summary messages to stderr when fixing via stdin instead of omitting them ([#7838](https://github.com/astral-sh/ruff/pull/7838))
- Update fix summary message in `check --diff` to include unsafe fix hints ([#7790](https://github.com/astral-sh/ruff/pull/7790))
- Add notebook `cell` field to JSON output format ([#7664](https://github.com/astral-sh/ruff/pull/7664))
- Rename applicability levels to `Safe`, `Unsafe`, and `Display` ([#7843](https://github.com/astral-sh/ruff/pull/7843))
-
-### Bug fixes
-
- Fix bug where f-strings were allowed in match pattern literal ([#7857](https://github.com/astral-sh/ruff/pull/7857))
- Fix `SIM110` with a yield in the condition ([#7801](https://github.com/astral-sh/ruff/pull/7801))
- Preserve trailing comments in `C414` fixes ([#7775](https://github.com/astral-sh/ruff/pull/7775))
- Check sequence type before triggering `unnecessary-enumerate` `len` suggestion ([#7781](https://github.com/astral-sh/ruff/pull/7781))
- Use correct start location for class/function clause header ([#7802](https://github.com/astral-sh/ruff/pull/7802))
- Fix incorrect fixes for `SIM101` ([#7798](https://github.com/astral-sh/ruff/pull/7798))
- Format comment before parameter default correctly ([#7870](https://github.com/astral-sh/ruff/pull/7870))
- Fix `E251` false positive inside f-strings ([#7894](https://github.com/astral-sh/ruff/pull/7894))
- Allow bindings to be created and referenced within annotations ([#7885](https://github.com/astral-sh/ruff/pull/7885))
- Show per-cell diffs when analyzing notebooks over `stdin` ([#7789](https://github.com/astral-sh/ruff/pull/7789))
- Avoid curly brace escape in f-string format spec ([#7780](https://github.com/astral-sh/ruff/pull/7780))
- Fix lexing single-quoted f-string with multi-line format spec ([#7787](https://github.com/astral-sh/ruff/pull/7787))
- Consider nursery rules to be in-preview for `ruff rule` ([#7812](https://github.com/astral-sh/ruff/pull/7812))
- Report precise location for invalid conversion flag ([#7809](https://github.com/astral-sh/ruff/pull/7809))
- Visit pattern match guard as a boolean test ([#7911](https://github.com/astral-sh/ruff/pull/7911))
- Respect `--unfixable` in `ISC` rules ([#7917](https://github.com/astral-sh/ruff/pull/7917))
- Fix edge case with `PIE804` ([#7922](https://github.com/astral-sh/ruff/pull/7922))
- Show custom message in `PTH118` for `Path.joinpath` with starred arguments ([#7852](https://github.com/astral-sh/ruff/pull/7852))
- Fix false negative in `outdated-version-block` when using greater than comparisons ([#7920](https://github.com/astral-sh/ruff/pull/7920))
- Avoid converting f-strings within Django `gettext` calls ([#7898](https://github.com/astral-sh/ruff/pull/7898))
- Fix false positive in `PLR6301` ([#7933](https://github.com/astral-sh/ruff/pull/7933))
- Treat type aliases as typing-only expressions e.g. resolves false positive in `TCH004` ([#7968](https://github.com/astral-sh/ruff/pull/7968))
- Resolve `cache-dir` relative to project root ([#7962](https://github.com/astral-sh/ruff/pull/7962))
- Respect subscripted base classes in type-checking rules e.g. resolves false positive in `TCH003` ([#7954](https://github.com/astral-sh/ruff/pull/7954))
- Fix JSON schema limit for `line-length` ([#7883](https://github.com/astral-sh/ruff/pull/7883))
- Fix commented-out `coalesce` keyword ([#7876](https://github.com/astral-sh/ruff/pull/7876))
-
-### Documentation
-
- Document `reimplemented-starmap` performance effects ([#7846](https://github.com/astral-sh/ruff/pull/7846))
- Default to following the system dark/light mode ([#7888](https://github.com/astral-sh/ruff/pull/7888))
- Add documentation for fixes ([#7901](https://github.com/astral-sh/ruff/pull/7901))
- Fix typo in docs of `PLR6301` ([#7831](https://github.com/astral-sh/ruff/pull/7831))
- Update `UP038` docs to note that it results in slower code ([#7872](https://github.com/astral-sh/ruff/pull/7872))
- crlf -> cr-lf ([#7766](https://github.com/astral-sh/ruff/pull/7766))
- Add an example of an unsafe fix ([#7924](https://github.com/astral-sh/ruff/pull/7924))
- Fix documented examples for `unnecessary-subscript-reversal` ([#7774](https://github.com/astral-sh/ruff/pull/7774))
- Correct error in tuple example in ruff formatter docs ([#7822](https://github.com/astral-sh/ruff/pull/7822))
- Add versioning policy to documentation ([#7923](https://github.com/astral-sh/ruff/pull/7923))
- Fix invalid code in `FURB177` example ([#7832](https://github.com/astral-sh/ruff/pull/7832))
-
-### Formatter
-
- Less scary `ruff format` message ([#7867](https://github.com/astral-sh/ruff/pull/7867))
- Remove spaces from import statements ([#7859](https://github.com/astral-sh/ruff/pull/7859))
- Formatter quoting for f-strings with triple quotes ([#7826](https://github.com/astral-sh/ruff/pull/7826))
- Update `ruff_python_formatter` generate.py comment ([#7850](https://github.com/astral-sh/ruff/pull/7850))
- Document one-call chaining deviation ([#7767](https://github.com/astral-sh/ruff/pull/7767))
- Allow f-string modifications in line-shrinking cases ([#7818](https://github.com/astral-sh/ruff/pull/7818))
- Add trailing comment deviation to README ([#7827](https://github.com/astral-sh/ruff/pull/7827))
- Add trailing zero between dot and exponential ([#7956](https://github.com/astral-sh/ruff/pull/7956))
- Force parentheses for power operations in unary expressions ([#7955](https://github.com/astral-sh/ruff/pull/7955))
-
-### Playground
-
- Fix playground `Quick Fix` action ([#7824](https://github.com/astral-sh/ruff/pull/7824))
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -170,8 +170,7 @@ At a high level, the steps involved in adding a new lint rule are as follows:
    statements, like imports) or `analyze/expression.rs` (if your rule is based on analyzing
    expressions, like function calls).

-1. Map the violation struct to a rule code in `crates/ruff_linter/src/codes.rs` (e.g., `B011`). New rules
-    should be added in `RuleGroup::Preview`.
+1. Map the violation struct to a rule code in `crates/ruff_linter/src/codes.rs` (e.g., `B011`).

 1. Add proper [testing](#rule-testing-fixtures-and-snapshots) for your rule.

@@ -205,7 +204,7 @@ As such, rule names should...
    For example, `AssertFalse` guards against `assert False` statements.

 - _Not_ contain instructions on how to fix the violation, which instead belong in the rule
-    documentation and the `fix_title`.
+    documentation and the `autofix_title`.

 - _Not_ contain a redundant prefix, like `Disallow` or `Banned`, which are already implied by the
    convention.
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,9 +28,9 @@ dependencies = [

 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783"
 dependencies = [
 "memchr",
 ]
@@ -74,9 +74,9 @@ dependencies = [

 [[package]]
 name = "anstream"
-version = "0.6.4"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
+checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@@ -112,9 +112,9 @@ dependencies = [

 [[package]]
 name = "anstyle-wincon"
-version = "3.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
+checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
 dependencies = [
 "anstyle",
 "windows-sys 0.48.0",
@@ -221,7 +221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a"
 dependencies = [
 "memchr",
- "regex-automata 0.3.9",
+ "regex-automata 0.3.8",
 "serde",
 ]

@@ -313,9 +313,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.4.6"
+version = "4.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
+checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -323,9 +323,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.4.6"
+version = "4.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
+checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56"
 dependencies = [
 "anstream",
 "anstyle",
@@ -383,7 +383,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.38",
+ "syn 2.0.37",
 ]

 [[package]]
@@ -407,9 +407,9 @@ dependencies = [

 [[package]]
 name = "codspeed"
-version = "2.3.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d680ccd1eedd2dd7c7a3649a78c7d06e0f16b191b30d81cc58e7bc906488d344"
+checksum = "9b3238416c10f19985b52a937c5b3efc3ed7efe8f7ae263d2aab29a09bca9f57"
 dependencies = [
 "colored",
 "libc",
@@ -418,9 +418,9 @@ dependencies = [

 [[package]]
 name = "codspeed-criterion-compat"
-version = "2.3.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58b48b6c8e890d7d4ad0ed85e9ab4949bf7023198c006000ef6338ba84cf5b71"
+checksum = "fecc18f65b942d2b033545bb3bd8430a23eecbbe53fad3b1342fb0e5514bca7b"
 dependencies = [
 "codspeed",
 "colored",
@@ -608,7 +608,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "strsim",
- "syn 2.0.38",
+ "syn 2.0.37",
 ]

 [[package]]
@@ -619,7 +619,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
 "darling_core",
 "quote",
- "syn 2.0.38",
+ "syn 2.0.37",
 ]

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

 [[package]]
 name = "flake8-to-ruff"
-version = "0.1.3"
+version = "0.0.290"
 dependencies = [
 "anyhow",
 "clap",
@@ -872,15 +872,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "getopts"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
-dependencies = [
- "unicode-width",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.10"
@@ -1044,9 +1035,9 @@ dependencies = [

 [[package]]
 name = "indicatif"
-version = "0.17.7"
+version = "0.17.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
+checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730"
 dependencies = [
 "console",
 "instant",
@@ -1084,9 +1075,9 @@ dependencies = [

 [[package]]
 name = "insta"
-version = "1.34.0"
+version = "1.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc"
+checksum = "a3e02c584f4595792d09509a94cdb92a3cef7592b1eb2d9877ee6f527062d0ea"
 dependencies = [
 "console",
 "globset",
@@ -1129,7 +1120,7 @@ dependencies = [
 "pmutil 0.6.1",
 "proc-macro2",
 "quote",
- "syn 2.0.38",
+ "syn 2.0.37",
 ]

 [[package]]
@@ -1268,9 +1259,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"

 [[package]]
 name = "libcst"
-version = "1.1.0"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd5c2ff400caac657bf794181d885491bb97cc37c376f8cb4fa3a0cc2176a053"
+checksum = "7773d520d4292e200ab1838f2daabe2feed7549f93b0a3c7582160a09e79ffde"
 dependencies = [
 "chic",
 "libcst_derive",
@@ -1283,9 +1274,9 @@ dependencies = [

 [[package]]
 name = "libcst_derive"
-version = "1.1.0"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7f252282b20bfec6fae65d351ab1df7e4552a6270dd7bb779ca9d6135aabe9"
+checksum = "520197c50ba477f258cd7005ec5ed3a7393693ae6bec664990c7c8d9306a7c0d"
 dependencies = [
 "quote",
 "syn 1.0.109",
@@ -1346,9 +1337,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"

 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"

 [[package]]
 name = "memoffset"
@@ -1463,6 +1454,27 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "num-bigint"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.16"
@@ -1593,9 +1605,9 @@ checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739"

 [[package]]
 name = "pep440_rs"
-version = "0.3.12"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "887f66cc62717ea72caac4f1eb4e6f392224da3ffff3f40ec13ab427802746d6"
+checksum = "b05bf2c44c4cd12f03b2c3ca095f3aa21f44e43c16021c332e511884719705be"
 dependencies = [
 "lazy_static",
 "regex",
@@ -1707,7 +1719,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.38",
+ "syn 2.0.37",
 ]

 [[package]]
@@ -1792,9 +1804,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
 dependencies = [
 "unicode-ident",
 ]
@@ -1925,14 +1937,14 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-automata 0.4.3",
- "regex-syntax 0.8.2",
+ "regex-automata 0.3.8",
+ "regex-syntax 0.7.5",
 ]

 [[package]]
@@ -1946,19 +1958,13 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.3.9"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
-
-[[package]]
-name = "regex-automata"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.7.5",
 ]

 [[package]]
@@ -1973,12 +1979,6 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"

-[[package]]
-name = "regex-syntax"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
-
 [[package]]
 name = "result-like"
 version = "0.4.6"
@@ -2051,7 +2051,7 @@ dependencies = [

 [[package]]
 name = "ruff_cli"
-version = "0.1.3"
+version = "0.0.290"
 dependencies = [
 "annotate-snippets 0.9.1",
 "anyhow",
@@ -2155,7 +2155,6 @@ name = "ruff_diagnostics"
 version = "0.0.0"
 dependencies = [
 "anyhow",
- "is-macro",
 "log",
 "ruff_text_size",
 "serde",
@@ -2188,9 +2187,8 @@ dependencies = [

 [[package]]
 name = "ruff_linter"
-version = "0.1.3"
+version = "0.0.290"
 dependencies = [
- "aho-corasick",
 "annotate-snippets 0.9.1",
 "anyhow",
 "bitflags 2.4.0",
@@ -2208,6 +2206,8 @@ dependencies = [
 "log",
 "memchr",
 "natord",
+ "num-bigint",
+ "num-traits",
 "once_cell",
 "path-absolutize",
 "pathdiff",
@@ -2259,7 +2259,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "ruff_python_trivia",
- "syn 2.0.38",
+ "syn 2.0.37",
 ]

 [[package]]
@@ -2290,6 +2290,8 @@ dependencies = [
 "is-macro",
 "itertools 0.11.0",
 "memchr",
+ "num-bigint",
+ "num-traits",
 "once_cell",
 "ruff_python_parser",
 "ruff_python_trivia",
@@ -2320,6 +2322,7 @@ dependencies = [
 "bitflags 2.4.0",
 "clap",
 "countme",
+ "indoc",
 "insta",
 "itertools 0.11.0",
 "memchr",
@@ -2334,7 +2337,6 @@ dependencies = [
 "ruff_source_file",
 "ruff_text_size",
 "rustc-hash",
- "schemars",
 "serde",
 "serde_json",
 "similar",
@@ -2366,6 +2368,7 @@ dependencies = [
 "is-macro",
 "itertools 0.11.0",
 "lexical-parse-float",
+ "num-traits",
 "rand",
 "unic-ucd-category",
 ]
@@ -2375,13 +2378,13 @@ name = "ruff_python_parser"
 version = "0.0.0"
 dependencies = [
 "anyhow",
- "bitflags 2.4.0",
 "insta",
 "is-macro",
 "itertools 0.11.0",
 "lalrpop",
 "lalrpop-util",
- "memchr",
+ "num-bigint",
+ "num-traits",
 "ruff_python_ast",
 "ruff_text_size",
 "rustc-hash",
@@ -2407,6 +2410,7 @@ version = "0.0.0"
 dependencies = [
 "bitflags 2.4.0",
 "is-macro",
+ "num-traits",
 "ruff_index",
 "ruff_python_ast",
 "ruff_python_parser",
@@ -2439,7 +2443,7 @@ dependencies = [

 [[package]]
 name = "ruff_shrinking"
-version = "0.1.3"
+version = "0.1.0"
 dependencies = [
 "anyhow",
 "clap",
@@ -2510,7 +2514,6 @@ dependencies = [
 "glob",
 "globset",
 "ignore",
- "is-macro",
 "itertools 0.11.0",
 "log",
 "once_cell",
@@ -2521,9 +2524,7 @@ dependencies = [
 "ruff_formatter",
 "ruff_linter",
 "ruff_macros",
- "ruff_python_ast",
 "ruff_python_formatter",
- "ruff_source_file",
 "rustc-hash",
 "schemars",
 "serde",
@@ -2570,10 +2571,20 @@ checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
 dependencies = [
 "log",
 "ring",
- "rustls-webpki",
+ "rustls-webpki 0.101.4",
 "sct",
 ]

+[[package]]
+name = "rustls-webpki"
+version = "0.100.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "rustls-webpki"
 version = "0.101.4"
@@ -2659,9 +2670,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"

 [[package]]
 name = "semver"
-version = "1.0.20"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"

 [[package]]
 name = "serde"
@@ -2691,7 +2702,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.38",
+ "syn 2.0.37",
 ]

 [[package]]
@@ -2736,9 +2747,9 @@ dependencies = [

 [[package]]
 name = "serde_with"
-version = "3.4.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
+checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237"
 dependencies = [
 "serde",
 "serde_with_macros",
@@ -2746,14 +2757,14 @@ dependencies = [

 [[package]]
 name = "serde_with_macros"
-version = "3.4.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
+checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c"
 dependencies = [
 "darling",
 "proc-macro2",
 "quote",
- "syn 2.0.38",
+ "syn 2.0.37",
 ]

 [[package]]
@@ -2782,9 +2793,9 @@ checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"

 [[package]]
 name = "similar"
-version = "2.3.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597"
+checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf"

 [[package]]
 name = "siphasher"
@@ -2840,15 +2851,15 @@ dependencies = [

 [[package]]
 name = "strum_macros"
-version = "0.25.3"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
+checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059"
 dependencies = [
 "heck",
 "proc-macro2",
 "quote",
 "rustversion",
- "syn 2.0.38",
+ "syn 2.0.37",
 ]

 [[package]]
@@ -2864,9 +2875,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2953,7 +2964,7 @@ dependencies = [
 "proc-macro-error",
 "proc-macro2",
 "quote",
- "syn 2.0.38",
+ "syn 2.0.37",
 ]

 [[package]]
@@ -2965,28 +2976,28 @@ dependencies = [
 "proc-macro-error",
 "proc-macro2",
 "quote",
- "syn 2.0.38",
+ "syn 2.0.37",
 "test-case-core",
 ]

 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.38",
+ "syn 2.0.37",
 ]

 [[package]]
@@ -3019,22 +3030,6 @@ dependencies = [
 "tikv-jemalloc-sys",
 ]

-[[package]]
-name = "time"
-version = "0.3.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
-dependencies = [
- "serde",
- "time-core",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
-
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -3105,10 +3100,11 @@ dependencies = [

 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
+ "cfg-if",
 "log",
 "pin-project-lite",
 "tracing-attributes",
@@ -3117,20 +3113,20 @@ dependencies = [

 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.38",
+ "syn 2.0.37",
 ]

 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
 dependencies = [
 "once_cell",
 "valuable",
@@ -3260,25 +3256,10 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"

 [[package]]
 name = "unicode_names2"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5506ae2c3c1ccbdf468e52fc5ef536c2ccd981f01273a4cb81aa61021f3a5f"
+version = "0.6.0"
+source = "git+https://github.com/youknowone/unicode_names2.git?rev=4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde#4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde"
 dependencies = [
 "phf",
- "unicode_names2_generator",
-]
-
-[[package]]
-name = "unicode_names2_generator"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6dfc680313e95bc6637fa278cd7a22390c3c2cd7b8b2bd28755bc6c0fc811e7"
-dependencies = [
- "getopts",
- "log",
- "phf_codegen",
- "rand",
- "time",
 ]

 [[package]]
@@ -3289,16 +3270,16 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"

 [[package]]
 name = "ureq"
-version = "2.8.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3"
+checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9"
 dependencies = [
 "base64",
 "flate2",
 "log",
 "once_cell",
 "rustls",
- "rustls-webpki",
+ "rustls-webpki 0.100.2",
 "url",
 "webpki-roots",
 ]
@@ -3341,7 +3322,7 @@ checksum = "f7e1ba1f333bd65ce3c9f27de592fcbc256dafe3af2717f56d7c87761fbaccf4"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.38",
+ "syn 2.0.37",
 ]

 [[package]]
@@ -3435,7 +3416,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.38",
+ "syn 2.0.37",
 "wasm-bindgen-shared",
 ]

@@ -3469,7 +3450,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.38",
+ "syn 2.0.37",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -3516,9 +3497,12 @@ dependencies = [

 [[package]]
 name = "webpki-roots"
-version = "0.25.2"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
+checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338"
+dependencies = [
+ "rustls-webpki 0.100.2",
+]

 [[package]]
 name = "which"
@@ -3533,9 +3517,9 @@ dependencies = [

 [[package]]
 name = "wild"
-version = "2.2.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67"
+checksum = "05b116685a6be0c52f5a103334cbff26db643826c7b3735fc0a3ba9871310a74"
 dependencies = [
 "glob",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,46 +15,49 @@ license = "MIT"
 anyhow = { version = "1.0.69" }
 bitflags = { version = "2.3.1" }
 chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.4", features = ["derive"] }
 colored = { version = "2.0.0" }
 filetime = { version = "0.2.20" }
 glob = { version = "0.3.1" }
 globset = { version = "0.4.10" }
 ignore = { version = "0.4.20" }
-insta = { version = "1.34.0", feature = ["filters", "glob"] }
+insta = { version = "1.32.0", feature = ["filters", "glob"] }
 is-macro = { version = "0.3.0" }
 itertools = { version = "0.11.0" }
-libcst = { version = "1.1.0", default-features = false }
 log = { version = "0.4.17" }
-memchr = { version = "2.6.4" }
+memchr = "2.6.3"
+num-bigint = { version = "0.4.3" }
+num-traits = { version = "0.2.15" }
 once_cell = { version = "1.17.1" }
 path-absolutize = { version = "3.1.1" }
-proc-macro2 = { version = "1.0.69" }
+proc-macro2 = { version = "1.0.67" }
 quote = { version = "1.0.23" }
-regex = { version = "1.10.2" }
+regex = { version = "1.9.5" }
 rustc-hash = { version = "1.1.0" }
 schemars = { version = "0.8.15" }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = { version = "1.0.107" }
 shellexpand = { version = "3.0.0" }
-similar = { version = "2.3.0", features = ["inline"] }
+similar = { version = "2.2.1", features = ["inline"] }
 smallvec = { version = "1.11.1" }
 static_assertions = "1.1.0"
 strum = { version = "0.25.0", features = ["strum_macros"] }
-strum_macros = { version = "0.25.3" }
-syn = { version = "2.0.38" }
+strum_macros = { version = "0.25.2" }
+syn = { version = "2.0.37" }
 test-case = { version = "3.2.1" }
-thiserror = { version = "1.0.50" }
+thiserror = { version = "1.0.48" }
 toml = { version = "0.7.8" }
-tracing = { version = "0.1.40" }
-tracing-indicatif = { version = "0.3.4" }
+tracing = "0.1.37"
+tracing-indicatif = "0.3.4"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-unicode-ident = { version = "1.0.12" }
-unicode_names2 = { version = "1.2.0" }
-unicode-width = { version = "0.1.11" }
+unicode-ident = "1.0.12"
+unicode-width = "0.1.11"
 uuid = { version = "1.4.1", features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
 wsl = { version = "0.1.0" }

+# v1.0.1
+libcst = { version = "0.1.0", default-features = false }
+
 [profile.release]
 lto = "fat"
 codegen-units = 1
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@

 [**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.
+An extremely fast Python linter, written in Rust.

 <p align="center">
  <picture align="center">
@@ -24,15 +24,16 @@ An extremely fast Python linter and code formatter, written in Rust.
  <i>Linting the CPython codebase from scratch.</i>
 </p>

- ⚡️ 10-100x faster than existing linters (like Flake8) and formatters (like Black)
+- ⚡️ 10-100x faster than existing linters
 - 🐍 Installable via `pip`
 - 🛠️ `pyproject.toml` support
- 🤝 Python 3.12 compatibility
- ⚖️ Drop-in parity with [Flake8](https://docs.astral.sh/ruff/faq/#how-does-ruff-compare-to-flake8), isort, and Black
+- 🤝 Python 3.11 compatibility
 - 📦 Built-in caching, to avoid re-analyzing unchanged files
- 🔧 Fix support, for automatic error correction (e.g., automatically remove unused imports)
- 📏 Over [700 built-in rules](https://docs.astral.sh/ruff/rules/), with native re-implementations
-    of popular Flake8 plugins, like flake8-bugbear
+- 🔧 Autofix support, for automatic error correction (e.g., automatically remove unused imports)
+- 📏 Over [600 built-in rules](https://docs.astral.sh/ruff/rules/)
+- ⚖️ [Near-parity](https://docs.astral.sh/ruff/faq/#how-does-ruff-compare-to-flake8) with the
+    built-in Flake8 rule set
+- 🔌 Native re-implementations of dozens of Flake8 plugins, like flake8-bugbear
 - ⌨️ First-party [editor integrations](https://docs.astral.sh/ruff/editor-integrations/) for
    [VS Code](https://github.com/astral-sh/ruff-vscode) and [more](https://github.com/astral-sh/ruff-lsp)
 - 🌎 Monorepo-friendly, with [hierarchical and cascading configuration](https://docs.astral.sh/ruff/configuration/#pyprojecttoml-discovery)
@@ -41,10 +42,10 @@ Ruff aims to be orders of magnitude faster than alternative tools while integrat
 functionality behind a single, common interface.

 Ruff can be used to replace [Flake8](https://pypi.org/project/flake8/) (plus dozens of plugins),
-[Black](https://github.com/psf/black), [isort](https://pypi.org/project/isort/),
-[pydocstyle](https://pypi.org/project/pydocstyle/), [pyupgrade](https://pypi.org/project/pyupgrade/),
-[autoflake](https://pypi.org/project/autoflake/), and more, all while executing tens or hundreds of
-times faster than any individual tool.
+[isort](https://pypi.org/project/isort/), [pydocstyle](https://pypi.org/project/pydocstyle/),
+[yesqa](https://github.com/asottile/yesqa), [eradicate](https://pypi.org/project/eradicate/),
+[pyupgrade](https://pypi.org/project/pyupgrade/), and [autoflake](https://pypi.org/project/autoflake/),
+all while executing tens or hundreds of times faster than any individual tool.

 Ruff is extremely actively developed and used in major open-source projects like:

@@ -125,38 +126,23 @@ and with [a variety of other package managers](https://docs.astral.sh/ruff/insta

 ### Usage

-To run Ruff as a linter, try any of the following:
+To run Ruff, try any of the following:

 ```shell
-ruff check .                        # Lint all files in the current directory (and any subdirectories).
-ruff check path/to/code/            # Lint all files in `/path/to/code` (and any subdirectories).
-ruff check path/to/code/*.py        # Lint all `.py` files in `/path/to/code`.
-ruff check path/to/code/to/file.py  # Lint `file.py`.
-ruff check @arguments.txt           # Lint using an input file, treating its contents as newline-delimited command-line arguments.
+ruff check .                        # Lint all files in the current directory (and any subdirectories)
+ruff check path/to/code/            # Lint all files in `/path/to/code` (and any subdirectories)
+ruff check path/to/code/*.py        # Lint all `.py` files in `/path/to/code`
+ruff check path/to/code/to/file.py  # Lint `file.py`
 ```

-Or, to run Ruff as a formatter:
-
-```shell
-ruff format .                        # Format all files in the current directory (and any subdirectories).
-ruff format path/to/code/            # Format all files in `/path/to/code` (and any subdirectories).
-ruff format path/to/code/*.py        # Format all `.py` files in `/path/to/code`.
-ruff format path/to/code/to/file.py  # Format `file.py`.
-ruff format @arguments.txt           # Format using an input file, treating its contents as newline-delimited command-line arguments.
-```
-
-Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff-pre-commit`](https://github.com/astral-sh/ruff-pre-commit):
+Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:

 ```yaml
-# Run the Ruff linter.
 - repo: https://github.com/astral-sh/ruff-pre-commit
  # Ruff version.
-  rev: v0.1.3
+  rev: v0.0.290
  hooks:
-    # Run the Ruff linter.
    - id: ruff
-    # Run the Ruff formatter.
-    - id: ruff-format
 ```

 Ruff can also be used as a [VS Code extension](https://github.com/astral-sh/ruff-vscode) or
@@ -182,10 +168,18 @@ Ruff can be configured through a `pyproject.toml`, `ruff.toml`, or `.ruff.toml`
 [_Configuration_](https://docs.astral.sh/ruff/configuration/), or [_Settings_](https://docs.astral.sh/ruff/settings/)
 for a complete list of all configuration options).

-If left unspecified, Ruff's default configuration is equivalent to:
+If left unspecified, the default configuration is equivalent to:

 ```toml
 [tool.ruff]
+# Enable pycodestyle (`E`) and Pyflakes (`F`) codes by default.
+select = ["E", "F"]
+ignore = []
+
+# Allow autofix for all enabled rules (when `--fix`) is provided.
+fixable = ["A", "B", "C", "D", "E", "F", "G", "I", "N", "Q", "S", "T", "W", "ANN", "ARG", "BLE", "COM", "DJ", "DTZ", "EM", "ERA", "EXE", "FBT", "ICN", "INP", "ISC", "NPY", "PD", "PGH", "PIE", "PL", "PT", "PTH", "PYI", "RET", "RSE", "RUF", "SIM", "SLF", "TCH", "TID", "TRY", "UP", "YTT"]
+unfixable = []
+
 # Exclude a variety of commonly ignored directories.
 exclude = [
    ".bzr",
@@ -213,57 +207,39 @@ exclude = [

 # Same as Black.
 line-length = 88
-indent-width = 4
-
-# Assume Python 3.8
-target-version = "py38"
-
-[tool.ruff.lint]
-# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.
-select = ["E4", "E7", "E9", "F"]
-ignore = []
-
-# Allow fix for all enabled rules (when `--fix`) is provided.
-fixable = ["ALL"]
-unfixable = []

 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"

-[tool.ruff.format]
-# Like Black, use double quotes for strings.
-quote-style = "double"
+# Assume Python 3.8
+target-version = "py38"

-# Like Black, indent with spaces, rather than tabs.
-indent-style = "space"
-
-# Like Black, respect magic trailing commas.
-skip-magic-trailing-comma = false
-
-# Like Black, automatically detect the appropriate line ending.
-line-ending = "auto"
+[tool.ruff.mccabe]
+# Unlike Flake8, default to a complexity level of 10.
+max-complexity = 10
 ```

 Some configuration options can be provided via the command-line, such as those related to
-rule enablement and disablement, file discovery, and logging level:
+rule enablement and disablement, file discovery, logging level, and more:

 ```shell
 ruff check path/to/code/ --select F401 --select F403 --quiet
 ```

-See `ruff help` for more on Ruff's top-level commands, or `ruff help check` and `ruff help format`
-for more on the linting and formatting commands, respectively.
+See `ruff help` for more on Ruff's top-level commands, or `ruff help check` for more on the
+linting command.

 ## Rules

 <!-- Begin section: Rules -->

-**Ruff supports over 700 lint rules**, many of which are inspired by popular tools like Flake8,
+**Ruff supports over 600 lint rules**, many of which are inspired by popular tools like Flake8,
 isort, pyupgrade, and others. Regardless of the rule's origin, Ruff re-implements every rule in
 Rust as a first-party feature.

-By default, Ruff enables Flake8's `F` rules, along with a subset of the `E` rules, omitting any
-stylistic rules that overlap with the use of a formatter, like `ruff format` or
+By default, Ruff enables Flake8's `E` and `F` rules. Ruff supports all rules from the `F` category,
+and a [subset](https://docs.astral.sh/ruff/rules/#error-e) of the `E` category, omitting those
+stylistic rules made obsolete by the use of an autoformatter, like
 [Black](https://github.com/psf/black).

 If you're just getting started with Ruff, **the default rule set is a great place to start**: it
@@ -355,7 +331,7 @@ In some cases, Ruff includes a "direct" Rust port of the corresponding tool.
 We're grateful to the maintainers of these tools for their work, and for all
 the value they've provided to the Python community.

-Ruff's formatter is built on a fork of Rome's [`rome_formatter`](https://github.com/rome/tools/tree/main/crates/rome_formatter),
+Ruff's autoformatter is built on a fork of Rome's [`rome_formatter`](https://github.com/rome/tools/tree/main/crates/rome_formatter),
 and again draws on both API and implementation details from [Rome](https://github.com/rome/tools),
 [Prettier](https://github.com/prettier/prettier), and [Black](https://github.com/psf/black).

@@ -409,7 +385,6 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [Mypy](https://github.com/python/mypy)
 - Netflix ([Dispatch](https://github.com/Netflix/dispatch))
 - [Neon](https://github.com/neondatabase/neon)
- [NoneBot](https://github.com/nonebot/nonebot2)
 - [ONNX](https://github.com/onnx/onnx)
 - [OpenBB](https://github.com/OpenBB-finance/OpenBBTerminal)
 - [PDM](https://github.com/pdm-project/pdm)
--- a/assets/badge/format.json
+++ b/assets/badge/format.json
@@ -1,8 +0,0 @@
-{
-  "label": "code style",
-  "message": "Ruff",
-  "logoSvg": "<svg width=\"510\" height=\"622\" viewBox=\"0 0 510 622\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M206.701 0C200.964 0 196.314 4.64131 196.314 10.3667V41.4667C196.314 47.192 191.663 51.8333 185.927 51.8333H156.843C151.107 51.8333 146.456 56.4746 146.456 62.2V145.133C146.456 150.859 141.806 155.5 136.069 155.5H106.986C101.249 155.5 96.5988 160.141 96.5988 165.867V222.883C96.5988 228.609 91.9484 233.25 86.2118 233.25H57.1283C51.3917 233.25 46.7413 237.891 46.7413 243.617V300.633C46.7413 306.359 42.0909 311 36.3544 311H10.387C4.6504 311 0 315.641 0 321.367V352.467C0 358.192 4.6504 362.833 10.387 362.833H145.418C151.154 362.833 155.804 367.475 155.804 373.2V430.217C155.804 435.942 151.154 440.583 145.418 440.583H116.334C110.597 440.583 105.947 445.225 105.947 450.95V507.967C105.947 513.692 101.297 518.333 95.5601 518.333H66.4766C60.74 518.333 56.0896 522.975 56.0896 528.7V611.633C56.0896 617.359 60.74 622 66.4766 622H149.572C155.309 622 159.959 617.359 159.959 611.633V570.167H201.507C207.244 570.167 211.894 565.525 211.894 559.8V528.7C211.894 522.975 216.544 518.333 222.281 518.333H251.365C257.101 518.333 261.752 513.692 261.752 507.967V476.867C261.752 471.141 266.402 466.5 272.138 466.5H301.222C306.959 466.5 311.609 461.859 311.609 456.133V425.033C311.609 419.308 316.259 414.667 321.996 414.667H351.079C356.816 414.667 361.466 410.025 361.466 404.3V373.2C361.466 367.475 366.117 362.833 371.853 362.833H400.937C406.673 362.833 411.324 358.192 411.324 352.467V321.367C411.324 315.641 415.974 311 421.711 311H450.794C456.531 311 461.181 306.359 461.181 300.633V217.7C461.181 211.975 456.531 207.333 450.794 207.333H420.672C414.936 207.333 410.285 202.692 410.285 196.967V165.867C410.285 160.141 414.936 155.5 420.672 155.5H449.756C455.492 155.5 460.143 150.859 460.143 145.133V114.033C460.143 108.308 464.793 103.667 470.53 103.667H499.613C505.35 103.667 510 99.0253 510 93.3V10.3667C510 4.64132 505.35 0 499.613 0H206.701ZM168.269 440.583C162.532 440.583 157.882 445.225 157.882 450.95V507.967C157.882 513.692 153.231 518.333 147.495 518.333H118.411C112.675 518.333 108.024 522.975 108.024 528.7V559.8C108.024 565.525 112.675 570.167 118.411 570.167H159.959V528.7C159.959 522.975 164.61 518.333 170.346 518.333H199.43C205.166 518.333 209.817 513.692 209.817 507.967V476.867C209.817 471.141 214.467 466.5 220.204 466.5H249.287C255.024 466.5 259.674 461.859 259.674 456.133V425.033C259.674 419.308 264.325 414.667 270.061 414.667H299.145C304.881 414.667 309.532 410.025 309.532 404.3V373.2C309.532 367.475 314.182 362.833 319.919 362.833H349.002C354.739 362.833 359.389 358.192 359.389 352.467V321.367C359.389 315.641 364.039 311 369.776 311H398.859C404.596 311 409.246 306.359 409.246 300.633V269.533C409.246 263.808 404.596 259.167 398.859 259.167H318.88C313.143 259.167 308.493 254.525 308.493 248.8V217.7C308.493 211.975 313.143 207.333 318.88 207.333H347.963C353.7 207.333 358.35 202.692 358.35 196.967V165.867C358.35 160.141 363.001 155.5 368.737 155.5H397.821C403.557 155.5 408.208 150.859 408.208 145.133V114.033C408.208 108.308 412.858 103.667 418.595 103.667H447.678C453.415 103.667 458.065 99.0253 458.065 93.3V62.2C458.065 56.4746 453.415 51.8333 447.678 51.8333H208.778C203.041 51.8333 198.391 56.4746 198.391 62.2V145.133C198.391 150.859 193.741 155.5 188.004 155.5H158.921C153.184 155.5 148.534 160.141 148.534 165.867V222.883C148.534 228.609 143.883 233.25 138.147 233.25H109.063C103.327 233.25 98.6762 237.891 98.6762 243.617V300.633C98.6762 306.359 103.327 311 109.063 311H197.352C203.089 311 207.739 315.641 207.739 321.367V430.217C207.739 435.942 203.089 440.583 197.352 440.583H168.269Z\" fill=\"#D7FF64\"/></svg>",
-  "logoWidth": 10,
-  "labelColor": "grey",
-  "color": "#261230"
-}
--- a/crates/flake8_to_ruff/Cargo.toml
+++ b/crates/flake8_to_ruff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.1.3"
+version = "0.0.290"
 description = """
 Convert Flake8 configuration files to Ruff configuration files.
 """
@@ -23,7 +23,7 @@ configparser = { version = "3.0.2" }
 itertools = { workspace = true }
 log = { workspace = true }
 once_cell = { workspace = true }
-pep440_rs = { version = "0.3.12", features = ["serde"] }
+pep440_rs = { version = "0.3.1", features = ["serde"] }
 regex = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }
--- a/crates/flake8_to_ruff/src/converter.rs
+++ b/crates/flake8_to_ruff/src/converter.rs
@@ -13,12 +13,11 @@ use ruff_linter::rules::flake8_quotes::settings::Quote;
 use ruff_linter::rules::flake8_tidy_imports::settings::Strictness;
 use ruff_linter::rules::pydocstyle::settings::Convention;
 use ruff_linter::settings::types::PythonVersion;
-use ruff_linter::settings::DEFAULT_SELECTORS;
 use ruff_linter::warn_user;
 use ruff_workspace::options::{
    Flake8AnnotationsOptions, Flake8BugbearOptions, Flake8BuiltinsOptions, Flake8ErrMsgOptions,
-    Flake8PytestStyleOptions, Flake8QuotesOptions, Flake8TidyImportsOptions, LintCommonOptions,
-    LintOptions, McCabeOptions, Options, Pep8NamingOptions, PydocstyleOptions,
+    Flake8PytestStyleOptions, Flake8QuotesOptions, Flake8TidyImportsOptions, McCabeOptions,
+    Options, Pep8NamingOptions, PydocstyleOptions,
 };
 use ruff_workspace::pyproject::Pyproject;

@@ -26,6 +25,11 @@ use super::external_config::ExternalConfig;
 use super::plugin::Plugin;
 use super::{parser, plugin};

+const DEFAULT_SELECTORS: &[RuleSelector] = &[
+    RuleSelector::Linter(Linter::Pyflakes),
+    RuleSelector::Linter(Linter::Pycodestyle),
+];
+
 pub(crate) fn convert(
    config: &HashMap<String, HashMap<String, Option<String>>>,
    external_config: &ExternalConfig,
@@ -99,7 +103,6 @@ pub(crate) fn convert(

    // Parse each supported option.
    let mut options = Options::default();
-    let mut lint_options = LintCommonOptions::default();
    let mut flake8_annotations = Flake8AnnotationsOptions::default();
    let mut flake8_bugbear = Flake8BugbearOptions::default();
    let mut flake8_builtins = Flake8BuiltinsOptions::default();
@@ -147,7 +150,7 @@ pub(crate) fn convert(
                "per-file-ignores" | "per_file_ignores" => {
                    match parser::parse_files_to_codes_mapping(value.as_ref()) {
                        Ok(per_file_ignores) => {
-                            lint_options.per_file_ignores =
+                            options.per_file_ignores =
                                Some(parser::collect_per_file_ignores(per_file_ignores));
                        }
                        Err(e) => {
@@ -355,47 +358,47 @@ pub(crate) fn convert(
    }

    // Deduplicate and sort.
-    lint_options.select = Some(
+    options.select = Some(
        select
            .into_iter()
            .sorted_by_key(RuleSelector::prefix_and_code)
            .collect(),
    );
-    lint_options.ignore = Some(
+    options.ignore = Some(
        ignore
            .into_iter()
            .sorted_by_key(RuleSelector::prefix_and_code)
            .collect(),
    );
    if flake8_annotations != Flake8AnnotationsOptions::default() {
-        lint_options.flake8_annotations = Some(flake8_annotations);
+        options.flake8_annotations = Some(flake8_annotations);
    }
    if flake8_bugbear != Flake8BugbearOptions::default() {
-        lint_options.flake8_bugbear = Some(flake8_bugbear);
+        options.flake8_bugbear = Some(flake8_bugbear);
    }
    if flake8_builtins != Flake8BuiltinsOptions::default() {
-        lint_options.flake8_builtins = Some(flake8_builtins);
+        options.flake8_builtins = Some(flake8_builtins);
    }
    if flake8_errmsg != Flake8ErrMsgOptions::default() {
-        lint_options.flake8_errmsg = Some(flake8_errmsg);
+        options.flake8_errmsg = Some(flake8_errmsg);
    }
    if flake8_pytest_style != Flake8PytestStyleOptions::default() {
-        lint_options.flake8_pytest_style = Some(flake8_pytest_style);
+        options.flake8_pytest_style = Some(flake8_pytest_style);
    }
    if flake8_quotes != Flake8QuotesOptions::default() {
-        lint_options.flake8_quotes = Some(flake8_quotes);
+        options.flake8_quotes = Some(flake8_quotes);
    }
    if flake8_tidy_imports != Flake8TidyImportsOptions::default() {
-        lint_options.flake8_tidy_imports = Some(flake8_tidy_imports);
+        options.flake8_tidy_imports = Some(flake8_tidy_imports);
    }
    if mccabe != McCabeOptions::default() {
-        lint_options.mccabe = Some(mccabe);
+        options.mccabe = Some(mccabe);
    }
    if pep8_naming != Pep8NamingOptions::default() {
-        lint_options.pep8_naming = Some(pep8_naming);
+        options.pep8_naming = Some(pep8_naming);
    }
    if pydocstyle != PydocstyleOptions::default() {
-        lint_options.pydocstyle = Some(pydocstyle);
+        options.pydocstyle = Some(pydocstyle);
    }

    // Extract any settings from the existing `pyproject.toml`.
@@ -433,13 +436,6 @@ pub(crate) fn convert(
        }
    }

-    if lint_options != LintCommonOptions::default() {
-        options.lint = Some(LintOptions {
-            common: lint_options,
-            ..LintOptions::default()
-        });
-    }
-
    // Create the pyproject.toml.
    Pyproject::new(options)
 }
@@ -468,9 +464,7 @@ mod tests {
    use ruff_linter::rules::flake8_quotes;
    use ruff_linter::rules::pydocstyle::settings::Convention;
    use ruff_linter::settings::types::PythonVersion;
-    use ruff_workspace::options::{
-        Flake8QuotesOptions, LintCommonOptions, LintOptions, Options, PydocstyleOptions,
-    };
+    use ruff_workspace::options::{Flake8QuotesOptions, Options, PydocstyleOptions};
    use ruff_workspace::pyproject::Pyproject;

    use crate::converter::DEFAULT_SELECTORS;
@@ -480,8 +474,8 @@ mod tests {
    use super::super::plugin::Plugin;
    use super::convert;

-    fn lint_default_options(plugins: impl IntoIterator<Item = RuleSelector>) -> LintCommonOptions {
-        LintCommonOptions {
+    fn default_options(plugins: impl IntoIterator<Item = RuleSelector>) -> Options {
+        Options {
            ignore: Some(vec![]),
            select: Some(
                DEFAULT_SELECTORS
@@ -491,7 +485,7 @@ mod tests {
                    .sorted_by_key(RuleSelector::prefix_and_code)
                    .collect(),
            ),
-            ..LintCommonOptions::default()
+            ..Options::default()
        }
    }

@@ -502,13 +496,7 @@ mod tests {
            &ExternalConfig::default(),
            None,
        );
-        let expected = Pyproject::new(Options {
-            lint: Some(LintOptions {
-                common: lint_default_options([]),
-                ..LintOptions::default()
-            }),
-            ..Options::default()
-        });
+        let expected = Pyproject::new(default_options([]));
        assert_eq!(actual, expected);
    }

@@ -524,11 +512,7 @@ mod tests {
        );
        let expected = Pyproject::new(Options {
            line_length: Some(LineLength::try_from(100).unwrap()),
-            lint: Some(LintOptions {
-                common: lint_default_options([]),
-                ..LintOptions::default()
-            }),
-            ..Options::default()
+            ..default_options([])
        });
        assert_eq!(actual, expected);
    }
@@ -545,11 +529,7 @@ mod tests {
        );
        let expected = Pyproject::new(Options {
            line_length: Some(LineLength::try_from(100).unwrap()),
-            lint: Some(LintOptions {
-                common: lint_default_options([]),
-                ..LintOptions::default()
-            }),
-            ..Options::default()
+            ..default_options([])
        });
        assert_eq!(actual, expected);
    }
@@ -564,13 +544,7 @@ mod tests {
            &ExternalConfig::default(),
            Some(vec![]),
        );
-        let expected = Pyproject::new(Options {
-            lint: Some(LintOptions {
-                common: lint_default_options([]),
-                ..LintOptions::default()
-            }),
-            ..Options::default()
-        });
+        let expected = Pyproject::new(default_options([]));
        assert_eq!(actual, expected);
    }

@@ -585,19 +559,13 @@ mod tests {
            Some(vec![]),
        );
        let expected = Pyproject::new(Options {
-            lint: Some(LintOptions {
-                common: LintCommonOptions {
-                    flake8_quotes: Some(Flake8QuotesOptions {
-                        inline_quotes: Some(flake8_quotes::settings::Quote::Single),
-                        multiline_quotes: None,
-                        docstring_quotes: None,
-                        avoid_escape: None,
-                    }),
-                    ..lint_default_options([])
-                },
-                ..LintOptions::default()
+            flake8_quotes: Some(Flake8QuotesOptions {
+                inline_quotes: Some(flake8_quotes::settings::Quote::Single),
+                multiline_quotes: None,
+                docstring_quotes: None,
+                avoid_escape: None,
            }),
-            ..Options::default()
+            ..default_options([])
        });
        assert_eq!(actual, expected);
    }
@@ -616,18 +584,12 @@ mod tests {
            Some(vec![Plugin::Flake8Docstrings]),
        );
        let expected = Pyproject::new(Options {
-            lint: Some(LintOptions {
-                common: LintCommonOptions {
-                    pydocstyle: Some(PydocstyleOptions {
-                        convention: Some(Convention::Numpy),
-                        ignore_decorators: None,
-                        property_decorators: None,
-                    }),
-                    ..lint_default_options([Linter::Pydocstyle.into()])
-                },
-                ..LintOptions::default()
+            pydocstyle: Some(PydocstyleOptions {
+                convention: Some(Convention::Numpy),
+                ignore_decorators: None,
+                property_decorators: None,
            }),
-            ..Options::default()
+            ..default_options([Linter::Pydocstyle.into()])
        });
        assert_eq!(actual, expected);
    }
@@ -643,19 +605,13 @@ mod tests {
            None,
        );
        let expected = Pyproject::new(Options {
-            lint: Some(LintOptions {
-                common: LintCommonOptions {
-                    flake8_quotes: Some(Flake8QuotesOptions {
-                        inline_quotes: Some(flake8_quotes::settings::Quote::Single),
-                        multiline_quotes: None,
-                        docstring_quotes: None,
-                        avoid_escape: None,
-                    }),
-                    ..lint_default_options([Linter::Flake8Quotes.into()])
-                },
-                ..LintOptions::default()
+            flake8_quotes: Some(Flake8QuotesOptions {
+                inline_quotes: Some(flake8_quotes::settings::Quote::Single),
+                multiline_quotes: None,
+                docstring_quotes: None,
+                avoid_escape: None,
            }),
-            ..Options::default()
+            ..default_options([Linter::Flake8Quotes.into()])
        });
        assert_eq!(actual, expected);
    }
@@ -674,11 +630,7 @@ mod tests {
        );
        let expected = Pyproject::new(Options {
            target_version: Some(PythonVersion::Py38),
-            lint: Some(LintOptions {
-                common: lint_default_options([]),
-                ..LintOptions::default()
-            }),
-            ..Options::default()
+            ..default_options([])
        });
        assert_eq!(actual, expected);

--- a/crates/flake8_to_ruff/src/parser.rs
+++ b/crates/flake8_to_ruff/src/parser.rs
@@ -184,7 +184,7 @@ pub(crate) fn collect_per_file_ignores(
    for pair in pairs {
        per_file_ignores
            .entry(pair.pattern)
-            .or_default()
+            .or_insert_with(Vec::new)
            .push(pair.prefix);
    }
    per_file_ignores
--- a/crates/flake8_to_ruff/src/plugin.rs
+++ b/crates/flake8_to_ruff/src/plugin.rs
@@ -4,7 +4,7 @@ use std::str::FromStr;

 use anyhow::anyhow;
 use ruff_linter::registry::Linter;
-use ruff_linter::rule_selector::PreviewOptions;
+use ruff_linter::settings::types::PreviewMode;
 use ruff_linter::RuleSelector;

 #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq)]
@@ -332,7 +332,7 @@ pub(crate) fn infer_plugins_from_codes(selectors: &HashSet<RuleSelector>) -> Vec
    .filter(|plugin| {
        for selector in selectors {
            if selector
-                .rules(&PreviewOptions::default())
+                .rules(PreviewMode::Disabled)
                .any(|rule| Linter::from(plugin).rules().any(|r| r == rule))
            {
                return true;
--- a/crates/ruff_benchmark/Cargo.toml
+++ b/crates/ruff_benchmark/Cargo.toml
@@ -35,9 +35,9 @@ once_cell.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 url = "2.3.1"
-ureq = "2.8.0"
+ureq = "2.6.2"
 criterion = { version = "0.5.1", default-features = false }
-codspeed-criterion-compat = { version="2.3.0", default-features = false, optional = true}
+codspeed-criterion-compat = { version="2.2.0", default-features = false, optional = true}

 [dev-dependencies]
 ruff_linter.path = "../ruff_linter"
--- a/crates/ruff_benchmark/benches/formatter.rs
+++ b/crates/ruff_benchmark/benches/formatter.rs
@@ -65,7 +65,7 @@ fn benchmark_formatter(criterion: &mut Criterion) {
                let comment_ranges = comment_ranges.finish();

                // Parse the AST.
-                let module = parse_tokens(tokens, case.code(), Mode::Module, "<filename>")
+                let module = parse_tokens(tokens, Mode::Module, "<filename>")
                    .expect("Input to be a valid python program");

                b.iter(|| {
--- a/crates/ruff_cli/Cargo.toml
+++ b/crates/ruff_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_cli"
-version = "0.1.3"
+version = "0.0.290"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -66,11 +66,11 @@ wild = { version = "2" }
 assert_cmd = { version = "2.0.8" }
 # Avoid writing colored snapshots when running tests from the terminal
 colored = { workspace = true, features = ["no-color"]}
-insta = { workspace = true, features = ["filters", "json"] }
+insta = { workspace = true, features = ["filters"] }
 insta-cmd = { version = "0.4.0" }
 tempfile = "3.6.0"
 test-case = { workspace = true }
-ureq = { version = "2.8.0", features = [] }
+ureq = { version = "2.6.2", features = [] }

 [target.'cfg(target_os = "windows")'.dependencies]
 mimalloc = "0.1.39"
--- a/crates/ruff_cli/build.rs
+++ b/crates/ruff_cli/build.rs
@@ -1,80 +0,0 @@
-use std::{fs, path::Path, process::Command};
-
-fn main() {
-    // The workspace root directory is not available without walking up the tree
-    // https://github.com/rust-lang/cargo/issues/3946
-    let workspace_root = Path::new(&std::env::var("CARGO_MANIFEST_DIR").unwrap())
-        .join("..")
-        .join("..");
-
-    commit_info(&workspace_root);
-
-    #[allow(clippy::disallowed_methods)]
-    let target = std::env::var("TARGET").unwrap();
-    println!("cargo:rustc-env=RUST_HOST_TARGET={target}");
-}
-
-fn commit_info(workspace_root: &Path) {
-    // If not in a git repository, do not attempt to retrieve commit information
-    let git_dir = workspace_root.join(".git");
-    if !git_dir.exists() {
-        return;
-    }
-
-    let git_head_path = git_dir.join("HEAD");
-    println!(
-        "cargo:rerun-if-changed={}",
-        git_head_path.as_path().display()
-    );
-
-    let git_head_contents = fs::read_to_string(git_head_path);
-    if let Ok(git_head_contents) = git_head_contents {
-        // The contents are either a commit or a reference in the following formats
-        // - "<commit>" when the head is detached
-        // - "ref <ref>" when working on a branch
-        // If a commit, checking if the HEAD file has changed is sufficient
-        // If a ref, we need to add the head file for that ref to rebuild on commit
-        let mut git_ref_parts = git_head_contents.split_whitespace();
-        git_ref_parts.next();
-        if let Some(git_ref) = git_ref_parts.next() {
-            let git_ref_path = git_dir.join(git_ref);
-            println!(
-                "cargo:rerun-if-changed={}",
-                git_ref_path.as_path().display()
-            );
-        }
-    }
-
-    let output = match Command::new("git")
-        .arg("log")
-        .arg("-1")
-        .arg("--date=short")
-        .arg("--abbrev=9")
-        .arg("--format=%H %h %cd %(describe)")
-        .output()
-    {
-        Ok(output) if output.status.success() => output,
-        _ => return,
-    };
-    let stdout = String::from_utf8(output.stdout).unwrap();
-    let mut parts = stdout.split_whitespace();
-    let mut next = || parts.next().unwrap();
-    println!("cargo:rustc-env=RUFF_COMMIT_HASH={}", next());
-    println!("cargo:rustc-env=RUFF_COMMIT_SHORT_HASH={}", next());
-    println!("cargo:rustc-env=RUFF_COMMIT_DATE={}", next());
-
-    // Describe can fail for some commits
-    // https://git-scm.com/docs/pretty-formats#Documentation/pretty-formats.txt-emdescribeoptionsem
-    if let Some(describe) = parts.next() {
-        let mut describe_parts = describe.split('-');
-        println!(
-            "cargo:rustc-env=RUFF_LAST_TAG={}",
-            describe_parts.next().unwrap()
-        );
-        // If this is the tagged commit, this component will be missing
-        println!(
-            "cargo:rustc-env=RUFF_LAST_TAG_DISTANCE={}",
-            describe_parts.next().unwrap_or("0")
-        );
-    }
-}
--- a/crates/ruff_cli/resources/test/fixtures/cache_mutable/source.py
+++ b/crates/ruff_cli/resources/test/fixtures/cache_mutable/source.py
@@ -0,0 +1,3 @@
+a = 1
+
+__all__ = list(["a", "b"])
--- a/crates/ruff_cli/resources/test/fixtures/formatted.py
+++ b/crates/ruff_cli/resources/test/fixtures/formatted.py
@@ -1 +0,0 @@
-print("All formatted!")
--- a/crates/ruff_cli/resources/test/fixtures/unformatted.ipynb
+++ b/crates/ruff_cli/resources/test/fixtures/unformatted.ipynb
@@ -1,72 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "98e1dd71-14a2-454d-9be0-061dde560b07",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import numpy\n",
-    "maths = (numpy.arange(100)**2).sum()\n",
-    "stats= numpy.asarray([1,2,3,4]).median()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "83a0b1b8",
-   "metadata": {},
-   "source": [
-    "A markdown cell"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "ae12f012",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# A cell with IPython escape command\n",
-    "def some_function(foo, bar):\n",
-    "    pass\n",
-    "%matplotlib inline"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "10f3bbf9",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "foo = %pwd\n",
-    "def some_function(foo,bar,):\n",
-    "    # Another cell with IPython escape command\n",
-    "    foo = %pwd\n",
-    "    print(foo)"
-   ]
-  }
- ],
- "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.10.12"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
--- a/crates/ruff_cli/resources/test/fixtures/unformatted.py
+++ b/crates/ruff_cli/resources/test/fixtures/unformatted.py
@@ -1,3 +0,0 @@
-x = 1
-y=2
-z = 3
--- a/crates/ruff_cli/src/args.rs
+++ b/crates/ruff_cli/src/args.rs
@@ -9,11 +9,10 @@ use ruff_linter::logging::LogLevel;
 use ruff_linter::registry::Rule;
 use ruff_linter::settings::types::{
    FilePattern, PatternPrefixPair, PerFileIgnore, PreviewMode, PythonVersion, SerializationFormat,
-    UnsafeFixes,
 };
 use ruff_linter::{RuleParser, RuleSelector, RuleSelectorParser};
+use ruff_python_formatter::LspRowColumn;
 use ruff_workspace::configuration::{Configuration, RuleSelection};
-use ruff_workspace::options::PycodestyleOptions;
 use ruff_workspace::resolver::ConfigurationTransformer;

 #[derive(Debug, Parser)]
@@ -67,12 +66,9 @@ pub enum Command {
    #[clap(alias = "--generate-shell-completion", hide = true)]
    GenerateShellCompletion { shell: clap_complete_command::Shell },
    /// Run the Ruff formatter on the given files or directories.
+    #[doc(hidden)]
+    #[clap(hide = true)]
    Format(FormatCommand),
-    /// Display Ruff's version
-    Version {
-        #[arg(long, value_enum, default_value = "text")]
-        output_format: HelpFormat,
-    },
 }

 // The `Parser` derive is for ruff_dev, for ruff_cli `Args` would be sufficient
@@ -81,25 +77,19 @@ pub enum Command {
 pub struct CheckCommand {
    /// List of files or directories to check.
    pub files: Vec<PathBuf>,
-    /// Apply fixes to resolve lint violations.
-    /// Use `--no-fix` to disable or `--unsafe-fixes` to include unsafe fixes.
+    /// Attempt to automatically fix lint violations.
+    /// Use `--no-fix` to disable.
    #[arg(long, overrides_with("no_fix"))]
    fix: bool,
    #[clap(long, overrides_with("fix"), hide = true)]
    no_fix: bool,
-    /// Include fixes that may not retain the original intent of the code.
-    /// Use `--no-unsafe-fixes` to disable.
-    #[arg(long, overrides_with("no_unsafe_fixes"))]
-    unsafe_fixes: bool,
-    #[arg(long, overrides_with("unsafe_fixes"), hide = true)]
-    no_unsafe_fixes: bool,
    /// Show violations with source code.
    /// Use `--no-show-source` to disable.
    #[arg(long, overrides_with("no_show_source"))]
    show_source: bool,
    #[clap(long, overrides_with("show_source"), hide = true)]
    no_show_source: bool,
-    /// Show an enumeration of all fixed lint violations.
+    /// Show an enumeration of all autofixed lint violations.
    /// Use `--no-show-fixes` to disable.
    #[arg(long, overrides_with("no_show_fixes"))]
    show_fixes: bool,
@@ -111,8 +101,8 @@ pub struct CheckCommand {
    /// Run in watch mode by re-running whenever files change.
    #[arg(short, long)]
    pub watch: bool,
-    /// Apply fixes to resolve lint violations, but don't report on leftover violations. Implies `--fix`.
-    /// Use `--no-fix-only` to disable or `--unsafe-fixes` to include unsafe fixes.
+    /// Fix any fixable lint violations, but don't report on leftover violations. Implies `--fix`.
+    /// Use `--no-fix-only` to disable.
    #[arg(long, overrides_with("no_fix_only"))]
    fix_only: bool,
    #[clap(long, overrides_with("fix_only"), hide = true)]
@@ -121,6 +111,16 @@ pub struct CheckCommand {
    #[arg(long)]
    ignore_noqa: bool,

+    /// Output serialization format for violations. (Deprecated: Use `--output-format` instead).
+    #[arg(
+        long,
+        value_enum,
+        env = "RUFF_FORMAT",
+        conflicts_with = "output_format",
+        hide = true
+    )]
+    pub format: Option<SerializationFormat>,
+
    /// Output serialization format for violations.
    #[arg(long, value_enum, env = "RUFF_OUTPUT_FORMAT")]
    pub output_format: Option<SerializationFormat>,
@@ -203,7 +203,7 @@ pub struct CheckCommand {
        help_heading = "File selection"
    )]
    pub extend_exclude: Option<Vec<FilePattern>>,
-    /// List of rule codes to treat as eligible for fix. Only applicable when fix itself is enabled (e.g., via `--fix`).
+    /// List of rule codes to treat as eligible for autofix. Only applicable when autofix itself is enabled (e.g., via `--fix`).
    #[arg(
        long,
        value_delimiter = ',',
@@ -213,7 +213,7 @@ pub struct CheckCommand {
        hide_possible_values = true
    )]
    pub fixable: Option<Vec<RuleSelector>>,
-    /// List of rule codes to treat as ineligible for fix. Only applicable when fix itself is enabled (e.g., via `--fix`).
+    /// List of rule codes to treat as ineligible for autofix. Only applicable when autofix itself is enabled (e.g., via `--fix`).
    #[arg(
        long,
        value_delimiter = ',',
@@ -289,7 +289,7 @@ pub struct CheckCommand {
        conflicts_with = "exit_non_zero_on_fix"
    )]
    pub exit_zero: bool,
-    /// Exit with a non-zero status code if any files were modified via fix, even if no lint violations remain.
+    /// Exit with a non-zero status code if any files were modified via autofix, even if no lint violations remain.
    #[arg(long, help_heading = "Miscellaneous", conflicts_with = "exit_zero")]
    pub exit_non_zero_on_fix: bool,
    /// Show counts for every rule with at least one violation.
@@ -357,21 +357,9 @@ pub struct FormatCommand {
    /// files would have been modified, and zero otherwise.
    #[arg(long)]
    pub check: bool,
-    /// Avoid writing any formatted files back; instead, exit with a non-zero status code and the
-    /// 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, help_heading = "Miscellaneous")]
-    pub no_cache: bool,
-    /// Path to the cache directory.
-    #[arg(long, env = "RUFF_CACHE_DIR", help_heading = "Miscellaneous")]
-    pub cache_dir: Option<PathBuf>,
-
    /// Respect file exclusions via `.gitignore` and other standard ignore files.
    /// Use `--no-respect-gitignore` to disable.
    #[arg(
@@ -382,15 +370,6 @@ pub struct FormatCommand {
    respect_gitignore: bool,
    #[clap(long, overrides_with("respect_gitignore"), hide = true)]
    no_respect_gitignore: bool,
-    /// List of paths, used to omit files and/or directories from analysis.
-    #[arg(
-        long,
-        value_delimiter = ',',
-        value_name = "FILE_PATTERN",
-        help_heading = "File selection"
-    )]
-    pub exclude: Option<Vec<FilePattern>>,
-
    /// Enforce exclusions, even for paths passed to Ruff directly on the command-line.
    /// Use `--no-force-exclude` to disable.
    #[arg(
@@ -401,21 +380,30 @@ pub struct FormatCommand {
    force_exclude: bool,
    #[clap(long, overrides_with("force_exclude"), hide = true)]
    no_force_exclude: bool,
+    /// Set the line-length.
+    #[arg(long, help_heading = "Rule configuration", hide = true)]
+    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>,
-    /// The minimum Python version that should be supported.
-    #[arg(long, value_enum)]
-    pub target_version: Option<PythonVersion>,
-    /// Enable preview mode; enables unstable formatting.
+
+    /// Enable preview mode; checks will include unstable rules and fixes.
    /// Use `--no-preview` to disable.
-    #[arg(long, overrides_with("no_preview"))]
+    #[arg(long, overrides_with("no_preview"), hide = true)]
    preview: bool,
    #[clap(long, overrides_with("preview"), hide = true)]
    no_preview: bool,
+    /// Range formatting start: Zero-indexed row and zero-indexed char-based column separated by
+    /// colon, e.g. `1:2`
+    #[clap(long)]
+    pub start: Option<LspRowColumn>,
+    /// Range formatting end: Zero-indexed row and zero-indexed char-based column separated by
+    /// colon, e.g. `3:4`
+    #[clap(long)]
+    pub end: Option<LspRowColumn>,
 }

 #[derive(Debug, Clone, Copy, clap::ValueEnum)]
@@ -518,10 +506,8 @@ impl CheckCommand {
                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: self.output_format,
+                output_format: self.output_format.or(self.format),
                show_fixes: resolve_bool_arg(self.show_fixes, self.no_show_fixes),
            },
        )
@@ -535,24 +521,21 @@ impl FormatCommand {
        (
            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,
+                start: self.start,
+                end: self.end,
            },
            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,
-
                // Unsupported on the formatter CLI, but required on `Overrides`.
                ..CliOverrides::default()
            },
@@ -596,12 +579,12 @@ pub struct CheckArguments {
 #[allow(clippy::struct_excessive_bools)]
 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 start: Option<LspRowColumn>,
+    pub end: Option<LspRowColumn>,
 }

 /// CLI settings that function as configuration overrides.
@@ -629,7 +612,6 @@ pub struct CliOverrides {
    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>,
@@ -641,7 +623,7 @@ impl ConfigurationTransformer for CliOverrides {
            config.cache_dir = Some(cache_dir.clone());
        }
        if let Some(dummy_variable_rgx) = &self.dummy_variable_rgx {
-            config.lint.dummy_variable_rgx = Some(dummy_variable_rgx.clone());
+            config.dummy_variable_rgx = Some(dummy_variable_rgx.clone());
        }
        if let Some(exclude) = &self.exclude {
            config.exclude = Some(exclude.clone());
@@ -655,10 +637,7 @@ impl ConfigurationTransformer for CliOverrides {
        if let Some(fix_only) = &self.fix_only {
            config.fix_only = Some(*fix_only);
        }
-        if self.unsafe_fixes.is_some() {
-            config.unsafe_fixes = self.unsafe_fixes;
-        }
-        config.lint.rule_selections.push(RuleSelection {
+        config.rule_selections.push(RuleSelection {
            select: self.select.clone(),
            ignore: self
                .ignore
@@ -684,20 +663,14 @@ impl ConfigurationTransformer for CliOverrides {
        if let Some(force_exclude) = &self.force_exclude {
            config.force_exclude = Some(*force_exclude);
        }
-        if let Some(line_length) = self.line_length {
-            config.line_length = Some(line_length);
-            config.lint.pycodestyle = Some(PycodestyleOptions {
-                max_line_length: Some(line_length),
-                ..config.lint.pycodestyle.unwrap_or_default()
-            });
+        if let Some(line_length) = &self.line_length {
+            config.line_length = Some(*line_length);
        }
        if let Some(preview) = &self.preview {
            config.preview = Some(*preview);
-            config.lint.preview = Some(*preview);
-            config.format.preview = Some(*preview);
        }
        if let Some(per_file_ignores) = &self.per_file_ignores {
-            config.lint.per_file_ignores = Some(collect_per_file_ignores(per_file_ignores.clone()));
+            config.per_file_ignores = Some(collect_per_file_ignores(per_file_ignores.clone()));
        }
        if let Some(respect_gitignore) = &self.respect_gitignore {
            config.respect_gitignore = Some(*respect_gitignore);
@@ -722,7 +695,7 @@ pub fn collect_per_file_ignores(pairs: Vec<PatternPrefixPair>) -> Vec<PerFileIgn
    for pair in pairs {
        per_file_ignores
            .entry(pair.pattern)
-            .or_default()
+            .or_insert_with(Vec::new)
            .push(pair.prefix);
    }
    per_file_ignores
--- a/crates/ruff_cli/src/cache.rs
+++ b/crates/ruff_cli/src/cache.rs
@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::fmt::Debug;
 use std::fs::{self, File};
 use std::hash::Hasher;
 use std::io::{self, BufReader, BufWriter, Write};
@@ -9,11 +8,6 @@ use std::sync::Mutex;
 use std::time::{Duration, SystemTime};

 use anyhow::{Context, Result};
-use filetime::FileTime;
-use itertools::Itertools;
-use log::{debug, error};
-use rayon::iter::ParallelIterator;
-use rayon::iter::{IntoParallelIterator, ParallelBridge};
 use rustc_hash::FxHashMap;
 use serde::{Deserialize, Serialize};

@@ -21,50 +15,22 @@ use ruff_cache::{CacheKey, CacheKeyHasher};
 use ruff_diagnostics::{DiagnosticKind, Fix};
 use ruff_linter::message::Message;
 use ruff_linter::warn_user;
-use ruff_macros::CacheKey;
 use ruff_notebook::NotebookIndex;
 use ruff_python_ast::imports::ImportMap;
 use ruff_source_file::SourceFileBuilder;
 use ruff_text_size::{TextRange, TextSize};
-use ruff_workspace::resolver::{PyprojectConfig, PyprojectDiscoveryStrategy, Resolver};
 use ruff_workspace::Settings;

-use crate::cache;
 use crate::diagnostics::Diagnostics;

+/// Maximum duration for which we keep a file in cache that hasn't been seen.
+const MAX_LAST_SEEN: Duration = Duration::from_secs(30 * 24 * 60 * 60); // 30 days.
+
 /// [`Path`] that is relative to the package root in [`PackageCache`].
 pub(crate) type RelativePath = Path;
 /// [`PathBuf`] that is relative to the package root in [`PackageCache`].
 pub(crate) type RelativePathBuf = PathBuf;

-#[derive(CacheKey)]
-pub(crate) struct FileCacheKey {
-    /// Timestamp when the file was last modified before the (cached) check.
-    file_last_modified: FileTime,
-    /// Permissions of the file before the (cached) check.
-    file_permissions_mode: u32,
-}
-
-impl FileCacheKey {
-    pub(crate) fn from_path(path: &Path) -> io::Result<FileCacheKey> {
-        // Construct a cache key for the file
-        let metadata = path.metadata()?;
-
-        #[cfg(unix)]
-        let permissions = {
-            use std::os::unix::fs::PermissionsExt;
-            metadata.permissions().mode()
-        };
-        #[cfg(windows)]
-        let permissions: u32 = metadata.permissions().readonly().into();
-
-        Ok(FileCacheKey {
-            file_last_modified: FileTime::from_last_modification_time(&metadata),
-            file_permissions_mode: permissions,
-        })
-    }
-}
-
 /// Cache.
 ///
 /// `Cache` holds everything required to display the diagnostics for a single
@@ -84,7 +50,7 @@ pub(crate) struct Cache {
    /// Files that are linted, but are not in `package.files` or are in
    /// `package.files` but are outdated. This gets merged with `package.files`
    /// when the cache is written back to disk in [`Cache::store`].
-    changes: Mutex<Vec<Change>>,
+    new_files: Mutex<HashMap<RelativePathBuf, FileCache>>,
    /// The "current" timestamp used as cache for the updates of
    /// [`FileCache::last_seen`]
    last_seen_cache: u64,
@@ -99,7 +65,7 @@ impl Cache {
    ///
    /// Finally `settings` is used to ensure we don't open a cache for different
    /// settings. It also defines the directory where to store the cache.
-    pub(crate) fn open(package_root: PathBuf, settings: &Settings) -> Self {
+    pub(crate) fn open(package_root: PathBuf, settings: &Settings) -> Cache {
        debug_assert!(package_root.is_absolute(), "package root not canonicalized");

        let mut buf = itoa::Buffer::new();
@@ -139,7 +105,7 @@ impl Cache {
    }

    /// Create an empty `Cache`.
-    fn empty(path: PathBuf, package_root: PathBuf) -> Self {
+    fn empty(path: PathBuf, package_root: PathBuf) -> Cache {
        let package = PackageCache {
            package_root,
            files: HashMap::new(),
@@ -148,47 +114,27 @@ impl Cache {
    }

    #[allow(clippy::cast_possible_truncation)]
-    fn new(path: PathBuf, package: PackageCache) -> Self {
+    fn new(path: PathBuf, package: PackageCache) -> Cache {
        Cache {
            path,
            package,
-            changes: Mutex::new(Vec::new()),
+            new_files: Mutex::new(HashMap::new()),
            // SAFETY: this will be truncated to the year ~2554 (so don't use
            // this code after that!).
            last_seen_cache: SystemTime::UNIX_EPOCH.elapsed().unwrap().as_millis() as u64,
        }
    }

-    /// Applies the pending changes and persists the cache to disk, if it has been changed.
-    pub(crate) fn persist(mut self) -> Result<()> {
-        if !self.save() {
+    /// Store the cache to disk, if it has been changed.
+    #[allow(clippy::cast_possible_truncation)]
+    pub(crate) fn store(mut self) -> Result<()> {
+        let new_files = self.new_files.into_inner().unwrap();
+        if new_files.is_empty() {
            // No changes made, no need to write the same cache file back to
            // disk.
            return Ok(());
        }

-        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 serialise cache to file '{}'",
-                self.path.display()
-            )
-        })
-    }
-
-    /// Applies the pending changes without storing the cache to disk.
-    #[allow(clippy::cast_possible_truncation)]
-    pub(crate) fn save(&mut self) -> bool {
-        /// Maximum duration for which we keep a file in cache that hasn't been seen.
-        const MAX_LAST_SEEN: Duration = Duration::from_secs(30 * 24 * 60 * 60); // 30 days.
-
-        let changes = std::mem::take(self.changes.get_mut().unwrap());
-        if changes.is_empty() {
-            return false;
-        }
-
        // Remove cached files that we haven't seen in a while.
        let now = self.last_seen_cache;
        self.package.files.retain(|_, file| {
@@ -197,32 +143,17 @@ impl Cache {
        });

        // Apply any changes made and keep track of when we last saw files.
-        for change in changes {
-            let entry = self
-                .package
-                .files
-                .entry(change.path)
-                .and_modify(|existing| {
-                    if existing.key != change.new_key {
-                        // Reset the data if the key change.
-                        existing.data = FileCacheData::default();
-                    }
+        self.package.files.extend(new_files);

-                    existing.key = change.new_key;
-                    existing
-                        .last_seen
-                        .store(self.last_seen_cache, Ordering::Relaxed);
-                })
-                .or_insert_with(|| FileCache {
-                    key: change.new_key,
-                    last_seen: AtomicU64::new(self.last_seen_cache),
-                    data: FileCacheData::default(),
-                });
-
-            change.new_data.apply(&mut entry.data);
-        }
-
-        true
+        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 serialise cache to file '{}'",
+                self.path.display()
+            )
+        })
    }

    /// Returns the relative path based on `path` and the package root.
@@ -238,7 +169,7 @@ impl Cache {
    ///
    /// This returns `None` if `key` differs from the cached key or if the
    /// cache doesn't contain results for the file.
-    pub(crate) fn get(&self, path: &RelativePath, key: &FileCacheKey) -> Option<&FileCache> {
+    pub(crate) fn get<T: CacheKey>(&self, path: &RelativePath, key: &T) -> Option<&FileCache> {
        let file = self.package.files.get(path)?;

        let mut hasher = CacheKeyHasher::new();
@@ -254,34 +185,50 @@ impl Cache {
        Some(file)
    }

-    pub(crate) fn is_formatted(&self, path: &RelativePath, key: &FileCacheKey) -> bool {
-        self.get(path, key)
-            .is_some_and(|entry| entry.data.formatted)
-    }
-
    /// Add or update a file cache at `path` relative to the package root.
-    fn update(&self, path: RelativePathBuf, key: &FileCacheKey, data: ChangeData) {
+    pub(crate) fn update<T: CacheKey>(
+        &self,
+        path: RelativePathBuf,
+        key: T,
+        messages: &[Message],
+        imports: &ImportMap,
+        notebook_index: Option<&NotebookIndex>,
+    ) {
+        let source = if let Some(msg) = messages.first() {
+            msg.file.source_text().to_owned()
+        } else {
+            String::new() // No messages, no need to keep the source!
+        };
+
+        let messages = messages
+            .iter()
+            .map(|msg| {
+                // Make sure that all message use the same source file.
+                assert!(
+                    msg.file == messages.first().unwrap().file,
+                    "message uses a different source file"
+                );
+                CacheMessage {
+                    kind: msg.kind.clone(),
+                    range: msg.range,
+                    fix: msg.fix.clone(),
+                    noqa_offset: msg.noqa_offset,
+                }
+            })
+            .collect();
+
        let mut hasher = CacheKeyHasher::new();
        key.cache_key(&mut hasher);

-        self.changes.lock().unwrap().push(Change {
-            path,
-            new_key: hasher.finish(),
-            new_data: data,
-        });
-    }
-
-    pub(crate) fn update_lint(
-        &self,
-        path: RelativePathBuf,
-        key: &FileCacheKey,
-        data: LintCacheData,
-    ) {
-        self.update(path, key, ChangeData::Lint(data));
-    }
-
-    pub(crate) fn set_formatted(&self, path: RelativePathBuf, key: &FileCacheKey) {
-        self.update(path, key, ChangeData::Formatted);
+        let file = FileCache {
+            key: hasher.finish(),
+            last_seen: AtomicU64::new(self.last_seen_cache),
+            imports: imports.clone(),
+            messages,
+            source,
+            notebook_index: notebook_index.cloned(),
+        };
+        self.new_files.lock().unwrap().insert(path, file);
    }
 }

@@ -307,43 +254,55 @@ pub(crate) struct FileCache {
    /// Represented as the number of milliseconds since Unix epoch. This will
    /// break in 1970 + ~584 years (~2554).
    last_seen: AtomicU64,
-
-    data: FileCacheData,
+    /// Imports made.
+    imports: ImportMap,
+    /// Diagnostic messages.
+    messages: Vec<CacheMessage>,
+    /// Source code of the file.
+    ///
+    /// # Notes
+    ///
+    /// This will be empty if `messages` is empty.
+    source: String,
+    /// Notebook index if this file is a Jupyter Notebook.
+    notebook_index: Option<NotebookIndex>,
 }

 impl FileCache {
    /// Convert the file cache into `Diagnostics`, using `path` as file name.
-    pub(crate) fn to_diagnostics(&self, path: &Path) -> Option<Diagnostics> {
-        self.data.lint.as_ref().map(|lint| {
-            let messages = if lint.messages.is_empty() {
-                Vec::new()
-            } else {
-                let file = SourceFileBuilder::new(path.to_string_lossy(), &*lint.source).finish();
-                lint.messages
-                    .iter()
-                    .map(|msg| Message {
-                        kind: msg.kind.clone(),
-                        range: msg.range,
-                        fix: msg.fix.clone(),
-                        file: file.clone(),
-                        noqa_offset: msg.noqa_offset,
-                    })
-                    .collect()
-            };
-            let notebook_indexes = if let Some(notebook_index) = lint.notebook_index.as_ref() {
-                FxHashMap::from_iter([(path.to_string_lossy().to_string(), notebook_index.clone())])
-            } else {
-                FxHashMap::default()
-            };
-            Diagnostics::new(messages, lint.imports.clone(), notebook_indexes)
-        })
+    pub(crate) fn as_diagnostics(&self, path: &Path) -> Diagnostics {
+        let messages = if self.messages.is_empty() {
+            Vec::new()
+        } else {
+            let file = SourceFileBuilder::new(path.to_string_lossy(), &*self.source).finish();
+            self.messages
+                .iter()
+                .map(|msg| Message {
+                    kind: msg.kind.clone(),
+                    range: msg.range,
+                    fix: msg.fix.clone(),
+                    file: file.clone(),
+                    noqa_offset: msg.noqa_offset,
+                })
+                .collect()
+        };
+        let notebook_indexes = if let Some(notebook_index) = self.notebook_index.as_ref() {
+            FxHashMap::from_iter([(path.to_string_lossy().to_string(), notebook_index.clone())])
+        } else {
+            FxHashMap::default()
+        };
+        Diagnostics::new(messages, self.imports.clone(), notebook_indexes)
    }
 }

-#[derive(Debug, Default, Deserialize, Serialize)]
-struct FileCacheData {
-    lint: Option<LintCacheData>,
-    formatted: bool,
+/// On disk representation of a diagnostic message.
+#[derive(Deserialize, Debug, Serialize)]
+struct CacheMessage {
+    kind: DiagnosticKind,
+    /// Range into the message's [`FileCache::source`].
+    range: TextRange,
+    fix: Option<Fix>,
+    noqa_offset: TextSize,
 }

 /// Returns a hash key based on the `package_root`, `settings` and the crate
@@ -376,209 +335,32 @@ pub(crate) fn init(path: &Path) -> Result<()> {
    Ok(())
 }

-#[derive(Deserialize, Debug, Serialize, PartialEq)]
-pub(crate) struct LintCacheData {
-    /// Imports made.
-    pub(super) imports: ImportMap,
-    /// Diagnostic messages.
-    pub(super) messages: Vec<CacheMessage>,
-    /// Source code of the file.
-    ///
-    /// # Notes
-    ///
-    /// This will be empty if `messages` is empty.
-    pub(super) source: String,
-    /// Notebook index if this file is a Jupyter Notebook.
-    pub(super) notebook_index: Option<NotebookIndex>,
-}
-
-impl LintCacheData {
-    pub(crate) fn from_messages(
-        messages: &[Message],
-        imports: ImportMap,
-        notebook_index: Option<NotebookIndex>,
-    ) -> Self {
-        let source = if let Some(msg) = messages.first() {
-            msg.file.source_text().to_owned()
-        } else {
-            String::new() // No messages, no need to keep the source!
-        };
-
-        let messages = messages
-            .iter()
-            .map(|msg| {
-                // Make sure that all message use the same source file.
-                assert_eq!(
-                    msg.file,
-                    messages.first().unwrap().file,
-                    "message uses a different source file"
-                );
-                CacheMessage {
-                    kind: msg.kind.clone(),
-                    range: msg.range,
-                    fix: msg.fix.clone(),
-                    noqa_offset: msg.noqa_offset,
-                }
-            })
-            .collect();
-
-        Self {
-            imports,
-            messages,
-            source,
-            notebook_index,
-        }
-    }
-}
-
-/// On disk representation of a diagnostic message.
-#[derive(Deserialize, Debug, Serialize, PartialEq)]
-pub(super) struct CacheMessage {
-    kind: DiagnosticKind,
-    /// Range into the message's [`FileCache::source`].
-    range: TextRange,
-    fix: Option<Fix>,
-    noqa_offset: TextSize,
-}
-
-pub(crate) trait PackageCaches {
-    fn get(&self, package_root: &Path) -> Option<&Cache>;
-
-    fn persist(self) -> anyhow::Result<()>;
-}
-
-impl<T> PackageCaches for Option<T>
-where
-    T: PackageCaches,
-{
-    fn get(&self, package_root: &Path) -> Option<&Cache> {
-        match self {
-            None => None,
-            Some(caches) => caches.get(package_root),
-        }
-    }
-
-    fn persist(self) -> Result<()> {
-        match self {
-            None => Ok(()),
-            Some(caches) => caches.persist(),
-        }
-    }
-}
-
-pub(crate) struct PackageCacheMap<'a>(FxHashMap<&'a Path, Cache>);
-
-impl<'a> PackageCacheMap<'a> {
-    pub(crate) fn init(
-        pyproject_config: &PyprojectConfig,
-        package_roots: &FxHashMap<&'a Path, Option<&'a Path>>,
-        resolver: &Resolver,
-    ) -> Self {
-        fn init_cache(path: &Path) {
-            if let Err(e) = cache::init(path) {
-                error!("Failed to initialize cache at {}: {e:?}", path.display());
-            }
-        }
-
-        match pyproject_config.strategy {
-            PyprojectDiscoveryStrategy::Fixed => {
-                init_cache(&pyproject_config.settings.cache_dir);
-            }
-            PyprojectDiscoveryStrategy::Hierarchical => {
-                for settings in
-                    std::iter::once(&pyproject_config.settings).chain(resolver.settings())
-                {
-                    init_cache(&settings.cache_dir);
-                }
-            }
-        }
-
-        Self(
-            package_roots
-                .iter()
-                .map(|(package, package_root)| package_root.unwrap_or(package))
-                .unique()
-                .par_bridge()
-                .map(|cache_root| {
-                    let settings = resolver.resolve(cache_root, pyproject_config);
-                    let cache = Cache::open(cache_root.to_path_buf(), settings);
-                    (cache_root, cache)
-                })
-                .collect(),
-        )
-    }
-}
-
-impl PackageCaches for PackageCacheMap<'_> {
-    fn get(&self, package_root: &Path) -> Option<&Cache> {
-        let cache = self.0.get(package_root);
-
-        if cache.is_none() {
-            debug!("No cache found for {}", package_root.display());
-        }
-
-        cache
-    }
-
-    fn persist(self) -> Result<()> {
-        self.0
-            .into_par_iter()
-            .try_for_each(|(_, cache)| cache.persist())
-    }
-}
-
-#[derive(Debug)]
-struct Change {
-    path: PathBuf,
-    new_key: u64,
-    new_data: ChangeData,
-}
-
-#[derive(Debug)]
-enum ChangeData {
-    Lint(LintCacheData),
-    Formatted,
-}
-
-impl ChangeData {
-    fn apply(self, data: &mut FileCacheData) {
-        match self {
-            ChangeData::Lint(new_lint) => {
-                data.lint = Some(new_lint);
-            }
-            ChangeData::Formatted => {
-                data.formatted = true;
-            }
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
+    use filetime::{set_file_mtime, FileTime};
    use std::env::temp_dir;
    use std::fs;
    use std::io;
    use std::io::Write;
    use std::path::{Path, PathBuf};
-    use std::sync::atomic::AtomicU64;
    use std::time::SystemTime;

-    use anyhow::Result;
-    use filetime::{set_file_mtime, FileTime};
    use itertools::Itertools;
-    use test_case::test_case;
-
    use ruff_cache::CACHE_DIR_NAME;
    use ruff_linter::settings::flags;
-    use ruff_linter::settings::types::UnsafeFixes;
-    use ruff_python_ast::PySourceType;
-    use ruff_workspace::Settings;

-    use crate::cache::{self, FileCache, FileCacheData, FileCacheKey};
-    use crate::cache::{Cache, RelativePathBuf};
-    use crate::commands::format::{format_path, FormatCommandError, FormatMode, FormatResult};
+    use crate::cache::RelativePathBuf;
+    use crate::cache::{self, Cache, FileCache};
    use crate::diagnostics::{lint_path, Diagnostics};

+    use std::sync::atomic::AtomicU64;
+
+    use anyhow::Result;
+    use ruff_python_ast::imports::ImportMap;
+
+    use ruff_workspace::Settings;
+    use test_case::test_case;
+
    #[test_case("../ruff_linter/resources/test/fixtures", "ruff_tests/cache_same_results_ruff_linter"; "ruff_linter_fixtures")]
    #[test_case("../ruff_notebook/resources/test/fixtures", "ruff_tests/cache_same_results_ruff_notebook"; "ruff_notebook_fixtures")]
    fn same_results(package_root: &str, cache_dir_path: &str) {
@@ -594,7 +376,7 @@ mod tests {

        let package_root = fs::canonicalize(package_root).unwrap();
        let cache = Cache::open(package_root.clone(), &settings);
-        assert_eq!(cache.changes.lock().unwrap().len(), 0);
+        assert_eq!(cache.new_files.lock().unwrap().len(), 0);

        let mut paths = Vec::new();
        let mut parse_errors = Vec::new();
@@ -628,7 +410,6 @@ mod tests {
                    Some(&cache),
                    flags::Noqa::Enabled,
                    flags::FixMode::Generate,
-                    UnsafeFixes::Enabled,
                )
                .unwrap();
                if diagnostics
@@ -644,7 +425,7 @@ mod tests {
        }
        assert_ne!(paths, &[] as &[std::path::PathBuf], "no files checked");

-        cache.persist().unwrap();
+        cache.store().unwrap();

        let cache = Cache::open(package_root.clone(), &settings);
        assert_ne!(cache.package.files.len(), 0);
@@ -674,7 +455,6 @@ mod tests {
                Some(&cache),
                flags::Noqa::Enabled,
                flags::FixMode::Generate,
-                UnsafeFixes::Enabled,
            )
            .unwrap();
        }
@@ -689,21 +469,21 @@ mod tests {
        let test_cache = TestCache::new("cache_adds_file_on_lint");
        let cache = test_cache.open();
        test_cache.write_source_file("source.py", source);
-        assert_eq!(cache.changes.lock().unwrap().len(), 0);
+        assert_eq!(cache.new_files.lock().unwrap().len(), 0);

-        cache.persist().unwrap();
+        cache.store().unwrap();
        let cache = test_cache.open();

        test_cache
            .lint_file_with_cache("source.py", &cache)
            .expect("Failed to lint test file");
        assert_eq!(
-            cache.changes.lock().unwrap().len(),
+            cache.new_files.lock().unwrap().len(),
            1,
            "A single new file should be added to the cache"
        );

-        cache.persist().unwrap();
+        cache.store().unwrap();
    }

    #[test]
@@ -714,9 +494,9 @@ mod tests {
        let cache = test_cache.open();
        test_cache.write_source_file("source_1.py", source);
        test_cache.write_source_file("source_2.py", source);
-        assert_eq!(cache.changes.lock().unwrap().len(), 0);
+        assert_eq!(cache.new_files.lock().unwrap().len(), 0);

-        cache.persist().unwrap();
+        cache.store().unwrap();
        let cache = test_cache.open();

        test_cache
@@ -726,39 +506,12 @@ mod tests {
            .lint_file_with_cache("source_2.py", &cache)
            .expect("Failed to lint test file");
        assert_eq!(
-            cache.changes.lock().unwrap().len(),
-            2,
-            "Both files should be added to the cache"
-        );
-        cache.persist().unwrap();
-    }
-
-    #[test]
-    fn cache_adds_files_on_format() {
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";
-
-        let test_cache = TestCache::new("cache_adds_files_on_format");
-        let cache = test_cache.open();
-        test_cache.write_source_file("source_1.py", source);
-        test_cache.write_source_file("source_2.py", source);
-        assert_eq!(cache.changes.lock().unwrap().len(), 0);
-
-        cache.persist().unwrap();
-        let cache = test_cache.open();
-
-        test_cache
-            .format_file_with_cache("source_1.py", &cache)
-            .expect("Failed to format test file");
-        test_cache
-            .format_file_with_cache("source_2.py", &cache)
-            .expect("Failed to format test file");
-        assert_eq!(
-            cache.changes.lock().unwrap().len(),
+            cache.new_files.lock().unwrap().len(),
            2,
            "Both files should be added to the cache"
        );

-        cache.persist().unwrap();
+        cache.store().unwrap();
    }

    #[test]
@@ -768,13 +521,13 @@ mod tests {
        let test_cache = TestCache::new("cache_invalidated_on_file_modified_time");
        let cache = test_cache.open();
        let source_path = test_cache.write_source_file("source.py", source);
-        assert_eq!(cache.changes.lock().unwrap().len(), 0);
+        assert_eq!(cache.new_files.lock().unwrap().len(), 0);

        let expected_diagnostics = test_cache
            .lint_file_with_cache("source.py", &cache)
            .expect("Failed to lint test file");

-        cache.persist().unwrap();
+        cache.store().unwrap();
        let cache = test_cache.open();

        // Update the modified time of the file to a time in the future
@@ -789,7 +542,7 @@ mod tests {
            .expect("Failed to lint test file");

        assert_eq!(
-            cache.changes.lock().unwrap().len(),
+            cache.new_files.lock().unwrap().len(),
            1,
            "Cache should not be used, the file should be treated as new and added to the cache"
        );
@@ -827,13 +580,13 @@ mod tests {
        let test_cache = TestCache::new("cache_invalidated_on_permission_change");
        let cache = test_cache.open();
        let path = test_cache.write_source_file("source.py", source);
-        assert_eq!(cache.changes.lock().unwrap().len(), 0);
+        assert_eq!(cache.new_files.lock().unwrap().len(), 0);

        let expected_diagnostics = test_cache
            .lint_file_with_cache("source.py", &cache)
            .unwrap();

-        cache.persist().unwrap();
+        cache.store().unwrap();
        let cache = test_cache.open();

        // Flip the permissions on the file
@@ -847,7 +600,7 @@ mod tests {
            .unwrap();

        assert_eq!(
-            cache.changes.lock().unwrap().len(),
+            cache.new_files.lock().unwrap().len(),
            1,
            "Cache should not be used, the file should be treated as new and added to the cache"
        );
@@ -859,8 +612,8 @@ mod tests {
    }

    #[test]
-    fn cache_removes_stale_files_on_persist() {
-        let test_cache = TestCache::new("cache_removes_stale_files_on_persist");
+    fn cache_removes_stale_files_on_store() {
+        let test_cache = TestCache::new("cache_removes_stale_files_on_store");
        let mut cache = test_cache.open();

        // Add a file to the cache that hasn't been linted or seen since the '70s!
@@ -870,7 +623,10 @@ mod tests {
            FileCache {
                key: 123,
                last_seen: AtomicU64::new(123),
-                data: FileCacheData::default(),
+                imports: ImportMap::new(),
+                messages: Vec::new(),
+                source: String::new(),
+                notebook_index: None,
            },
        );

@@ -878,125 +634,34 @@ mod tests {
        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";
        test_cache.write_source_file("new.py", source);
        let new_path_key = RelativePathBuf::from("new.py");
-        assert_eq!(cache.changes.lock().unwrap().len(), 0);
+        assert_eq!(cache.new_files.lock().unwrap().len(), 0);

        test_cache
            .lint_file_with_cache("new.py", &cache)
            .expect("Failed to lint test file");

        // Storing the cache should remove the old (`old.py`) file.
-        cache.persist().unwrap();
+        cache.store().unwrap();
        // So we when we open the cache again it shouldn't contain `old.py`.
        let cache = test_cache.open();

-        assert_eq!(
-            cache.package.files.keys().collect_vec(),
-            vec![&new_path_key],
+        assert!(
+            cache.package.files.keys().collect_vec() == vec![&new_path_key],
            "Only the new file should be present"
        );
    }

-    #[test]
-    fn format_updates_cache_entry() {
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";
-
-        let test_cache = TestCache::new("format_updates_cache_entry");
-        let cache = test_cache.open();
-        test_cache.write_source_file("source.py", source);
-        assert_eq!(cache.changes.lock().unwrap().len(), 0);
-
-        cache.persist().unwrap();
-        let cache = test_cache.open();
-
-        // Cache the lint results
-        test_cache
-            .lint_file_with_cache("source.py", &cache)
-            .expect("Failed to lint test file");
-        cache.persist().unwrap();
-
-        let mut cache = test_cache.open();
-
-        // Now lint the file
-        test_cache
-            .format_file_with_cache("source.py", &cache)
-            .expect("Failed to format test file");
-
-        cache.save();
-
-        assert_eq!(cache.package.files.len(), 1);
-
-        let Some(file_cache) = cache.get(
-            Path::new("source.py"),
-            &FileCacheKey::from_path(&test_cache.package_root.join("source.py")).unwrap(),
-        ) else {
-            panic!("Cache entry for `source.py` is missing.");
-        };
-
-        assert!(file_cache.data.lint.is_some());
-        assert!(file_cache.data.formatted);
-    }
-
-    #[test]
-    fn file_changes_invalidate_file_cache() {
-        let source: &[u8] = b"a = 1\n\n__all__ = list([\"a\", \"b\"])\n";
-
-        let test_cache = TestCache::new("file_changes_invalidate_file_cache");
-        let cache = test_cache.open();
-        let source_path = test_cache.write_source_file("source.py", source);
-        assert_eq!(cache.changes.lock().unwrap().len(), 0);
-
-        cache.persist().unwrap();
-        let cache = test_cache.open();
-
-        // Cache the format and lint results
-        test_cache
-            .lint_file_with_cache("source.py", &cache)
-            .expect("Failed to lint test file");
-        test_cache
-            .format_file_with_cache("source.py", &cache)
-            .expect("Failed to format test file");
-
-        cache.persist().unwrap();
-
-        let mut cache = test_cache.open();
-        assert_eq!(cache.package.files.len(), 1);
-
-        set_file_mtime(
-            &source_path,
-            FileTime::from_system_time(SystemTime::now() + std::time::Duration::from_secs(1)),
-        )
-        .unwrap();
-
-        test_cache
-            .format_file_with_cache("source.py", &cache)
-            .expect("Failed to format test file");
-
-        cache.save();
-
-        assert_eq!(cache.package.files.len(), 1);
-
-        let Some(file_cache) = cache.get(
-            Path::new("source.py"),
-            &FileCacheKey::from_path(&source_path).unwrap(),
-        ) else {
-            panic!("Cache entry for `source.py` is missing.");
-        };
-
-        assert_eq!(file_cache.data.lint, None);
-        assert!(file_cache.data.formatted);
-    }
-
    struct TestCache {
        package_root: PathBuf,
        settings: Settings,
    }

    impl TestCache {
-        fn new(test_case: &str) -> Self {
+        fn new(name: &str) -> Self {
            // Build a new cache directory and clear it
            let mut test_dir = temp_dir();
            test_dir.push("ruff_tests/cache");
-            test_dir.push(test_case);
+            test_dir.push(name);

            let _ = fs::remove_dir_all(&test_dir);

@@ -1047,22 +712,6 @@ mod tests {
                Some(cache),
                flags::Noqa::Enabled,
                flags::FixMode::Generate,
-                UnsafeFixes::Enabled,
-            )
-        }
-
-        fn format_file_with_cache(
-            &self,
-            path: &str,
-            cache: &Cache,
-        ) -> Result<FormatResult, FormatCommandError> {
-            let file_path = self.package_root.join(path);
-            format_path(
-                &file_path,
-                &self.settings.formatter,
-                PySourceType::Python,
-                FormatMode::Write,
-                Some(cache),
            )
        }
    }
--- a/crates/ruff_cli/src/commands/add_noqa.rs
+++ b/crates/ruff_cli/src/commands/add_noqa.rs
@@ -7,12 +7,12 @@ use log::{debug, error};
 use rayon::prelude::*;

 use ruff_linter::linter::add_noqa_to_path;
-use ruff_linter::source_kind::SourceKind;
 use ruff_linter::warn_user_once;
 use ruff_python_ast::{PySourceType, SourceType};
-use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig, ResolvedFile};
+use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig};

 use crate::args::CliOverrides;
+use crate::diagnostics::LintSource;

 /// Add `noqa` directives to a collection of files.
 pub(crate) fn add_noqa(
@@ -36,7 +36,7 @@ pub(crate) fn add_noqa(
        &paths
            .iter()
            .flatten()
-            .map(ResolvedFile::path)
+            .map(ignore::DirEntry::path)
            .collect::<Vec<_>>(),
        pyproject_config,
    );
@@ -45,21 +45,20 @@ pub(crate) fn add_noqa(
    let modifications: usize = paths
        .par_iter()
        .flatten()
-        .filter_map(|resolved_file| {
+        .filter_map(|entry| {
+            let path = entry.path();
            let SourceType::Python(source_type @ (PySourceType::Python | PySourceType::Stub)) =
-                SourceType::from(resolved_file.path())
+                SourceType::from(path)
            else {
                return None;
            };
-            let path = resolved_file.path();
-            let package = resolved_file
-                .path()
+            let package = path
                .parent()
                .and_then(|parent| package_roots.get(parent))
                .and_then(|package| *package);
            let settings = resolver.resolve(path, pyproject_config);
-            let source_kind = match SourceKind::from_path(path, source_type) {
-                Ok(Some(source_kind)) => source_kind,
+            let LintSource(source_kind) = match LintSource::try_from_path(path, source_type) {
+                Ok(Some(source)) => source,
                Ok(None) => return None,
                Err(e) => {
                    error!("Failed to extract source from {}: {e}", path.display());
--- a/crates/ruff_cli/src/commands/check.rs
+++ b/crates/ruff_cli/src/commands/check.rs
@@ -1,3 +1,4 @@
+use std::collections::HashMap;
 use std::fmt::Write;
 use std::io;
 use std::path::{Path, PathBuf};
@@ -6,6 +7,7 @@ use std::time::Instant;
 use anyhow::Result;
 use colored::Colorize;
 use ignore::Error;
+use itertools::Itertools;
 use log::{debug, error, warn};
 #[cfg(not(target_family = "wasm"))]
 use rayon::prelude::*;
@@ -14,18 +16,15 @@ use rustc_hash::FxHashMap;
 use ruff_diagnostics::Diagnostic;
 use ruff_linter::message::Message;
 use ruff_linter::registry::Rule;
-use ruff_linter::settings::types::UnsafeFixes;
 use ruff_linter::settings::{flags, LinterSettings};
 use ruff_linter::{fs, warn_user_once, IOError};
 use ruff_python_ast::imports::ImportMap;
 use ruff_source_file::SourceFileBuilder;
 use ruff_text_size::{TextRange, TextSize};
-use ruff_workspace::resolver::{
-    match_exclusion, python_files_in_path, PyprojectConfig, ResolvedFile,
-};
+use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig, PyprojectDiscoveryStrategy};

 use crate::args::CliOverrides;
-use crate::cache::{Cache, PackageCacheMap, PackageCaches};
+use crate::cache::{self, Cache};
 use crate::diagnostics::Diagnostics;
 use crate::panic::catch_unwind;

@@ -36,150 +35,159 @@ pub(crate) fn check(
    overrides: &CliOverrides,
    cache: flags::Cache,
    noqa: flags::Noqa,
-    fix_mode: flags::FixMode,
-    unsafe_fixes: UnsafeFixes,
+    autofix: flags::FixMode,
 ) -> Result<Diagnostics> {
    // Collect all the Python files to check.
    let start = Instant::now();
    let (paths, resolver) = python_files_in_path(files, pyproject_config, overrides)?;
-    debug!("Identified files to lint in: {:?}", start.elapsed());
+    let duration = start.elapsed();
+    debug!("Identified files to lint in: {:?}", duration);

    if paths.is_empty() {
        warn_user_once!("No Python files found under the given path(s)");
        return Ok(Diagnostics::default());
    }

+    // Initialize the cache.
+    if cache.into() {
+        fn init_cache(path: &Path) {
+            if let Err(e) = cache::init(path) {
+                error!("Failed to initialize cache at {}: {e:?}", path.display());
+            }
+        }
+
+        match pyproject_config.strategy {
+            PyprojectDiscoveryStrategy::Fixed => {
+                init_cache(&pyproject_config.settings.cache_dir);
+            }
+            PyprojectDiscoveryStrategy::Hierarchical => {
+                for settings in
+                    std::iter::once(&pyproject_config.settings).chain(resolver.settings())
+                {
+                    init_cache(&settings.cache_dir);
+                }
+            }
+        }
+    };
+
    // Discover the package root for each Python file.
    let package_roots = resolver.package_roots(
        &paths
            .iter()
            .flatten()
-            .map(ResolvedFile::path)
+            .map(ignore::DirEntry::path)
            .collect::<Vec<_>>(),
        pyproject_config,
    );

    // Load the caches.
-    let caches = if bool::from(cache) {
-        Some(PackageCacheMap::init(
-            pyproject_config,
-            &package_roots,
-            &resolver,
-        ))
-    } else {
-        None
-    };
-
-    let start = Instant::now();
-    let diagnostics_per_file = paths.par_iter().filter_map(|resolved_file| {
-        let result = match resolved_file {
-            Ok(resolved_file) => {
-                let path = resolved_file.path();
-                let package = path
-                    .parent()
-                    .and_then(|parent| package_roots.get(parent))
-                    .and_then(|package| *package);
-
-                let settings = resolver.resolve(path, pyproject_config);
-
-                if !resolved_file.is_root()
-                    && match_exclusion(
-                        resolved_file.path(),
-                        resolved_file.file_name(),
-                        &settings.linter.exclude,
-                    )
-                {
-                    return None;
-                }
-
-                let cache_root = package.unwrap_or_else(|| path.parent().unwrap_or(path));
-                let cache = caches.get(cache_root);
-
-                lint_path(
-                    path,
-                    package,
-                    &settings.linter,
-                    cache,
-                    noqa,
-                    fix_mode,
-                    unsafe_fixes,
-                )
-                .map_err(|e| {
-                    (Some(path.to_path_buf()), {
-                        let mut error = e.to_string();
-                        for cause in e.chain() {
-                            write!(&mut error, "\n  Cause: {cause}").unwrap();
-                        }
-                        error
-                    })
-                })
-            }
-            Err(e) => Err((
-                if let Error::WithPath { path, .. } = e {
-                    Some(path.clone())
-                } else {
-                    None
-                },
-                e.io_error()
-                    .map_or_else(|| e.to_string(), io::Error::to_string),
-            )),
-        };
-
-        Some(result.unwrap_or_else(|(path, message)| {
-            if let Some(path) = &path {
-                let settings = resolver.resolve(path, pyproject_config);
-                if settings.linter.rules.enabled(Rule::IOError) {
-                    let dummy =
-                        SourceFileBuilder::new(path.to_string_lossy().as_ref(), "").finish();
-
-                    Diagnostics::new(
-                        vec![Message::from_diagnostic(
-                            Diagnostic::new(IOError { message }, TextRange::default()),
-                            dummy,
-                            TextSize::default(),
-                        )],
-                        ImportMap::default(),
-                        FxHashMap::default(),
-                    )
-                } else {
-                    warn!(
-                        "{}{}{} {message}",
-                        "Failed to lint ".bold(),
-                        fs::relativize_path(path).bold(),
-                        ":".bold()
-                    );
-                    Diagnostics::default()
-                }
-            } else {
-                warn!("{} {message}", "Encountered error:".bold());
-                Diagnostics::default()
-            }
-        }))
+    let caches = bool::from(cache).then(|| {
+        package_roots
+            .iter()
+            .map(|(package, package_root)| package_root.unwrap_or(package))
+            .unique()
+            .par_bridge()
+            .map(|cache_root| {
+                let settings = resolver.resolve(cache_root, pyproject_config);
+                let cache = Cache::open(cache_root.to_path_buf(), settings);
+                (cache_root, cache)
+            })
+            .collect::<HashMap<&Path, Cache>>()
    });

-    // Aggregate the diagnostics of all checked files and count the checked files.
-    // This can't be a regular for loop because we use `par_iter`.
-    let (mut all_diagnostics, checked_files) = diagnostics_per_file
-        .fold(
-            || (Diagnostics::default(), 0u64),
-            |(all_diagnostics, checked_files), file_diagnostics| {
-                (all_diagnostics + file_diagnostics, checked_files + 1)
-            },
-        )
-        .reduce(
-            || (Diagnostics::default(), 0u64),
-            |a, b| (a.0 + b.0, a.1 + b.1),
-        );
+    let start = Instant::now();
+    let mut diagnostics: Diagnostics = paths
+        .par_iter()
+        .map(|entry| {
+            match entry {
+                Ok(entry) => {
+                    let path = entry.path();
+                    let package = path
+                        .parent()
+                        .and_then(|parent| package_roots.get(parent))
+                        .and_then(|package| *package);

-    all_diagnostics.messages.sort();
+                    let settings = resolver.resolve(path, pyproject_config);
+
+                    let cache_root = package.unwrap_or_else(|| path.parent().unwrap_or(path));
+                    let cache = caches.as_ref().and_then(|caches| {
+                        if let Some(cache) = caches.get(&cache_root) {
+                            Some(cache)
+                        } else {
+                            debug!("No cache found for {}", cache_root.display());
+                            None
+                        }
+                    });
+
+                    lint_path(path, package, &settings.linter, cache, noqa, autofix).map_err(|e| {
+                        (Some(path.to_owned()), {
+                            let mut error = e.to_string();
+                            for cause in e.chain() {
+                                write!(&mut error, "\n  Cause: {cause}").unwrap();
+                            }
+                            error
+                        })
+                    })
+                }
+                Err(e) => Err((
+                    if let Error::WithPath { path, .. } = e {
+                        Some(path.clone())
+                    } else {
+                        None
+                    },
+                    e.io_error()
+                        .map_or_else(|| e.to_string(), io::Error::to_string),
+                )),
+            }
+            .unwrap_or_else(|(path, message)| {
+                if let Some(path) = &path {
+                    let settings = resolver.resolve(path, pyproject_config);
+                    if settings.linter.rules.enabled(Rule::IOError) {
+                        let dummy =
+                            SourceFileBuilder::new(path.to_string_lossy().as_ref(), "").finish();
+
+                        Diagnostics::new(
+                            vec![Message::from_diagnostic(
+                                Diagnostic::new(IOError { message }, TextRange::default()),
+                                dummy,
+                                TextSize::default(),
+                            )],
+                            ImportMap::default(),
+                            FxHashMap::default(),
+                        )
+                    } else {
+                        warn!(
+                            "{}{}{} {message}",
+                            "Failed to lint ".bold(),
+                            fs::relativize_path(path).bold(),
+                            ":".bold()
+                        );
+                        Diagnostics::default()
+                    }
+                } else {
+                    warn!("{} {message}", "Encountered error:".bold());
+                    Diagnostics::default()
+                }
+            })
+        })
+        .reduce(Diagnostics::default, |mut acc, item| {
+            acc += item;
+            acc
+        });
+
+    diagnostics.messages.sort();

    // Store the caches.
-    caches.persist()?;
+    if let Some(caches) = caches {
+        caches
+            .into_par_iter()
+            .try_for_each(|(_, cache)| cache.store())?;
+    }

    let duration = start.elapsed();
-    debug!("Checked {:?} files in: {:?}", checked_files, duration);
+    debug!("Checked {:?} files in: {:?}", paths.len(), duration);

-    Ok(all_diagnostics)
+    Ok(diagnostics)
 }

 /// Wraps [`lint_path`](crate::diagnostics::lint_path) in a [`catch_unwind`](std::panic::catch_unwind) and emits
@@ -190,11 +198,10 @@ fn lint_path(
    settings: &LinterSettings,
    cache: Option<&Cache>,
    noqa: flags::Noqa,
-    fix_mode: flags::FixMode,
-    unsafe_fixes: UnsafeFixes,
+    autofix: flags::FixMode,
 ) -> Result<Diagnostics> {
    let result = catch_unwind(|| {
-        crate::diagnostics::lint_path(path, package, settings, cache, noqa, fix_mode, unsafe_fixes)
+        crate::diagnostics::lint_path(path, package, settings, cache, noqa, autofix)
    });

    match result {
@@ -231,7 +238,6 @@ mod test {

    use ruff_linter::message::{Emitter, EmitterContext, TextEmitter};
    use ruff_linter::registry::Rule;
-    use ruff_linter::settings::types::UnsafeFixes;
    use ruff_linter::settings::{flags, LinterSettings};
    use ruff_workspace::resolver::{PyprojectConfig, PyprojectDiscoveryStrategy};
    use ruff_workspace::Settings;
@@ -279,7 +285,6 @@ mod test {
            flags::Cache::Disabled,
            flags::Noqa::Disabled,
            flags::FixMode::Generate,
-            UnsafeFixes::Enabled,
        )
        .unwrap();
        let mut output = Vec::new();
--- a/crates/ruff_cli/src/commands/check_stdin.rs
+++ b/crates/ruff_cli/src/commands/check_stdin.rs
@@ -4,7 +4,7 @@ use anyhow::Result;

 use ruff_linter::packaging;
 use ruff_linter::settings::flags;
-use ruff_workspace::resolver::{match_exclusion, python_file_at_path, PyprojectConfig};
+use ruff_workspace::resolver::{python_file_at_path, PyprojectConfig};

 use crate::args::CliOverrides;
 use crate::diagnostics::{lint_stdin, Diagnostics};
@@ -16,20 +16,12 @@ pub(crate) fn check_stdin(
    pyproject_config: &PyprojectConfig,
    overrides: &CliOverrides,
    noqa: flags::Noqa,
-    fix_mode: flags::FixMode,
+    autofix: flags::FixMode,
 ) -> Result<Diagnostics> {
    if let Some(filename) = filename {
        if !python_file_at_path(filename, pyproject_config, overrides)? {
            return Ok(Diagnostics::default());
        }
-
-        let lint_settings = &pyproject_config.settings.linter;
-        if filename
-            .file_name()
-            .is_some_and(|name| match_exclusion(filename, name, &lint_settings.exclude))
-        {
-            return Ok(Diagnostics::default());
-        }
    }
    let package_root = filename.and_then(Path::parent).and_then(|path| {
        packaging::detect_package_root(path, &pyproject_config.settings.linter.namespace_packages)
@@ -41,7 +33,7 @@ pub(crate) fn check_stdin(
        stdin,
        &pyproject_config.settings,
        noqa,
-        fix_mode,
+        autofix,
    )?;
    diagnostics.messages.sort_unstable();
    Ok(diagnostics)
--- a/crates/ruff_cli/src/commands/config.rs
+++ b/crates/ruff_cli/src/commands/config.rs
@@ -1,13 +1,12 @@
 use anyhow::{anyhow, Result};

 use ruff_workspace::options::Options;
-use ruff_workspace::options_base::OptionsMetadata;

 #[allow(clippy::print_stdout)]
 pub(crate) fn config(key: Option<&str>) -> Result<()> {
    match key {
        None => print!("{}", Options::metadata()),
-        Some(key) => match Options::metadata().find(key) {
+        Some(key) => match Options::metadata().get(key) {
            None => {
                return Err(anyhow!("Unknown option: {key}"));
            }
--- a/crates/ruff_cli/src/commands/format.rs
+++ b/crates/ruff_cli/src/commands/format.rs
@@ -1,36 +1,25 @@
 use std::fmt::{Display, Formatter};
-use std::fs::File;
 use std::io;
-use std::io::{stderr, stdout, Write};
 use std::path::{Path, PathBuf};
 use std::time::Instant;

 use anyhow::Result;
 use colored::Colorize;
-use itertools::Itertools;
-use log::{error, warn};
+use log::error;
 use rayon::iter::Either::{Left, Right};
-use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
+use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use thiserror::Error;
 use tracing::debug;

-use ruff_diagnostics::SourceMap;
 use ruff_linter::fs;
 use ruff_linter::logging::LogLevel;
-use ruff_linter::registry::Rule;
-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, FormatModuleError, QuoteStyle};
-use ruff_text_size::{TextLen, TextRange, TextSize};
-use ruff_workspace::resolver::{
-    match_exclusion, python_files_in_path, PyprojectConfig, ResolvedFile, Resolver,
-};
-use ruff_workspace::FormatterSettings;
+use ruff_python_formatter::{format_module_source, FormatModuleError, PyFormatOptions};
+use ruff_source_file::{find_newline, LineEnding};
+use ruff_workspace::resolver::python_files_in_path;

 use crate::args::{CliOverrides, FormatArguments};
-use crate::cache::{Cache, FileCacheKey, PackageCacheMap, PackageCaches};
 use crate::panic::{catch_unwind, PanicError};
 use crate::resolve::resolve;
 use crate::ExitStatus;
@@ -41,20 +30,6 @@ pub(crate) enum FormatMode {
    Write,
    /// Check if the file is formatted, but do not write the formatted contents back.
    Check,
-    /// Check if the file is formatted, show a diff if not.
-    Diff,
-}
-
-impl FormatMode {
-    pub(crate) fn from_cli(cli: &FormatArguments) -> Self {
-        if cli.diff {
-            FormatMode::Diff
-        } else if cli.check {
-            FormatMode::Check
-        } else {
-            FormatMode::Write
-        }
-    }
 }

 /// Format a set of files, and return the exit status.
@@ -69,7 +44,11 @@ pub(crate) fn format(
        overrides,
        cli.stdin_filename.as_deref(),
    )?;
-    let mode = FormatMode::from_cli(cli);
+    let mode = if cli.check {
+        FormatMode::Check
+    } else {
+        FormatMode::Write
+    };
    let (paths, resolver) = python_files_in_path(&cli.files, &pyproject_config, overrides)?;

    if paths.is_empty() {
@@ -77,87 +56,34 @@ pub(crate) fn format(
        return Ok(ExitStatus::Success);
    }

-    warn_incompatible_formatter_settings(&pyproject_config, Some(&resolver));
-
-    // Discover the package root for each Python file.
-    let package_roots = resolver.package_roots(
-        &paths
-            .iter()
-            .flatten()
-            .map(ResolvedFile::path)
-            .collect::<Vec<_>>(),
-        &pyproject_config,
-    );
-
-    let caches = if cli.no_cache {
-        None
-    } else {
-        // `--no-cache` doesn't respect code changes, and so is often confusing during
-        // development.
-        #[cfg(debug_assertions)]
-        crate::warn_user!("Detected debug build without --no-cache.");
-
-        Some(PackageCacheMap::init(
-            &pyproject_config,
-            &package_roots,
-            &resolver,
-        ))
-    };
-
    let start = Instant::now();
-    let (results, mut errors): (Vec<_>, Vec<_>) = paths
-        .par_iter()
+    let (results, errors): (Vec<_>, Vec<_>) = paths
+        .into_par_iter()
        .filter_map(|entry| {
            match entry {
-                Ok(resolved_file) => {
-                    let path = resolved_file.path();
-                    let SourceType::Python(source_type) = SourceType::from(&path) else {
+                Ok(entry) => {
+                    let path = entry.path();
+
+                    let SourceType::Python(
+                        source_type @ (PySourceType::Python | PySourceType::Stub),
+                    ) = SourceType::from(path)
+                    else {
                        // Ignore any non-Python files.
                        return None;
                    };

                    let resolved_settings = resolver.resolve(path, &pyproject_config);
+                    let options = resolved_settings.formatter.to_format_options(source_type);
+                    debug!("Formatting {} with {:?}", path.display(), options);

-                    // Ignore files that are excluded from formatting
-                    if !resolved_file.is_root()
-                        && match_exclusion(
-                            path,
-                            resolved_file.file_name(),
-                            &resolved_settings.formatter.exclude,
-                        )
-                    {
-                        return None;
-                    }
-
-                    let package = path
-                        .parent()
-                        .and_then(|parent| package_roots.get(parent).copied())
-                        .flatten();
-                    let cache_root = package.unwrap_or_else(|| path.parent().unwrap_or(path));
-                    let cache = caches.get(cache_root);
-
-                    Some(
-                        match catch_unwind(|| {
-                            format_path(
-                                path,
-                                &resolved_settings.formatter,
-                                source_type,
-                                mode,
-                                cache,
-                            )
-                        }) {
-                            Ok(inner) => inner.map(|result| FormatPathResult {
-                                path: resolved_file.path().to_path_buf(),
-                                result,
-                            }),
-                            Err(error) => Err(FormatCommandError::Panic(
-                                Some(resolved_file.path().to_path_buf()),
-                                error,
-                            )),
-                        },
-                    )
+                    Some(match catch_unwind(|| format_path(path, options, mode)) {
+                        Ok(inner) => inner,
+                        Err(error) => {
+                            Err(FormatCommandError::Panic(Some(path.to_path_buf()), error))
+                        }
+                    })
                }
-                Err(err) => Some(Err(FormatCommandError::Ignore(err.clone()))),
+                Err(err) => Some(Err(FormatCommandError::Ignore(err))),
            }
        })
        .partition_map(|result| match result {
@@ -172,33 +98,18 @@ pub(crate) fn format(
        duration
    );

-    caches.persist()?;
-
    // Report on any errors.
-    errors.sort_unstable_by(|a, b| a.path().cmp(&b.path()));
-
    for error in &errors {
        error!("{error}");
    }

-    let results = FormatResults::new(results.as_slice(), mode);
-    match mode {
-        FormatMode::Write => {}
-        FormatMode::Check => {
-            results.write_changed(&mut stdout().lock())?;
-        }
-        FormatMode::Diff => {
-            results.write_diff(&mut stdout().lock())?;
-        }
-    }
+    let summary = FormatResultSummary::new(results, mode);

    // Report on the formatting changes.
    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())?;
-        } else {
-            results.write_summary(&mut stdout().lock())?;
+        #[allow(clippy::print_stdout)]
+        {
+            println!("{summary}");
        }
    }

@@ -210,9 +121,9 @@ pub(crate) fn format(
                Ok(ExitStatus::Error)
            }
        }
-        FormatMode::Check | FormatMode::Diff => {
+        FormatMode::Check => {
            if errors.is_empty() {
-                if results.any_formatted() {
+                if summary.formatted > 0 {
                    Ok(ExitStatus::Failure)
                } else {
                    Ok(ExitStatus::Success)
@@ -225,327 +136,105 @@ pub(crate) fn format(
 }

 /// Format the file at the given [`Path`].
-#[tracing::instrument(level="debug", skip_all, fields(path = %path.display()))]
-pub(crate) fn format_path(
+#[tracing::instrument(skip_all, fields(path = %path.display()))]
+fn format_path(
    path: &Path,
-    settings: &FormatterSettings,
-    source_type: PySourceType,
+    options: PyFormatOptions,
    mode: FormatMode,
-    cache: Option<&Cache>,
-) -> Result<FormatResult, FormatCommandError> {
-    if let Some(cache) = cache {
-        let relative_path = cache
-            .relative_path(path)
-            .expect("wrong package cache for file");
+) -> Result<FormatCommandResult, FormatCommandError> {
+    let unformatted = std::fs::read_to_string(path)
+        .map_err(|err| FormatCommandError::Read(Some(path.to_path_buf()), err))?;

-        if let Ok(cache_key) = FileCacheKey::from_path(path) {
-            if cache.is_formatted(relative_path, &cache_key) {
-                return Ok(FormatResult::Unchanged);
-            }
-        }
-    }
-
-    // Extract the sources from the file.
-    let unformatted = match SourceKind::from_path(path, source_type) {
-        Ok(Some(source_kind)) => source_kind,
-        // Non Python Jupyter notebook
-        Ok(None) => return Ok(FormatResult::Skipped),
-        Err(err) => {
-            return Err(FormatCommandError::Read(Some(path.to_path_buf()), err));
-        }
+    let line_ending = match find_newline(&unformatted) {
+        Some((_, LineEnding::Lf)) | None => ruff_formatter::printer::LineEnding::LineFeed,
+        Some((_, LineEnding::Cr)) => ruff_formatter::printer::LineEnding::CarriageReturn,
+        Some((_, LineEnding::CrLf)) => ruff_formatter::printer::LineEnding::CarriageReturnLineFeed,
    };

-    // Format the source.
-    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| {
-                    FormatCommandError::Write(Some(path.to_path_buf()), err.into())
-                })?;
-                formatted
-                    .write(&mut writer)
-                    .map_err(|err| FormatCommandError::Write(Some(path.to_path_buf()), err))?;
+    let options = options.with_line_ending(line_ending);

-                if let Some(cache) = cache {
-                    if let Ok(cache_key) = FileCacheKey::from_path(path) {
-                        let relative_path = cache
-                            .relative_path(path)
-                            .expect("wrong package cache for file");
-                        cache.set_formatted(relative_path.to_path_buf(), &cache_key);
-                    }
-                }
+    let formatted = format_module_source(&unformatted, options)
+        .map_err(|err| FormatCommandError::FormatModule(Some(path.to_path_buf()), err))?;

-                FormatResult::Formatted
-            }
-            FormatMode::Check => FormatResult::Formatted,
-            FormatMode::Diff => FormatResult::Diff {
-                unformatted,
-                formatted,
-            },
-        },
-        FormattedSource::Unchanged => {
-            if let Some(cache) = cache {
-                if let Ok(cache_key) = FileCacheKey::from_path(path) {
-                    let relative_path = cache
-                        .relative_path(path)
-                        .expect("wrong package cache for file");
-                    cache.set_formatted(relative_path.to_path_buf(), &cache_key);
-                }
-            }
-
-            FormatResult::Unchanged
-        }
-    };
-
-    Ok(format_result)
-}
-
-#[derive(Debug)]
-pub(crate) enum FormattedSource {
-    /// The source was formatted, and the [`SourceKind`] contains the transformed source code.
-    Formatted(SourceKind),
-    /// The source was unchanged.
-    Unchanged,
-}
-
-impl From<FormattedSource> for FormatResult {
-    fn from(value: FormattedSource) -> Self {
-        match value {
-            FormattedSource::Formatted(_) => FormatResult::Formatted,
-            FormattedSource::Unchanged => FormatResult::Unchanged,
+    let formatted = formatted.as_code();
+    if formatted.len() == unformatted.len() && formatted == unformatted {
+        Ok(FormatCommandResult::Unchanged)
+    } else {
+        if mode.is_write() {
+            std::fs::write(path, formatted.as_bytes())
+                .map_err(|err| FormatCommandError::Write(Some(path.to_path_buf()), err))?;
        }
+        Ok(FormatCommandResult::Formatted)
    }
 }

-/// Format a [`SourceKind`], returning the transformed [`SourceKind`], or `None` if the source was
-/// unchanged.
-pub(crate) fn format_source(
-    source_kind: &SourceKind,
-    source_type: PySourceType,
-    path: Option<&Path>,
-    settings: &FormatterSettings,
-) -> Result<FormattedSource, FormatCommandError> {
-    match source_kind {
-        SourceKind::Python(unformatted) => {
-            let options = settings.to_format_options(source_type, unformatted);
-
-            let formatted = format_module_source(unformatted, options)
-                .map_err(|err| FormatCommandError::Format(path.map(Path::to_path_buf), err))?;
-
-            let formatted = formatted.into_code();
-            if formatted.len() == unformatted.len() && formatted == *unformatted {
-                Ok(FormattedSource::Unchanged)
-            } else {
-                Ok(FormattedSource::Formatted(SourceKind::Python(formatted)))
-            }
-        }
-        SourceKind::IpyNotebook(notebook) => {
-            if !notebook.is_python_notebook() {
-                return Ok(FormattedSource::Unchanged);
-            }
-
-            let options = settings.to_format_options(source_type, notebook.source_code());
-
-            let mut output: Option<String> = None;
-            let mut last: Option<TextSize> = None;
-            let mut source_map = SourceMap::default();
-
-            // Format each cell individually.
-            for (start, end) in notebook.cell_offsets().iter().tuple_windows::<(_, _)>() {
-                let range = TextRange::new(*start, *end);
-                let unformatted = &notebook.source_code()[range];
-
-                // Format the cell.
-                let formatted = format_module_source(unformatted, options.clone())
-                    .map_err(|err| FormatCommandError::Format(path.map(Path::to_path_buf), err))?;
-
-                // If the cell is unchanged, skip it.
-                let formatted = formatted.as_code();
-                if formatted.len() == unformatted.len() && formatted == unformatted {
-                    continue;
-                }
-
-                // If this is the first newly-formatted cell, initialize the output.
-                let output = output
-                    .get_or_insert_with(|| String::with_capacity(notebook.source_code().len()));
-
-                // Add all contents from `last` to the current cell.
-                let slice = &notebook.source_code()
-                    [TextRange::new(last.unwrap_or_default(), range.start())];
-                output.push_str(slice);
-
-                // Add the start source marker for the cell.
-                source_map.push_marker(*start, output.text_len());
-
-                // Add the cell itself.
-                output.push_str(formatted);
-
-                // Add the end source marker for the added cell.
-                source_map.push_marker(*end, output.text_len());
-
-                // Track that the cell was formatted.
-                last = Some(*end);
-            }
-
-            // If the file was unchanged, return `None`.
-            let (Some(mut output), Some(last)) = (output, last) else {
-                return Ok(FormattedSource::Unchanged);
-            };
-
-            // Add the remaining content.
-            let slice = &notebook.source_code()[usize::from(last)..];
-            output.push_str(slice);
-
-            // Update the notebook.
-            let mut formatted = notebook.clone();
-            formatted.update(&source_map, output);
-
-            Ok(FormattedSource::Formatted(SourceKind::IpyNotebook(
-                formatted,
-            )))
-        }
-    }
-}
-
-/// The result of an individual formatting operation.
-#[derive(Debug, Clone, is_macro::Is)]
-pub(crate) enum FormatResult {
+#[derive(Debug, Clone, Copy, is_macro::Is)]
+pub(crate) enum FormatCommandResult {
    /// The file was formatted.
    Formatted,
-    /// The file was formatted, [`SourceKind`] contains the formatted code
-    Diff {
-        unformatted: SourceKind,
-        formatted: SourceKind,
-    },
    /// The file was unchanged, as the formatted contents matched the existing contents.
    Unchanged,
-
-    /// Skipped formatting because its an unsupported file format
-    Skipped,
 }

-/// The coupling of a [`FormatResult`] with the path of the file that was analyzed.
 #[derive(Debug)]
-struct FormatPathResult {
-    path: PathBuf,
-    result: FormatResult,
-}
-
-/// The results of formatting a set of files
-#[derive(Debug)]
-struct FormatResults<'a> {
-    /// The individual formatting results.
-    results: &'a [FormatPathResult],
+struct FormatResultSummary {
    /// The format mode that was used.
    mode: FormatMode,
+    /// The number of files that were formatted.
+    formatted: usize,
+    /// The number of files that were unchanged.
+    unchanged: usize,
 }

-impl<'a> FormatResults<'a> {
-    fn new(results: &'a [FormatPathResult], mode: FormatMode) -> Self {
-        Self { results, mode }
-    }
-
-    /// Returns `true` if any of the files require formatting.
-    fn any_formatted(&self) -> bool {
-        self.results.iter().any(|result| match result.result {
-            FormatResult::Formatted | FormatResult::Diff { .. } => true,
-            FormatResult::Unchanged | FormatResult::Skipped => false,
-        })
-    }
-
-    /// Write a diff of the formatting changes to the given writer.
-    fn write_diff(&self, f: &mut impl Write) -> io::Result<()> {
-        for (path, unformatted, formatted) in self
-            .results
-            .iter()
-            .filter_map(|result| {
-                if let FormatResult::Diff {
-                    unformatted,
-                    formatted,
-                } = &result.result
-                {
-                    Some((result.path.as_path(), unformatted, formatted))
-                } else {
-                    None
-                }
-            })
-            .sorted_unstable_by_key(|(path, _, _)| *path)
-        {
-            unformatted.diff(formatted, Some(path), f)?;
-        }
-
-        Ok(())
-    }
-
-    /// Write a list of the files that would be changed to the given writer.
-    fn write_changed(&self, f: &mut impl Write) -> io::Result<()> {
-        for path in self
-            .results
-            .iter()
-            .filter_map(|result| {
-                if result.result.is_formatted() {
-                    Some(result.path.as_path())
-                } else {
-                    None
-                }
-            })
-            .sorted_unstable()
-        {
-            writeln!(f, "Would reformat: {}", fs::relativize_path(path).bold())?;
-        }
-
-        Ok(())
-    }
-
-    /// Write a summary of the formatting results to the given writer.
-    fn write_summary(&self, f: &mut impl Write) -> io::Result<()> {
-        // Compute the number of changed and unchanged files.
-        let mut changed = 0u32;
-        let mut unchanged = 0u32;
-        for result in self.results {
-            match &result.result {
-                FormatResult::Formatted => {
-                    changed += 1;
-                }
-                FormatResult::Unchanged => unchanged += 1,
-                FormatResult::Diff { .. } => {
-                    changed += 1;
-                }
-                FormatResult::Skipped => {}
+impl FormatResultSummary {
+    fn new(diagnostics: Vec<FormatCommandResult>, mode: FormatMode) -> Self {
+        let mut summary = Self {
+            mode,
+            formatted: 0,
+            unchanged: 0,
+        };
+        for diagnostic in diagnostics {
+            match diagnostic {
+                FormatCommandResult::Formatted => summary.formatted += 1,
+                FormatCommandResult::Unchanged => summary.unchanged += 1,
            }
        }
+        summary
+    }
+}

-        // Write out a summary of the formatting results.
-        if changed > 0 && unchanged > 0 {
-            writeln!(
+impl Display for FormatResultSummary {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        if self.formatted > 0 && self.unchanged > 0 {
+            write!(
                f,
                "{} file{} {}, {} file{} left unchanged",
-                changed,
-                if changed == 1 { "" } else { "s" },
+                self.formatted,
+                if self.formatted == 1 { "" } else { "s" },
                match self.mode {
                    FormatMode::Write => "reformatted",
-                    FormatMode::Check | FormatMode::Diff => "would be reformatted",
+                    FormatMode::Check => "would be reformatted",
                },
-                unchanged,
-                if unchanged == 1 { "" } else { "s" },
+                self.unchanged,
+                if self.unchanged == 1 { "" } else { "s" },
            )
-        } else if changed > 0 {
-            writeln!(
+        } else if self.formatted > 0 {
+            write!(
                f,
                "{} file{} {}",
-                changed,
-                if changed == 1 { "" } else { "s" },
+                self.formatted,
+                if self.formatted == 1 { "" } else { "s" },
                match self.mode {
                    FormatMode::Write => "reformatted",
-                    FormatMode::Check | FormatMode::Diff => "would be reformatted",
+                    FormatMode::Check => "would be reformatted",
                }
            )
-        } else if unchanged > 0 {
-            writeln!(
+        } else if self.unchanged > 0 {
+            write!(
                f,
                "{} file{} left unchanged",
-                unchanged,
-                if unchanged == 1 { "" } else { "s" },
+                self.unchanged,
+                if self.unchanged == 1 { "" } else { "s" },
            )
        } else {
            Ok(())
@@ -557,30 +246,10 @@ impl<'a> FormatResults<'a> {
 #[derive(Error, Debug)]
 pub(crate) enum FormatCommandError {
    Ignore(#[from] ignore::Error),
+    Read(Option<PathBuf>, io::Error),
+    Write(Option<PathBuf>, io::Error),
+    FormatModule(Option<PathBuf>, FormatModuleError),
    Panic(Option<PathBuf>, PanicError),
-    Read(Option<PathBuf>, SourceError),
-    Format(Option<PathBuf>, FormatModuleError),
-    Write(Option<PathBuf>, SourceError),
-    Diff(Option<PathBuf>, io::Error),
-}
-
-impl FormatCommandError {
-    fn path(&self) -> Option<&Path> {
-        match self {
-            Self::Ignore(err) => {
-                if let ignore::Error::WithPath { path, .. } = err {
-                    Some(path.as_path())
-                } else {
-                    None
-                }
-            }
-            Self::Panic(path, _)
-            | Self::Read(path, _)
-            | Self::Format(path, _)
-            | Self::Write(path, _)
-            | Self::Diff(path, _) => path.as_deref(),
-        }
-    }
 }

 impl Display for FormatCommandError {
@@ -633,7 +302,7 @@ impl Display for FormatCommandError {
                    write!(f, "{}{} {err}", "Failed to write".bold(), ":".bold())
                }
            }
-            Self::Format(path, err) => {
+            Self::FormatModule(path, err) => {
                if let Some(path) = path {
                    write!(
                        f,
@@ -646,24 +315,6 @@ impl Display for FormatCommandError {
                    write!(f, "{}{} {err}", "Failed to format".bold(), ":".bold())
                }
            }
-            Self::Diff(path, err) => {
-                if let Some(path) = path {
-                    write!(
-                        f,
-                        "{}{}{} {err}",
-                        "Failed to generate diff for ".bold(),
-                        fs::relativize_path(path).bold(),
-                        ":".bold()
-                    )
-                } else {
-                    write!(
-                        f,
-                        "{}{} {err}",
-                        "Failed to generate diff".bold(),
-                        ":".bold()
-                    )
-                }
-            }
            Self::Panic(path, err) => {
                let message = r#"This indicates a bug in Ruff. If you could open an issue at:

@@ -690,120 +341,3 @@ impl Display for FormatCommandError {
        }
    }
 }
-
-pub(super) fn warn_incompatible_formatter_settings(
-    pyproject_config: &PyprojectConfig,
-    resolver: Option<&Resolver>,
-) {
-    for setting in std::iter::once(&pyproject_config.settings)
-        .chain(resolver.iter().flat_map(|resolver| resolver.settings()))
-    {
-        let mut incompatible_rules = Vec::new();
-
-        for rule in [
-            // The formatter might collapse implicit string concatenation on a single line.
-            Rule::SingleLineImplicitStringConcatenation,
-            // Flags missing trailing commas when all arguments are on its own line:
-            // ```python
-            // def args(
-            //     aaaaaaaa, bbbbbbbbb, cccccccccc, ddddddddd, eeeeeeee, ffffff, gggggggggggg, hhhh
-            // ):
-            //     pass
-            // ```
-            Rule::MissingTrailingComma,
-        ] {
-            if setting.linter.rules.enabled(rule) {
-                incompatible_rules.push(rule);
-            }
-        }
-
-        // Rules asserting for space indentation
-        if setting.formatter.indent_style.is_tab() {
-            for rule in [Rule::TabIndentation, Rule::IndentWithSpaces] {
-                if setting.linter.rules.enabled(rule) {
-                    incompatible_rules.push(rule);
-                }
-            }
-        }
-
-        // Rules asserting for indent-width=4
-        if setting.formatter.indent_width.value() != 4 {
-            for rule in [
-                Rule::IndentationWithInvalidMultiple,
-                Rule::IndentationWithInvalidMultipleComment,
-            ] {
-                if setting.linter.rules.enabled(rule) {
-                    incompatible_rules.push(rule);
-                }
-            }
-        }
-
-        if !incompatible_rules.is_empty() {
-            let mut rule_names: Vec<_> = incompatible_rules
-                .into_iter()
-                .map(|rule| format!("`{}`", rule.noqa_code()))
-                .collect();
-            rule_names.sort();
-            warn!("The following rules may cause conflicts when used with the formatter: {}. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding then to the `ignore` configuration.", rule_names.join(", "));
-        }
-
-        // Rules with different quote styles.
-        if setting
-            .linter
-            .rules
-            .any_enabled(&[Rule::BadQuotesInlineString, Rule::AvoidableEscapedQuote])
-        {
-            match (
-                setting.linter.flake8_quotes.inline_quotes,
-                setting.formatter.quote_style,
-            ) {
-                (Quote::Double, QuoteStyle::Single) => {
-                    warn!("The `flake8-quotes.inline-quotes=\"double\"` option is incompatible with the formatter's `format.quote-style=\"single\"`. We recommend disabling `Q000` and `Q003` when using the formatter, which enforces a consistent quote style. Alternatively, set both options to either `\"single\"` or `\"double\"`.");
-                }
-                (Quote::Single, QuoteStyle::Double) => {
-                    warn!("The `flake8-quotes.inline-quotes=\"single\"` option is incompatible with the formatter's `format.quote-style=\"double\"`. We recommend disabling `Q000` and `Q003` when using the formatter, which enforces a consistent quote style. Alternatively, set both options to either `\"single\"` or `\"double\"`.");
-                }
-                _ => {}
-            }
-        }
-
-        if setting.linter.rules.enabled(Rule::BadQuotesMultilineString)
-            && setting.linter.flake8_quotes.multiline_quotes == Quote::Single
-        {
-            warn!("The `flake8-quotes.multiline-quotes=\"single\"` option is incompatible with the formatter. We recommend disabling `Q001` when using the formatter, which enforces double quotes for multiline strings. Alternatively, set the `flake8-quotes.multiline-quotes` option to `\"double\"`.`");
-        }
-
-        if setting.linter.rules.enabled(Rule::BadQuotesDocstring)
-            && setting.linter.flake8_quotes.docstring_quotes == Quote::Single
-        {
-            warn!("The `flake8-quotes.multiline-quotes=\"single\"` option is incompatible with the formatter. We recommend disabling `Q002` when using the formatter, which enforces double quotes for docstrings. Alternatively, set the `flake8-quotes.docstring-quotes` option to `\"double\"`.`");
-        }
-
-        if setting.linter.rules.enabled(Rule::UnsortedImports) {
-            // The formatter removes empty lines if the value is larger than 2 but always inserts a empty line after imports.
-            // Two empty lines are okay because `isort` only uses this setting for top-level imports (not in nested blocks).
-            if !matches!(setting.linter.isort.lines_after_imports, 1 | 2 | -1) {
-                warn!("The isort option `isort.lines-after-imports` with a value other than `-1`, `1` or `2` is incompatible with the formatter. To avoid unexpected behavior, we recommend setting the option to one of: `2`, `1`, or `-1` (default).");
-            }
-
-            // Values larger than two get reduced to one line by the formatter if the import is in a nested block.
-            if setting.linter.isort.lines_between_types > 1 {
-                warn!("The isort option `isort.lines-between-types` with a value greater than 1 is incompatible with the formatter. To avoid unexpected behavior, we recommend setting the option to one of: `1` or `0` (default).");
-            }
-
-            // isort inserts a trailing comma which the formatter preserves, but only if `skip-magic-trailing-comma` isn't false.
-            // This isn't relevant when using `force-single-line`, since isort will never include a trailing comma in that case.
-            if setting.formatter.magic_trailing_comma.is_ignore()
-                && !setting.linter.isort.force_single_line
-            {
-                if setting.linter.isort.force_wrap_aliases {
-                    warn!("The isort option `isort.force-wrap-aliases` is incompatible with the formatter `format.skip-magic-trailing-comma=true` option. To avoid unexpected behavior, we recommend either setting `isort.force-wrap-aliases=false` or `format.skip-magic-trailing-comma=false`.");
-                }
-
-                if setting.linter.isort.split_on_trailing_comma {
-                    warn!("The isort option `isort.split-on-trailing-comma` is incompatible with the formatter `format.skip-magic-trailing-comma=true` option. To avoid unexpected behavior, we recommend either setting `isort.split-on-trailing-comma=false` or `format.skip-magic-trailing-comma=false`.");
-                }
-            }
-        }
-    }
-}
--- a/crates/ruff_cli/src/commands/format_stdin.rs
+++ b/crates/ruff_cli/src/commands/format_stdin.rs
@@ -1,19 +1,17 @@
-use std::io::stdout;
+use std::io::{stdout, Write};
 use std::path::Path;

 use anyhow::Result;
-use log::error;
+use log::warn;

-use ruff_linter::source_kind::SourceKind;
-use ruff_python_ast::{PySourceType, SourceType};
-use ruff_workspace::resolver::{match_exclusion, python_file_at_path};
-use ruff_workspace::FormatterSettings;
+use ruff_python_ast::PySourceType;
+use ruff_python_formatter::{
+    format_module_source, format_module_source_range, LspRowColumn, PyFormatOptions,
+};
+use ruff_workspace::resolver::python_file_at_path;

 use crate::args::{CliOverrides, FormatArguments};
-use crate::commands::format::{
-    format_source, warn_incompatible_formatter_settings, FormatCommandError, FormatMode,
-    FormatResult, FormattedSource,
-};
+use crate::commands::format::{FormatCommandError, FormatCommandResult, FormatMode};
 use crate::resolve::resolve;
 use crate::stdin::read_from_stdin;
 use crate::ExitStatus;
@@ -26,41 +24,30 @@ pub(crate) fn format_stdin(cli: &FormatArguments, overrides: &CliOverrides) -> R
        overrides,
        cli.stdin_filename.as_deref(),
    )?;
-
-    warn_incompatible_formatter_settings(&pyproject_config, None);
-
-    let mode = FormatMode::from_cli(cli);
+    let mode = if cli.check {
+        FormatMode::Check
+    } else {
+        FormatMode::Write
+    };

    if let Some(filename) = cli.stdin_filename.as_deref() {
        if !python_file_at_path(filename, &pyproject_config, overrides)? {
            return Ok(ExitStatus::Success);
        }
-
-        let format_settings = &pyproject_config.settings.formatter;
-        if filename
-            .file_name()
-            .is_some_and(|name| match_exclusion(filename, name, &format_settings.exclude))
-        {
-            return Ok(ExitStatus::Success);
-        }
    }

+    // Format the file.
    let path = cli.stdin_filename.as_deref();

-    let SourceType::Python(source_type) = path.map(SourceType::from).unwrap_or_default() else {
-        return Ok(ExitStatus::Success);
-    };
+    let options = pyproject_config
+        .settings
+        .formatter
+        .to_format_options(path.map(PySourceType::from).unwrap_or_default());

-    // Format the file.
-    match format_source_code(
-        path,
-        &pyproject_config.settings.formatter,
-        source_type,
-        mode,
-    ) {
+    match format_source(path, options, mode, cli.start, cli.end) {
        Ok(result) => match mode {
            FormatMode::Write => Ok(ExitStatus::Success),
-            FormatMode::Check | FormatMode::Diff => {
+            FormatMode::Check => {
                if result.is_formatted() {
                    Ok(ExitStatus::Failure)
                } else {
@@ -69,59 +56,41 @@ pub(crate) fn format_stdin(cli: &FormatArguments, overrides: &CliOverrides) -> R
            }
        },
        Err(err) => {
-            error!("{err}");
+            warn!("{err}");
            Ok(ExitStatus::Error)
        }
    }
 }

 /// Format source code read from `stdin`.
-fn format_source_code(
+fn format_source(
    path: Option<&Path>,
-    settings: &FormatterSettings,
-    source_type: PySourceType,
+    options: PyFormatOptions,
    mode: FormatMode,
-) -> Result<FormatResult, FormatCommandError> {
-    // Read the source from stdin.
-    let source_code = read_from_stdin()
-        .map_err(|err| FormatCommandError::Read(path.map(Path::to_path_buf), err.into()))?;
-
-    let source_kind = match SourceKind::from_source_code(source_code, source_type) {
-        Ok(Some(source_kind)) => source_kind,
-        Ok(None) => return Ok(FormatResult::Unchanged),
-        Err(err) => {
-            return Err(FormatCommandError::Read(path.map(Path::to_path_buf), err));
-        }
+    start: Option<LspRowColumn>,
+    end: Option<LspRowColumn>,
+) -> Result<FormatCommandResult, FormatCommandError> {
+    let unformatted = read_from_stdin()
+        .map_err(|err| FormatCommandError::Read(path.map(Path::to_path_buf), err))?;
+    let formatted = if start.is_some() || end.is_some() {
+        let formatted = format_module_source_range(&unformatted, options, start, end)
+            .map_err(|err| FormatCommandError::FormatModule(path.map(Path::to_path_buf), err))?;
+        formatted
+    } else {
+        let formatted = format_module_source(&unformatted, options)
+            .map_err(|err| FormatCommandError::FormatModule(path.map(Path::to_path_buf), err))?;
+        let formatted = formatted.as_code();
+        formatted.to_string()
    };
-
-    // Format the source.
-    let formatted = format_source(&source_kind, source_type, path, settings)?;
-
-    match &formatted {
-        FormattedSource::Formatted(formatted) => match mode {
-            FormatMode::Write => {
-                let mut writer = stdout().lock();
-                formatted
-                    .write(&mut writer)
-                    .map_err(|err| FormatCommandError::Write(path.map(Path::to_path_buf), err))?;
-            }
-            FormatMode::Check => {}
-            FormatMode::Diff => {
-                source_kind
-                    .diff(formatted, path, &mut stdout().lock())
-                    .map_err(|err| FormatCommandError::Diff(path.map(Path::to_path_buf), err))?;
-            }
-        },
-        FormattedSource::Unchanged => {
-            // Write to stdout regardless of whether the source was formatted
-            if mode.is_write() {
-                let mut writer = stdout().lock();
-                source_kind
-                    .write(&mut writer)
-                    .map_err(|err| FormatCommandError::Write(path.map(Path::to_path_buf), err))?;
-            }
+    if formatted.len() == unformatted.len() && formatted == unformatted {
+        Ok(FormatCommandResult::Unchanged)
+    } else {
+        if mode.is_write() {
+            stdout()
+                .lock()
+                .write_all(formatted.as_bytes())
+                .map_err(|err| FormatCommandError::Write(path.map(Path::to_path_buf), err))?;
        }
+        Ok(FormatCommandResult::Formatted)
    }
-
-    Ok(FormatResult::from(formatted))
 }
--- a/crates/ruff_cli/src/commands/mod.rs
+++ b/crates/ruff_cli/src/commands/mod.rs
@@ -9,4 +9,3 @@ pub(crate) mod linter;
 pub(crate) mod rule;
 pub(crate) mod show_files;
 pub(crate) mod show_settings;
-pub(crate) mod version;
--- a/crates/ruff_cli/src/commands/rule.rs
+++ b/crates/ruff_cli/src/commands/rule.rs
@@ -5,7 +5,7 @@ use serde::ser::SerializeSeq;
 use serde::{Serialize, Serializer};
 use strum::IntoEnumIterator;

-use ruff_diagnostics::FixAvailability;
+use ruff_diagnostics::AutofixKind;
 use ruff_linter::registry::{Linter, Rule, RuleNamespace};

 use crate::args::HelpFormat;
@@ -17,7 +17,7 @@ struct Explanation<'a> {
    linter: &'a str,
    summary: &'a str,
    message_formats: &'a [&'a str],
-    fix: String,
+    autofix: String,
    explanation: Option<&'a str>,
    preview: bool,
 }
@@ -26,16 +26,16 @@ impl<'a> Explanation<'a> {
    fn from_rule(rule: &'a Rule) -> Self {
        let code = rule.noqa_code().to_string();
        let (linter, _) = Linter::parse_code(&code).unwrap();
-        let fix = rule.fixable().to_string();
+        let autofix = rule.autofixable().to_string();
        Self {
            name: rule.as_ref(),
            code,
            linter: linter.name(),
            summary: rule.message_formats()[0],
            message_formats: rule.message_formats(),
-            fix,
+            autofix,
            explanation: rule.explanation(),
-            preview: rule.is_preview() || rule.is_nursery(),
+            preview: rule.is_preview(),
        }
    }
 }
@@ -51,17 +51,14 @@ fn format_rule_text(rule: Rule) -> String {
    output.push('\n');
    output.push('\n');

-    let fix_availability = rule.fixable();
-    if matches!(
-        fix_availability,
-        FixAvailability::Always | FixAvailability::Sometimes
-    ) {
-        output.push_str(&fix_availability.to_string());
+    let autofix = rule.autofixable();
+    if matches!(autofix, AutofixKind::Always | AutofixKind::Sometimes) {
+        output.push_str(&autofix.to_string());
        output.push('\n');
        output.push('\n');
    }

-    if rule.is_preview() || rule.is_nursery() {
+    if rule.is_preview() {
        output.push_str(
            r#"This rule is in preview and is not stable. The `--preview` flag is required for use."#,
        );
--- a/crates/ruff_cli/src/commands/show_files.rs
+++ b/crates/ruff_cli/src/commands/show_files.rs
@@ -5,7 +5,7 @@ use anyhow::Result;
 use itertools::Itertools;

 use ruff_linter::warn_user_once;
-use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig, ResolvedFile};
+use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig};

 use crate::args::CliOverrides;

@@ -25,13 +25,12 @@ pub(crate) fn show_files(
    }

    // Print the list of files.
-    for path in paths
-        .into_iter()
+    for entry in paths
+        .iter()
        .flatten()
-        .map(ResolvedFile::into_path)
-        .sorted_unstable()
+        .sorted_by(|a, b| a.path().cmp(b.path()))
    {
-        writeln!(writer, "{}", path.to_string_lossy())?;
+        writeln!(writer, "{}", entry.path().to_string_lossy())?;
    }

    Ok(())
--- a/crates/ruff_cli/src/commands/show_settings.rs
+++ b/crates/ruff_cli/src/commands/show_settings.rs
@@ -4,7 +4,7 @@ use std::path::PathBuf;
 use anyhow::{bail, Result};
 use itertools::Itertools;

-use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig, ResolvedFile};
+use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig};

 use crate::args::CliOverrides;

@@ -19,17 +19,16 @@ pub(crate) fn show_settings(
    let (paths, resolver) = python_files_in_path(files, pyproject_config, overrides)?;

    // Print the list of files.
-    let Some(path) = paths
-        .into_iter()
+    let Some(entry) = paths
+        .iter()
        .flatten()
-        .map(ResolvedFile::into_path)
-        .sorted_unstable()
+        .sorted_by(|a, b| a.path().cmp(b.path()))
        .next()
    else {
        bail!("No files found under the given path");
    };
-
-    let settings = resolver.resolve(&path, pyproject_config);
+    let path = entry.path();
+    let settings = resolver.resolve(path, pyproject_config);

    writeln!(writer, "Resolved settings for: {path:?}")?;
    if let Some(settings_path) = pyproject_config.path.as_ref() {
--- a/crates/ruff_cli/src/commands/version.rs
+++ b/crates/ruff_cli/src/commands/version.rs
@@ -1,21 +0,0 @@
-use std::io::{self, BufWriter, Write};
-
-use anyhow::Result;
-
-use crate::args::HelpFormat;
-
-/// Display version information
-pub(crate) fn version(output_format: HelpFormat) -> Result<()> {
-    let mut stdout = BufWriter::new(io::stdout().lock());
-    let version_info = crate::version::version();
-
-    match output_format {
-        HelpFormat::Text => {
-            writeln!(stdout, "ruff {}", &version_info)?;
-        }
-        HelpFormat::Json => {
-            serde_json::to_writer_pretty(stdout, &version_info)?;
-        }
-    };
-    Ok(())
-}
--- a/crates/ruff_cli/src/diagnostics.rs
+++ b/crates/ruff_cli/src/diagnostics.rs
@@ -1,37 +1,69 @@
 #![cfg_attr(target_family = "wasm", allow(dead_code))]

-use std::fs::File;
+use std::fs::{write, File};
 use std::io;
-use std::ops::{Add, AddAssign};
+use std::io::{BufWriter, Write};
+use std::ops::AddAssign;
+#[cfg(unix)]
+use std::os::unix::fs::PermissionsExt;
 use std::path::Path;

-use anyhow::{Context, Result};
+use anyhow::{anyhow, Context, Result};
 use colored::Colorize;
+use filetime::FileTime;
 use log::{debug, error, warn};
 use rustc_hash::FxHashMap;
+use similar::TextDiff;
+use thiserror::Error;

-use crate::cache::{Cache, FileCacheKey, LintCacheData};
 use ruff_diagnostics::Diagnostic;
 use ruff_linter::linter::{lint_fix, lint_only, FixTable, FixerResult, LinterResult};
 use ruff_linter::logging::DisplayParseError;
 use ruff_linter::message::Message;
 use ruff_linter::pyproject_toml::lint_pyproject_toml;
 use ruff_linter::registry::AsRule;
-use ruff_linter::settings::types::UnsafeFixes;
 use ruff_linter::settings::{flags, LinterSettings};
-use ruff_linter::source_kind::{SourceError, SourceKind};
+use ruff_linter::source_kind::SourceKind;
 use ruff_linter::{fs, IOError, SyntaxError};
-use ruff_notebook::{Notebook, NotebookError, NotebookIndex};
+use ruff_macros::CacheKey;
+use ruff_notebook::{Cell, Notebook, NotebookError, NotebookIndex};
 use ruff_python_ast::imports::ImportMap;
-use ruff_python_ast::{SourceType, TomlSourceType};
+use ruff_python_ast::{PySourceType, SourceType, TomlSourceType};
 use ruff_source_file::{LineIndex, SourceCode, SourceFileBuilder};
 use ruff_text_size::{TextRange, TextSize};
 use ruff_workspace::Settings;

+use crate::cache::Cache;
+
+#[derive(CacheKey)]
+pub(crate) struct FileCacheKey {
+    /// Timestamp when the file was last modified before the (cached) check.
+    file_last_modified: FileTime,
+    /// Permissions of the file before the (cached) check.
+    file_permissions_mode: u32,
+}
+
+impl FileCacheKey {
+    fn from_path(path: &Path) -> io::Result<FileCacheKey> {
+        // Construct a cache key for the file
+        let metadata = path.metadata()?;
+
+        #[cfg(unix)]
+        let permissions = metadata.permissions().mode();
+        #[cfg(windows)]
+        let permissions: u32 = metadata.permissions().readonly().into();
+
+        Ok(FileCacheKey {
+            file_last_modified: FileTime::from_last_modification_time(&metadata),
+            file_permissions_mode: permissions,
+        })
+    }
+}
+
 #[derive(Debug, Default, PartialEq)]
 pub(crate) struct Diagnostics {
    pub(crate) messages: Vec<Message>,
-    pub(crate) fixed: FixMap,
+    pub(crate) fixed: FxHashMap<String, FixTable>,
    pub(crate) imports: ImportMap,
    pub(crate) notebook_indexes: FxHashMap<String, NotebookIndex>,
 }
@@ -44,44 +76,21 @@ impl Diagnostics {
    ) -> Self {
        Self {
            messages,
-            fixed: FixMap::default(),
+            fixed: FxHashMap::default(),
            imports,
            notebook_indexes,
        }
    }

-    /// Generate [`Diagnostics`] based on a [`SourceError`].
+    /// Generate [`Diagnostics`] based on a [`SourceExtractionError`].
    pub(crate) fn from_source_error(
-        err: &SourceError,
+        err: &SourceExtractionError,
        path: Option<&Path>,
        settings: &LinterSettings,
    ) -> Self {
-        let diagnostic = match err {
-            // IO errors.
-            SourceError::Io(_)
-            | SourceError::Notebook(NotebookError::Io(_) | NotebookError::Json(_)) => {
-                Diagnostic::new(
-                    IOError {
-                        message: err.to_string(),
-                    },
-                    TextRange::default(),
-                )
-            }
-            // Syntax errors.
-            SourceError::Notebook(
-                NotebookError::InvalidJson(_)
-                | NotebookError::InvalidSchema(_)
-                | NotebookError::InvalidFormat(_),
-            ) => Diagnostic::new(
-                SyntaxError {
-                    message: err.to_string(),
-                },
-                TextRange::default(),
-            ),
-        };
-
+        let diagnostic = Diagnostic::from(err);
        if settings.rules.enabled(diagnostic.kind.rule()) {
-            let name = path.map_or_else(|| "-".into(), Path::to_string_lossy);
+            let name = path.map_or_else(|| "-".into(), std::path::Path::to_string_lossy);
            let dummy = SourceFileBuilder::new(name, "").finish();
            Self::new(
                vec![Message::from_diagnostic(
@@ -112,68 +121,22 @@ impl Diagnostics {
    }
 }

-impl Add for Diagnostics {
-    type Output = Diagnostics;
-
-    fn add(mut self, other: Self) -> Self::Output {
-        self += other;
-        self
-    }
-}
-
 impl AddAssign for Diagnostics {
    fn add_assign(&mut self, other: Self) {
        self.messages.extend(other.messages);
        self.imports.extend(other.imports);
-        self.fixed += other.fixed;
-        self.notebook_indexes.extend(other.notebook_indexes);
-    }
-}
-
-/// A collection of fixes indexed by file path.
-#[derive(Debug, Default, PartialEq)]
-pub(crate) struct FixMap(FxHashMap<String, FixTable>);
-
-impl FixMap {
-    /// Returns `true` if there are no fixes in the map.
-    pub(crate) fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-
-    /// Returns an iterator over the fixes in the map, along with the file path.
-    pub(crate) fn iter(&self) -> impl Iterator<Item = (&String, &FixTable)> {
-        self.0.iter()
-    }
-
-    /// Returns an iterator over the fixes in the map.
-    pub(crate) fn values(&self) -> impl Iterator<Item = &FixTable> {
-        self.0.values()
-    }
-}
-
-impl FromIterator<(String, FixTable)> for FixMap {
-    fn from_iter<T: IntoIterator<Item = (String, FixTable)>>(iter: T) -> Self {
-        Self(
-            iter.into_iter()
-                .filter(|(_, fixes)| !fixes.is_empty())
-                .collect(),
-        )
-    }
-}
-
-impl AddAssign for FixMap {
-    fn add_assign(&mut self, rhs: Self) {
-        for (filename, fixed) in rhs.0 {
+        for (filename, fixed) in other.fixed {
            if fixed.is_empty() {
                continue;
            }
-            let fixed_in_file = self.0.entry(filename).or_default();
+            let fixed_in_file = self.fixed.entry(filename).or_default();
            for (rule, count) in fixed {
                if count > 0 {
                    *fixed_in_file.entry(rule).or_default() += count;
                }
            }
        }
+        self.notebook_indexes.extend(other.notebook_indexes);
    }
 }

@@ -184,8 +147,7 @@ pub(crate) fn lint_path(
    settings: &LinterSettings,
    cache: Option<&Cache>,
    noqa: flags::Noqa,
-    fix_mode: flags::FixMode,
-    unsafe_fixes: UnsafeFixes,
+    autofix: flags::FixMode,
 ) -> Result<Diagnostics> {
    // Check the cache.
    // TODO(charlie): `fixer::Mode::Apply` and `fixer::Mode::Diff` both have
@@ -194,17 +156,15 @@ pub(crate) fn lint_path(
    // write the fixes to disk, thus invalidating the cache. But it's a bit hard
    // to reason about. We need to come up with a better solution here.)
    let caching = match cache {
-        Some(cache) if noqa.into() && fix_mode.is_generate() => {
+        Some(cache) if noqa.into() && autofix.is_generate() => {
            let relative_path = cache
                .relative_path(path)
                .expect("wrong package cache for file");

            let cache_key = FileCacheKey::from_path(path).context("Failed to create cache key")?;
-            let cached_diagnostics = cache
-                .get(relative_path, &cache_key)
-                .and_then(|entry| entry.to_diagnostics(path));
-            if let Some(diagnostics) = cached_diagnostics {
-                return Ok(diagnostics);
+
+            if let Some(cache) = cache.get(relative_path, &cache_key) {
+                return Ok(cache.as_diagnostics(path));
            }

            // Stash the file metadata for later so when we update the cache it reflects the prerun
@@ -223,12 +183,13 @@ pub(crate) fn lint_path(
                .iter_enabled()
                .any(|rule_code| rule_code.lint_source().is_pyproject_toml())
            {
-                let contents = match std::fs::read_to_string(path).map_err(SourceError::from) {
-                    Ok(contents) => contents,
-                    Err(err) => {
-                        return Ok(Diagnostics::from_source_error(&err, Some(path), settings));
-                    }
-                };
+                let contents =
+                    match std::fs::read_to_string(path).map_err(SourceExtractionError::Io) {
+                        Ok(contents) => contents,
+                        Err(err) => {
+                            return Ok(Diagnostics::from_source_error(&err, Some(path), settings));
+                        }
+                    };
                let source_file = SourceFileBuilder::new(path.to_string_lossy(), contents).finish();
                lint_pyproject_toml(source_file, settings)
            } else {
@@ -244,8 +205,8 @@ pub(crate) fn lint_path(
    };

    // Extract the sources from the file.
-    let source_kind = match SourceKind::from_path(path, source_type) {
-        Ok(Some(source_kind)) => source_kind,
+    let LintSource(source_kind) = match LintSource::try_from_path(path, source_type) {
+        Ok(Some(sources)) => sources,
        Ok(None) => return Ok(Diagnostics::default()),
        Err(err) => {
            return Ok(Diagnostics::from_source_error(&err, Some(path), settings));
@@ -259,36 +220,89 @@ pub(crate) fn lint_path(
            error: parse_error,
        },
        fixed,
-    ) = if matches!(fix_mode, flags::FixMode::Apply | flags::FixMode::Diff) {
+    ) = if matches!(autofix, flags::FixMode::Apply | flags::FixMode::Diff) {
        if let Ok(FixerResult {
            result,
            transformed,
            fixed,
-        }) = lint_fix(
-            path,
-            package,
-            noqa,
-            unsafe_fixes,
-            settings,
-            &source_kind,
-            source_type,
-        ) {
+        }) = lint_fix(path, package, noqa, settings, &source_kind, source_type)
+        {
            if !fixed.is_empty() {
-                match fix_mode {
-                    flags::FixMode::Apply => transformed.write(&mut File::create(path)?)?,
+                match autofix {
+                    flags::FixMode::Apply => match transformed.as_ref() {
+                        SourceKind::Python(transformed) => {
+                            write(path, transformed.as_bytes())?;
+                        }
+                        SourceKind::IpyNotebook(notebook) => {
+                            let mut writer = BufWriter::new(File::create(path)?);
+                            notebook.write(&mut writer)?;
+                        }
+                    },
                    flags::FixMode::Diff => {
-                        source_kind.diff(
-                            transformed.as_ref(),
-                            Some(path),
-                            &mut io::stdout().lock(),
-                        )?;
+                        match transformed.as_ref() {
+                            SourceKind::Python(transformed) => {
+                                let mut stdout = io::stdout().lock();
+                                TextDiff::from_lines(source_kind.source_code(), transformed)
+                                    .unified_diff()
+                                    .header(&fs::relativize_path(path), &fs::relativize_path(path))
+                                    .to_writer(&mut stdout)?;
+                                stdout.write_all(b"\n")?;
+                                stdout.flush()?;
+                            }
+                            SourceKind::IpyNotebook(dest_notebook) => {
+                                // We need to load the notebook again, since we might've
+                                // mutated it.
+                                let src_notebook = source_kind.as_ipy_notebook().unwrap();
+                                let mut stdout = io::stdout().lock();
+                                for ((idx, src_cell), dest_cell) in src_notebook
+                                    .cells()
+                                    .iter()
+                                    .enumerate()
+                                    .zip(dest_notebook.cells().iter())
+                                {
+                                    let (Cell::Code(src_code_cell), Cell::Code(dest_code_cell)) =
+                                        (src_cell, dest_cell)
+                                    else {
+                                        continue;
+                                    };
+                                    TextDiff::from_lines(
+                                        &src_code_cell.source.to_string(),
+                                        &dest_code_cell.source.to_string(),
+                                    )
+                                    .unified_diff()
+                                    // Jupyter notebook cells don't necessarily have a newline
+                                    // at the end. For example,
+                                    //
+                                    // ```python
+                                    // print("hello")
+                                    // ```
+                                    //
+                                    // For a cell containing the above code, there'll only be one line,
+                                    // and it won't have a newline at the end. If it did, there'd be
+                                    // two lines, and the second line would be empty:
+                                    //
+                                    // ```python
+                                    // print("hello")
+                                    //
+                                    // ```
+                                    .missing_newline_hint(false)
+                                    .header(
+                                        &format!("{}:cell {}", &fs::relativize_path(path), idx),
+                                        &format!("{}:cell {}", &fs::relativize_path(path), idx),
+                                    )
+                                    .to_writer(&mut stdout)?;
+                                }
+                                stdout.write_all(b"\n")?;
+                                stdout.flush()?;
+                            }
+                        }
                    }
                    flags::FixMode::Generate => {}
                }
            }
            (result, fixed)
        } else {
-            // If we fail to fix, lint the original source code.
+            // If we fail to autofix, lint the original source code.
            let result = lint_only(path, package, settings, noqa, &source_kind, source_type);
            let fixed = FxHashMap::default();
            (result, fixed)
@@ -304,14 +318,12 @@ pub(crate) fn lint_path(
    if let Some((cache, relative_path, key)) = caching {
        // We don't cache parsing errors.
        if parse_error.is_none() {
-            cache.update_lint(
+            cache.update(
                relative_path.to_owned(),
-                &key,
-                LintCacheData::from_messages(
-                    &messages,
-                    imports.clone(),
-                    source_kind.as_ipy_notebook().map(Notebook::index).cloned(),
-                ),
+                key,
+                &messages,
+                &imports,
+                source_kind.as_ipy_notebook().map(Notebook::index),
            );
        }
    }
@@ -331,14 +343,20 @@ pub(crate) fn lint_path(
    }

    let notebook_indexes = if let SourceKind::IpyNotebook(notebook) = source_kind {
-        FxHashMap::from_iter([(path.to_string_lossy().to_string(), notebook.into_index())])
+        FxHashMap::from_iter([(
+            path.to_str()
+                .ok_or_else(|| anyhow!("Unable to parse filename: {:?}", path))?
+                .to_string(),
+            // Index needs to be computed always to store in cache.
+            notebook.index().clone(),
+        )])
    } else {
        FxHashMap::default()
    };

    Ok(Diagnostics {
        messages,
-        fixed: FixMap::from_iter([(fs::relativize_path(path), fixed)]),
+        fixed: FxHashMap::from_iter([(fs::relativize_path(path), fixed)]),
        imports,
        notebook_indexes,
    })
@@ -352,7 +370,7 @@ pub(crate) fn lint_stdin(
    contents: String,
    settings: &Settings,
    noqa: flags::Noqa,
-    fix_mode: flags::FixMode,
+    autofix: flags::FixMode,
 ) -> Result<Diagnostics> {
    // TODO(charlie): Support `pyproject.toml`.
    let SourceType::Python(source_type) = path.map(SourceType::from).unwrap_or_default() else {
@@ -360,8 +378,8 @@ pub(crate) fn lint_stdin(
    };

    // Extract the sources from the file.
-    let source_kind = match SourceKind::from_source_code(contents, source_type) {
-        Ok(Some(source_kind)) => source_kind,
+    let LintSource(source_kind) = match LintSource::try_from_source_code(contents, source_type) {
+        Ok(Some(sources)) => sources,
        Ok(None) => return Ok(Diagnostics::default()),
        Err(err) => {
            return Ok(Diagnostics::from_source_error(&err, path, &settings.linter));
@@ -375,7 +393,7 @@ pub(crate) fn lint_stdin(
            error: parse_error,
        },
        fixed,
-    ) = if matches!(fix_mode, flags::FixMode::Apply | flags::FixMode::Diff) {
+    ) = if matches!(autofix, flags::FixMode::Apply | flags::FixMode::Diff) {
        if let Ok(FixerResult {
            result,
            transformed,
@@ -384,20 +402,32 @@ pub(crate) fn lint_stdin(
            path.unwrap_or_else(|| Path::new("-")),
            package,
            noqa,
-            settings.unsafe_fixes,
            &settings.linter,
            &source_kind,
            source_type,
        ) {
-            match fix_mode {
+            match autofix {
                flags::FixMode::Apply => {
                    // Write the contents to stdout, regardless of whether any errors were fixed.
-                    transformed.write(&mut io::stdout().lock())?;
+                    io::stdout().write_all(transformed.source_code().as_bytes())?;
                }
                flags::FixMode::Diff => {
                    // But only write a diff if it's non-empty.
                    if !fixed.is_empty() {
-                        source_kind.diff(transformed.as_ref(), path, &mut io::stdout().lock())?;
+                        let text_diff = TextDiff::from_lines(
+                            source_kind.source_code(),
+                            transformed.source_code(),
+                        );
+                        let mut unified_diff = text_diff.unified_diff();
+                        if let Some(path) = path {
+                            unified_diff
+                                .header(&fs::relativize_path(path), &fs::relativize_path(path));
+                        }
+
+                        let mut stdout = io::stdout().lock();
+                        unified_diff.to_writer(&mut stdout)?;
+                        stdout.write_all(b"\n")?;
+                        stdout.flush()?;
                    }
                }
                flags::FixMode::Generate => {}
@@ -405,7 +435,7 @@ pub(crate) fn lint_stdin(

            (result, fixed)
        } else {
-            // If we fail to fix, lint the original source code.
+            // If we fail to autofix, lint the original source code.
            let result = lint_only(
                path.unwrap_or_else(|| Path::new("-")),
                package,
@@ -417,8 +447,8 @@ pub(crate) fn lint_stdin(
            let fixed = FxHashMap::default();

            // Write the contents to stdout anyway.
-            if fix_mode.is_apply() {
-                source_kind.write(&mut io::stdout().lock())?;
+            if autofix.is_apply() {
+                io::stdout().write_all(source_kind.source_code().as_bytes())?;
            }

            (result, fixed)
@@ -445,22 +475,90 @@ pub(crate) fn lint_stdin(
        );
    }

-    let notebook_indexes = if let SourceKind::IpyNotebook(notebook) = source_kind {
-        FxHashMap::from_iter([(
-            path.map_or_else(|| "-".into(), |path| path.to_string_lossy().to_string()),
-            notebook.into_index(),
-        )])
-    } else {
-        FxHashMap::default()
-    };
-
    Ok(Diagnostics {
        messages,
-        fixed: FixMap::from_iter([(
+        fixed: FxHashMap::from_iter([(
            fs::relativize_path(path.unwrap_or_else(|| Path::new("-"))),
            fixed,
        )]),
        imports,
-        notebook_indexes,
+        notebook_indexes: FxHashMap::default(),
    })
 }
+
+#[derive(Debug)]
+pub(crate) struct LintSource(pub(crate) SourceKind);
+
+impl LintSource {
+    /// Extract the lint [`LintSource`] from the given file path.
+    pub(crate) fn try_from_path(
+        path: &Path,
+        source_type: PySourceType,
+    ) -> Result<Option<LintSource>, SourceExtractionError> {
+        if source_type.is_ipynb() {
+            let notebook = Notebook::from_path(path)?;
+            Ok(notebook
+                .is_python_notebook()
+                .then_some(LintSource(SourceKind::IpyNotebook(notebook))))
+        } else {
+            // This is tested by ruff_cli integration test `unreadable_file`
+            let contents = std::fs::read_to_string(path)?;
+            Ok(Some(LintSource(SourceKind::Python(contents))))
+        }
+    }
+
+    /// Extract the lint [`LintSource`] from the raw string contents, optionally accompanied by a
+    /// file path indicating the path to the file from which the contents were read. If provided,
+    /// the file path should be used for diagnostics, but not for reading the file from disk.
+    pub(crate) fn try_from_source_code(
+        source_code: String,
+        source_type: PySourceType,
+    ) -> Result<Option<LintSource>, SourceExtractionError> {
+        if source_type.is_ipynb() {
+            let notebook = Notebook::from_source_code(&source_code)?;
+            Ok(notebook
+                .is_python_notebook()
+                .then_some(LintSource(SourceKind::IpyNotebook(notebook))))
+        } else {
+            Ok(Some(LintSource(SourceKind::Python(source_code))))
+        }
+    }
+}
+
+#[derive(Error, Debug)]
+pub(crate) enum SourceExtractionError {
+    /// The extraction failed due to an [`io::Error`].
+    #[error(transparent)]
+    Io(#[from] io::Error),
+    /// The extraction failed due to a [`NotebookError`].
+    #[error(transparent)]
+    Notebook(#[from] NotebookError),
+}
+
+impl From<&SourceExtractionError> for Diagnostic {
+    fn from(err: &SourceExtractionError) -> Self {
+        match err {
+            // IO errors.
+            SourceExtractionError::Io(_)
+            | SourceExtractionError::Notebook(NotebookError::Io(_) | NotebookError::Json(_)) => {
+                Diagnostic::new(
+                    IOError {
+                        message: err.to_string(),
+                    },
+                    TextRange::default(),
+                )
+            }
+            // Syntax errors.
+            SourceExtractionError::Notebook(
+                NotebookError::InvalidJson(_)
+                | NotebookError::InvalidSchema(_)
+                | NotebookError::InvalidFormat(_),
+            ) => Diagnostic::new(
+                SyntaxError {
+                    message: err.to_string(),
+                },
+                TextRange::default(),
+            ),
+        }
+    }
+}
--- a/crates/ruff_cli/src/lib.rs
+++ b/crates/ruff_cli/src/lib.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::print_stdout)]
-
 use std::fs::File;
 use std::io::{self, stdout, BufWriter, Write};
 use std::path::{Path, PathBuf};
@@ -8,12 +6,11 @@ use std::sync::mpsc::channel;

 use anyhow::Result;
 use clap::CommandFactory;
-use colored::Colorize;
 use log::warn;
 use notify::{recommended_watcher, RecursiveMode, Watcher};

 use ruff_linter::logging::{set_up_logging, LogLevel};
-use ruff_linter::settings::flags::FixMode;
+use ruff_linter::settings::flags;
 use ruff_linter::settings::types::SerializationFormat;
 use ruff_linter::{fs, warn_user, warn_user_once};
 use ruff_workspace::Settings;
@@ -29,7 +26,6 @@ mod panic;
 mod printer;
 pub mod resolve;
 mod stdin;
-mod version;

 #[derive(Copy, Clone)]
 pub enum ExitStatus {
@@ -108,6 +104,8 @@ pub fn run(
    }: Args,
 ) -> Result<ExitStatus> {
    {
+        use colored::Colorize;
+
        let default_panic_hook = std::panic::take_hook();
        std::panic::set_hook(Box::new(move |info| {
            #[allow(clippy::print_stderr)]
@@ -137,10 +135,6 @@ pub fn run(
    set_up_logging(&log_level)?;

    match command {
-        Command::Version { output_format } => {
-            commands::version::version(output_format)?;
-            Ok(ExitStatus::Success)
-        }
        Command::Rule { rule, all, format } => {
            if all {
                commands::rule::rules(format)?;
@@ -172,6 +166,11 @@ pub fn run(
 }

 fn format(args: FormatCommand, log_level: LogLevel) -> Result<ExitStatus> {
+    warn_user_once!(
+        "`ruff format` is a work-in-progress, subject to change at any time, and intended only for \
+        experimentation."
+    );
+
    let (cli, overrides) = args.partition();

    if is_stdin(&cli.files, cli.stdin_filename.as_deref()) {
@@ -182,6 +181,14 @@ fn format(args: FormatCommand, log_level: LogLevel) -> Result<ExitStatus> {
 }

 pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
+    if args.format.is_some() {
+        if std::env::var("RUFF_FORMAT").is_ok() {
+            warn_user!("The environment variable `RUFF_FORMAT` is deprecated. Use `RUFF_OUTPUT_FORMAT` instead.");
+        } else {
+            warn_user!("The argument `--format=<FORMAT>` is deprecated. Use `--output-format=<FORMAT>` instead.");
+        }
+    }
+
    let (cli, overrides) = args.partition();

    // Construct the "default" settings. These are used when no `pyproject.toml`
@@ -201,7 +208,6 @@ pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
        }
        _ => Box::new(BufWriter::new(io::stdout())),
    };
-    let stderr_writer = Box::new(BufWriter::new(io::stderr()));

    if cli.show_settings {
        commands::show_settings::show_settings(
@@ -222,29 +228,25 @@ pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
    let Settings {
        fix,
        fix_only,
-        unsafe_fixes,
        output_format,
        show_fixes,
        show_source,
        ..
    } = pyproject_config.settings;

-    // Fix rules are as follows:
+    // Autofix rules are as follows:
    // - By default, generate all fixes, but don't apply them to the filesystem.
-    // - If `--fix` or `--fix-only` is set, apply applicable fixes to the filesystem (or
+    // - If `--fix` or `--fix-only` is set, always apply fixes to the filesystem (or
    //   print them to stdout, if we're reading from stdin).
-    // - If `--diff` or `--fix-only` are set, don't print any violations (only applicable fixes)
-    // - By default, applicable fixes only include [`Applicablility::Automatic`], but if
-    //   `--unsafe-fixes` is set, then [`Applicablility::Suggested`] fixes are included.
-
-    let fix_mode = if cli.diff {
-        FixMode::Diff
+    // - If `--diff` or `--fix-only` are set, don't print any violations (only
+    //   fixes).
+    let autofix = if cli.diff {
+        flags::FixMode::Diff
    } else if fix || fix_only {
-        FixMode::Apply
+        flags::FixMode::Apply
    } else {
-        FixMode::Generate
+        flags::FixMode::Generate
    };
-
    let cache = !cli.no_cache;
    let noqa = !cli.ignore_noqa;
    let mut printer_flags = PrinterFlags::empty();
@@ -273,7 +275,7 @@ pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
    }

    if cli.add_noqa {
-        if !fix_mode.is_generate() {
+        if !autofix.is_generate() {
            warn_user!("--fix is incompatible with --add-noqa.");
        }
        let modifications =
@@ -288,17 +290,11 @@ pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
        return Ok(ExitStatus::Success);
    }

-    let printer = Printer::new(
-        output_format,
-        log_level,
-        fix_mode,
-        unsafe_fixes,
-        printer_flags,
-    );
+    let printer = Printer::new(output_format, log_level, autofix, printer_flags);

    if cli.watch {
        if output_format != SerializationFormat::Text {
-            warn_user!("`--output-format text` is always used in watch mode.");
+            warn_user!("--format 'text' is used in watch mode.");
        }

        // Configure the file watcher.
@@ -321,8 +317,7 @@ pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
            &overrides,
            cache.into(),
            noqa.into(),
-            fix_mode,
-            unsafe_fixes,
+            autofix,
        )?;
        printer.write_continuously(&mut writer, &messages)?;

@@ -354,8 +349,7 @@ pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
                        &overrides,
                        cache.into(),
                        noqa.into(),
-                        fix_mode,
-                        unsafe_fixes,
+                        autofix,
                    )?;
                    printer.write_continuously(&mut writer, &messages)?;
                }
@@ -372,7 +366,7 @@ pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
                &pyproject_config,
                &overrides,
                noqa.into(),
-                fix_mode,
+                autofix,
            )?
        } else {
            commands::check::check(
@@ -381,23 +375,19 @@ pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
                &overrides,
                cache.into(),
                noqa.into(),
-                fix_mode,
-                unsafe_fixes,
+                autofix,
            )?
        };

-        // Always try to print violations (though the printer itself may suppress output)
-        // If we're writing fixes via stdin, the transformed source code goes to the writer
-        // so send the summary to stderr instead
-        let mut summary_writer = if is_stdin && matches!(fix_mode, FixMode::Apply | FixMode::Diff) {
-            stderr_writer
-        } else {
-            writer
-        };
-        if cli.statistics {
-            printer.write_statistics(&diagnostics, &mut summary_writer)?;
-        } else {
-            printer.write_once(&diagnostics, &mut summary_writer)?;
+        // Always try to print violations (the printer itself may suppress output),
+        // unless we're writing fixes via stdin (in which case, the transformed
+        // source code goes to stdout).
+        if !(is_stdin && matches!(autofix, flags::FixMode::Apply | flags::FixMode::Diff)) {
+            if cli.statistics {
+                printer.write_statistics(&diagnostics, &mut writer)?;
+            } else {
+                printer.write_once(&diagnostics, &mut writer)?;
+            }
        }

        if !cli.exit_zero {
--- a/crates/ruff_cli/src/printer.rs
+++ b/crates/ruff_cli/src/printer.rs
@@ -7,9 +7,11 @@ use anyhow::Result;
 use bitflags::bitflags;
 use colored::Colorize;
 use itertools::{iterate, Itertools};
+use rustc_hash::FxHashMap;
 use serde::Serialize;

 use ruff_linter::fs::relativize_path;
+use ruff_linter::linter::FixTable;
 use ruff_linter::logging::LogLevel;
 use ruff_linter::message::{
    AzureEmitter, Emitter, EmitterContext, GithubEmitter, GitlabEmitter, GroupedEmitter,
@@ -17,10 +19,10 @@ use ruff_linter::message::{
 };
 use ruff_linter::notify_user;
 use ruff_linter::registry::{AsRule, Rule};
-use ruff_linter::settings::flags::{self};
-use ruff_linter::settings::types::{SerializationFormat, UnsafeFixes};
+use ruff_linter::settings::flags;
+use ruff_linter::settings::types::SerializationFormat;

-use crate::diagnostics::{Diagnostics, FixMap};
+use crate::diagnostics::Diagnostics;

 bitflags! {
    #[derive(Default, Debug, Copy, Clone)]
@@ -70,8 +72,7 @@ impl From<Rule> for SerializeRuleAsCode {
 pub(crate) struct Printer {
    format: SerializationFormat,
    log_level: LogLevel,
-    fix_mode: flags::FixMode,
-    unsafe_fixes: UnsafeFixes,
+    autofix_level: flags::FixMode,
    flags: Flags,
 }

@@ -79,15 +80,13 @@ impl Printer {
    pub(crate) const fn new(
        format: SerializationFormat,
        log_level: LogLevel,
-        fix_mode: flags::FixMode,
-        unsafe_fixes: UnsafeFixes,
+        autofix_level: flags::FixMode,
        flags: Flags,
    ) -> Self {
        Self {
            format,
            log_level,
-            fix_mode,
-            unsafe_fixes,
+            autofix_level,
            flags,
        }
    }
@@ -100,15 +99,12 @@ impl Printer {

    fn write_summary_text(&self, writer: &mut dyn Write, diagnostics: &Diagnostics) -> Result<()> {
        if self.log_level >= LogLevel::Default {
-            let fixables = FixableStatistics::try_from(diagnostics, self.unsafe_fixes);
-
-            let fixed = diagnostics
-                .fixed
-                .values()
-                .flat_map(std::collections::HashMap::values)
-                .sum::<usize>();
-
            if self.flags.intersects(Flags::SHOW_VIOLATIONS) {
+                let fixed = diagnostics
+                    .fixed
+                    .values()
+                    .flat_map(std::collections::HashMap::values)
+                    .sum::<usize>();
                let remaining = diagnostics.messages.len();
                let total = fixed + remaining;
                if fixed > 0 {
@@ -122,83 +118,32 @@ impl Printer {
                    writeln!(writer, "Found {remaining} error{s}.")?;
                }

-                if let Some(fixables) = fixables {
-                    let fix_prefix = format!("[{}]", "*".cyan());
-
-                    if self.unsafe_fixes.is_enabled() {
-                        if fixables.applicable > 0 {
-                            writeln!(
-                                writer,
-                                "{fix_prefix} {} fixable with the --fix option.",
-                                fixables.applicable
-                            )?;
-                        }
-                    } else {
-                        if fixables.applicable > 0 && fixables.unapplicable_unsafe > 0 {
-                            let es = if fixables.unapplicable_unsafe == 1 {
-                                ""
-                            } else {
-                                "es"
-                            };
-                            writeln!(writer,
-                                "{fix_prefix} {} fixable with the `--fix` option ({} hidden fix{es} can be enabled with the `--unsafe-fixes` option).",
-                                fixables.applicable, fixables.unapplicable_unsafe
-                            )?;
-                        } else if fixables.applicable > 0 {
-                            // Only applicable fixes
-                            writeln!(
-                                writer,
-                                "{fix_prefix} {} fixable with the `--fix` option.",
-                                fixables.applicable,
-                            )?;
-                        } else {
-                            // Only unapplicable fixes
-                            let es = if fixables.unapplicable_unsafe == 1 {
-                                ""
-                            } else {
-                                "es"
-                            };
-                            writeln!(writer,
-                                "No fixes available ({} hidden fix{es} can be enabled with the `--unsafe-fixes` option).",
-                                fixables.unapplicable_unsafe
-                            )?;
-                        }
+                if show_fix_status(self.autofix_level) {
+                    let num_fixable = diagnostics
+                        .messages
+                        .iter()
+                        .filter(|message| message.fix.is_some())
+                        .count();
+                    if num_fixable > 0 {
+                        writeln!(
+                            writer,
+                            "[{}] {num_fixable} potentially fixable with the --fix option.",
+                            "*".cyan(),
+                        )?;
                    }
                }
            } else {
-                // Check if there are unapplied fixes
-                let unapplied = {
-                    if let Some(fixables) = fixables {
-                        fixables.unapplicable_unsafe
+                let fixed = diagnostics
+                    .fixed
+                    .values()
+                    .flat_map(std::collections::HashMap::values)
+                    .sum::<usize>();
+                if fixed > 0 {
+                    let s = if fixed == 1 { "" } else { "s" };
+                    if self.autofix_level.is_apply() {
+                        writeln!(writer, "Fixed {fixed} error{s}.")?;
                    } else {
-                        0
-                    }
-                };
-
-                if unapplied > 0 {
-                    let es = if unapplied == 1 { "" } else { "es" };
-                    if fixed > 0 {
-                        let s = if fixed == 1 { "" } else { "s" };
-                        if self.fix_mode.is_apply() {
-                            writeln!(writer, "Fixed {fixed} error{s} ({unapplied} additional fix{es} available with `--unsafe-fixes`).")?;
-                        } else {
-                            writeln!(writer, "Would fix {fixed} error{s} ({unapplied} additional fix{es} available with `--unsafe-fixes`).")?;
-                        }
-                    } else {
-                        if self.fix_mode.is_apply() {
-                            writeln!(writer, "No errors fixed ({unapplied} fix{es} available with `--unsafe-fixes`).")?;
-                        } else {
-                            writeln!(writer, "No errors would be fixed ({unapplied} fix{es} available with `--unsafe-fixes`).")?;
-                        }
-                    }
-                } else {
-                    if fixed > 0 {
-                        let s = if fixed == 1 { "" } else { "s" };
-                        if self.fix_mode.is_apply() {
-                            writeln!(writer, "Fixed {fixed} error{s}.")?;
-                        } else {
-                            writeln!(writer, "Would fix {fixed} error{s}.")?;
-                        }
+                        writeln!(writer, "Would fix {fixed} error{s}.")?;
                    }
                }
            }
@@ -233,7 +178,6 @@ impl Printer {
        }

        let context = EmitterContext::new(&diagnostics.notebook_indexes);
-        let fixables = FixableStatistics::try_from(diagnostics, self.unsafe_fixes);

        match self.format {
            SerializationFormat::Json => {
@@ -247,10 +191,9 @@ impl Printer {
            }
            SerializationFormat::Text => {
                TextEmitter::default()
-                    .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
+                    .with_show_fix_status(show_fix_status(self.autofix_level))
                    .with_show_fix_diff(self.flags.intersects(Flags::SHOW_FIX_DIFF))
                    .with_show_source(self.flags.intersects(Flags::SHOW_SOURCE))
-                    .with_unsafe_fixes(self.unsafe_fixes)
                    .emit(writer, &diagnostics.messages, &context)?;

                if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
@@ -266,8 +209,7 @@ impl Printer {
            SerializationFormat::Grouped => {
                GroupedEmitter::default()
                    .with_show_source(self.flags.intersects(Flags::SHOW_SOURCE))
-                    .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
-                    .with_unsafe_fixes(self.unsafe_fixes)
+                    .with_show_fix_status(show_fix_status(self.autofix_level))
                    .emit(writer, &diagnostics.messages, &context)?;

                if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
@@ -417,8 +359,6 @@ impl Printer {
            );
        }

-        let fixables = FixableStatistics::try_from(diagnostics, self.unsafe_fixes);
-
        if !diagnostics.messages.is_empty() {
            if self.log_level >= LogLevel::Default {
                writeln!(writer)?;
@@ -426,9 +366,8 @@ impl Printer {

            let context = EmitterContext::new(&diagnostics.notebook_indexes);
            TextEmitter::default()
-                .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
+                .with_show_fix_status(show_fix_status(self.autofix_level))
                .with_show_source(self.flags.intersects(Flags::SHOW_SOURCE))
-                .with_unsafe_fixes(self.unsafe_fixes)
                .emit(writer, &diagnostics.messages, &context)?;
        }
        writer.flush()?;
@@ -451,16 +390,16 @@ fn num_digits(n: usize) -> usize {
 }

 /// Return `true` if the [`Printer`] should indicate that a rule is fixable.
-fn show_fix_status(fix_mode: flags::FixMode, fixables: Option<&FixableStatistics>) -> bool {
+const fn show_fix_status(autofix_level: flags::FixMode) -> bool {
    // If we're in application mode, avoid indicating that a rule is fixable.
    // If the specific violation were truly fixable, it would've been fixed in
    // this pass! (We're occasionally unable to determine whether a specific
-    // violation is fixable without trying to fix it, so if fix is not
+    // violation is fixable without trying to fix it, so if autofix is not
    // enabled, we may inadvertently indicate that a rule is fixable.)
-    (!fix_mode.is_apply()) && fixables.is_some_and(FixableStatistics::any_applicable_fixes)
+    !autofix_level.is_apply()
 }

-fn print_fix_summary(writer: &mut dyn Write, fixed: &FixMap) -> Result<()> {
+fn print_fix_summary(writer: &mut dyn Write, fixed: &FxHashMap<String, FixTable>) -> Result<()> {
    let total = fixed
        .values()
        .map(|table| table.values().sum::<usize>())
@@ -500,43 +439,3 @@ fn print_fix_summary(writer: &mut dyn Write, fixed: &FixMap) -> Result<()> {
    }
    Ok(())
 }
-
-/// Statistics for [applicable][ruff_diagnostics::Applicability] fixes.
-#[derive(Debug)]
-struct FixableStatistics {
-    applicable: u32,
-    unapplicable_unsafe: u32,
-}
-
-impl FixableStatistics {
-    fn try_from(diagnostics: &Diagnostics, unsafe_fixes: UnsafeFixes) -> Option<Self> {
-        let mut applicable = 0;
-        let mut unapplicable_unsafe = 0;
-
-        for message in &diagnostics.messages {
-            if let Some(fix) = &message.fix {
-                if fix.applies(unsafe_fixes.required_applicability()) {
-                    applicable += 1;
-                } else {
-                    // Do not include unapplicable fixes at other levels that do not provide an opt-in
-                    if fix.applicability().is_unsafe() {
-                        unapplicable_unsafe += 1;
-                    }
-                }
-            }
-        }
-
-        if applicable == 0 && unapplicable_unsafe == 0 {
-            None
-        } else {
-            Some(Self {
-                applicable,
-                unapplicable_unsafe,
-            })
-        }
-    }
-
-    fn any_applicable_fixes(&self) -> bool {
-        self.applicable > 0
-    }
-}
--- a/crates/ruff_cli/src/snapshots/ruff_cliversiontests__version_formatting.snap
+++ b/crates/ruff_cli/src/snapshots/ruff_cliversiontests__version_formatting.snap
@@ -1,5 +0,0 @@
---
-source: crates/ruff_cli/src/version.rs
-expression: version
---
-0.0.0
--- a/crates/ruff_cli/src/snapshots/ruff_cliversiontests__version_formatting_with_commit_info.snap
+++ b/crates/ruff_cli/src/snapshots/ruff_cliversiontests__version_formatting_with_commit_info.snap
@@ -1,5 +0,0 @@
---
-source: crates/ruff_cli/src/version.rs
-expression: version
---
-0.0.0 (53b0f5d92 2023-10-19)
--- a/crates/ruff_cli/src/snapshots/ruff_cliversiontests__version_formatting_with_commits_since_last_tag.snap
+++ b/crates/ruff_cli/src/snapshots/ruff_cliversiontests__version_formatting_with_commits_since_last_tag.snap
@@ -1,5 +0,0 @@
---
-source: crates/ruff_cli/src/version.rs
-expression: version
---
-0.0.0+24 (53b0f5d92 2023-10-19)
--- a/crates/ruff_cli/src/snapshots/ruff_cliversiontests__version_serializable.snap
+++ b/crates/ruff_cli/src/snapshots/ruff_cliversiontests__version_serializable.snap
@@ -1,14 +0,0 @@
---
-source: crates/ruff_cli/src/version.rs
-expression: version
---
-{
-  "version": "0.0.0",
-  "commit_info": {
-    "short_commit_hash": "53b0f5d92",
-    "commit_hash": "53b0f5d924110e5b26fbf09f6fd3a03d67b475b7",
-    "commit_date": "2023-10-19",
-    "last_tag": "v0.0.1",
-    "commits_since_last_tag": 0
-  }
-}
--- a/crates/ruff_cli/src/version.rs
+++ b/crates/ruff_cli/src/version.rs
@@ -1,130 +0,0 @@
-//! Code for representing Ruff's release version number.
-use serde::Serialize;
-use std::fmt;
-
-/// Information about the git repository where Ruff was built from.
-#[derive(Serialize)]
-pub(crate) struct CommitInfo {
-    short_commit_hash: String,
-    commit_hash: String,
-    commit_date: String,
-    last_tag: Option<String>,
-    commits_since_last_tag: u32,
-}
-
-/// Ruff's version.
-#[derive(Serialize)]
-pub(crate) struct VersionInfo {
-    /// Ruff's version, such as "0.5.1"
-    version: String,
-    /// Information about the git commit we may have been built from.
-    ///
-    /// `None` if not built from a git repo or if retrieval failed.
-    commit_info: Option<CommitInfo>,
-}
-
-impl fmt::Display for VersionInfo {
-    /// Formatted version information: "<version>[+<commits>] (<commit> <date>)"
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.version)?;
-
-        if let Some(ref ci) = self.commit_info {
-            if ci.commits_since_last_tag > 0 {
-                write!(f, "+{}", ci.commits_since_last_tag)?;
-            }
-            write!(f, " ({} {})", ci.short_commit_hash, ci.commit_date)?;
-        }
-
-        Ok(())
-    }
-}
-
-/// Returns information about Ruff's version.
-pub(crate) fn version() -> VersionInfo {
-    // Environment variables are only read at compile-time
-    macro_rules! option_env_str {
-        ($name:expr) => {
-            option_env!($name).map(|s| s.to_string())
-        };
-    }
-
-    // This version is pulled from Cargo.toml and set by Cargo
-    let version = option_env_str!("CARGO_PKG_VERSION").unwrap();
-
-    // Commit info is pulled from git and set by `build.rs`
-    let commit_info = option_env_str!("RUFF_COMMIT_HASH").map(|commit_hash| CommitInfo {
-        short_commit_hash: option_env_str!("RUFF_COMMIT_SHORT_HASH").unwrap(),
-        commit_hash,
-        commit_date: option_env_str!("RUFF_COMMIT_DATE").unwrap(),
-        last_tag: option_env_str!("RUFF_LAST_TAG"),
-        commits_since_last_tag: option_env_str!("RUFF_LAST_TAG_DISTANCE")
-            .as_deref()
-            .map_or(0, |value| value.parse::<u32>().unwrap_or(0)),
-    });
-
-    VersionInfo {
-        version,
-        commit_info,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use insta::{assert_display_snapshot, assert_json_snapshot};
-
-    use super::{CommitInfo, VersionInfo};
-
-    #[test]
-    fn version_formatting() {
-        let version = VersionInfo {
-            version: "0.0.0".to_string(),
-            commit_info: None,
-        };
-        assert_display_snapshot!(version);
-    }
-
-    #[test]
-    fn version_formatting_with_commit_info() {
-        let version = VersionInfo {
-            version: "0.0.0".to_string(),
-            commit_info: Some(CommitInfo {
-                short_commit_hash: "53b0f5d92".to_string(),
-                commit_hash: "53b0f5d924110e5b26fbf09f6fd3a03d67b475b7".to_string(),
-                last_tag: Some("v0.0.1".to_string()),
-                commit_date: "2023-10-19".to_string(),
-                commits_since_last_tag: 0,
-            }),
-        };
-        assert_display_snapshot!(version);
-    }
-
-    #[test]
-    fn version_formatting_with_commits_since_last_tag() {
-        let version = VersionInfo {
-            version: "0.0.0".to_string(),
-            commit_info: Some(CommitInfo {
-                short_commit_hash: "53b0f5d92".to_string(),
-                commit_hash: "53b0f5d924110e5b26fbf09f6fd3a03d67b475b7".to_string(),
-                last_tag: Some("v0.0.1".to_string()),
-                commit_date: "2023-10-19".to_string(),
-                commits_since_last_tag: 24,
-            }),
-        };
-        assert_display_snapshot!(version);
-    }
-
-    #[test]
-    fn version_serializable() {
-        let version = VersionInfo {
-            version: "0.0.0".to_string(),
-            commit_info: Some(CommitInfo {
-                short_commit_hash: "53b0f5d92".to_string(),
-                commit_hash: "53b0f5d924110e5b26fbf09f6fd3a03d67b475b7".to_string(),
-                last_tag: Some("v0.0.1".to_string()),
-                commit_date: "2023-10-19".to_string(),
-                commits_since_last_tag: 0,
-            }),
-        };
-        assert_json_snapshot!(version);
-    }
-}
--- a/crates/ruff_cli/tests/black_compatibility_test.rs
+++ b/crates/ruff_cli/tests/black_compatibility_test.rs
@@ -0,0 +1,204 @@
+#![cfg(not(target_family = "wasm"))]
+
+use std::io::{ErrorKind, Read, Write};
+use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4, TcpListener, TcpStream};
+use std::path::{Path, PathBuf};
+use std::process::{Command, Stdio};
+use std::thread::sleep;
+use std::time::Duration;
+use std::{fs, process, str};
+
+use anyhow::{anyhow, bail, Context, Result};
+use insta_cmd::get_cargo_bin;
+use log::info;
+use walkdir::WalkDir;
+
+use ruff_linter::logging::{set_up_logging, LogLevel};
+
+/// Handles `blackd` process and allows submitting code to it for formatting.
+struct Blackd {
+    address: SocketAddr,
+    server: process::Child,
+    client: ureq::Agent,
+}
+
+const BIN_NAME: &str = "ruff";
+
+impl Blackd {
+    pub(crate) fn new() -> Result<Self> {
+        // Get free TCP port to run on
+        let address = TcpListener::bind(SocketAddrV4::new(Ipv4Addr::LOCALHOST, 0))?.local_addr()?;
+
+        let args = [
+            "--bind-host",
+            &address.ip().to_string(),
+            "--bind-port",
+            &address.port().to_string(),
+        ];
+        let server = Command::new("blackd")
+            .args(args)
+            .stdout(Stdio::null())
+            .stderr(Stdio::null())
+            .spawn()
+            .context("Starting blackd")?;
+
+        // Wait up to four seconds for `blackd` to be ready.
+        for _ in 0..20 {
+            match TcpStream::connect(address) {
+                Err(e) if e.kind() == ErrorKind::ConnectionRefused => {
+                    info!("`blackd` not ready yet; retrying...");
+                    sleep(Duration::from_millis(200));
+                }
+                Err(e) => return Err(e.into()),
+                Ok(_) => {
+                    info!("`blackd` ready");
+                    return Ok(Self {
+                        address,
+                        server,
+                        client: ureq::agent(),
+                    });
+                }
+            }
+        }
+
+        bail!("blackd {:?} failed to start", args)
+    }
+
+    /// Format given code with blackd.
+    pub(crate) fn check(&self, code: &[u8]) -> Result<Vec<u8>> {
+        match self
+            .client
+            .post(&format!("http://{}/", self.address))
+            .set("X-Line-Length", "88")
+            .send_bytes(code)
+        {
+            // 204 indicates the input wasn't changed during formatting, so
+            // we return the original.
+            Ok(response) => {
+                if response.status() == 204 {
+                    Ok(code.to_vec())
+                } else {
+                    let mut buf = vec![];
+                    response
+                        .into_reader()
+                        .take((1024 * 1024) as u64)
+                        .read_to_end(&mut buf)?;
+                    Ok(buf)
+                }
+            }
+            Err(ureq::Error::Status(_, response)) => Err(anyhow::anyhow!(
+                "Formatting with `black` failed: {}",
+                response.into_string()?
+            )),
+            Err(e) => Err(e.into()),
+        }
+    }
+}
+
+impl Drop for Blackd {
+    fn drop(&mut self) {
+        self.server.kill().expect("Couldn't end `blackd` process");
+    }
+}
+
+fn run_test(path: &Path, blackd: &Blackd, ruff_args: &[&str]) -> Result<()> {
+    let input = fs::read(path)?;
+
+    // Step 1: Run `ruff` on the input.
+    let mut step_1 = Command::new(get_cargo_bin(BIN_NAME))
+        .args(ruff_args)
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .spawn()?;
+    if let Some(mut stdin) = step_1.stdin.take() {
+        stdin.write_all(input.as_ref())?;
+    }
+    let step_1_output = step_1.wait_with_output()?;
+    if !step_1_output.status.success() {
+        return Err(anyhow!(
+            "Running input through ruff failed:\n{}",
+            str::from_utf8(&step_1_output.stderr)?
+        ));
+    }
+
+    // Step 2: Run `blackd` on the input.
+    let step_2_output = blackd.check(&step_1_output.stdout.clone())?;
+
+    // Step 3: Re-run `ruff` on the input.
+    let mut step_3 = Command::new(get_cargo_bin(BIN_NAME))
+        .args(ruff_args)
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .spawn()?;
+    if let Some(mut stdin) = step_3.stdin.take() {
+        stdin.write_all(step_2_output.as_ref())?;
+    }
+    let step_3_output = step_3.wait_with_output()?;
+    if !step_3_output.status.success() {
+        return Err(anyhow!(
+            "Running input through ruff after black failed:\n{}",
+            str::from_utf8(&step_3_output.stderr)?
+        ));
+    }
+    let step_3_output = step_3_output.stdout.clone();
+
+    assert_eq!(
+        str::from_utf8(&step_2_output),
+        str::from_utf8(&step_3_output),
+        "Mismatch found for {}",
+        path.display()
+    );
+
+    Ok(())
+}
+
+#[test]
+#[ignore]
+fn test_ruff_black_compatibility() -> Result<()> {
+    set_up_logging(&LogLevel::Default)?;
+
+    let blackd = Blackd::new()?;
+
+    let fixtures_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+        .join("resources")
+        .join("test")
+        .join("fixtures");
+
+    // Ignore some fixtures that currently trigger errors. `E999.py` especially, as
+    // that is triggering a syntax error on purpose.
+    let excludes = ["E999.py", "W605_1.py"];
+
+    let paths = WalkDir::new(fixtures_dir)
+        .into_iter()
+        .flatten()
+        .filter(|entry| {
+            entry
+                .path()
+                .extension()
+                .is_some_and(|ext| ext == "py" || ext == "pyi")
+                && !excludes.contains(&entry.path().file_name().unwrap().to_str().unwrap())
+        });
+
+    let ruff_args = [
+        "-",
+        "--silent",
+        "--exit-zero",
+        "--fix",
+        "--line-length",
+        "88",
+        "--select",
+        "ALL",
+        // Exclude ruff codes, specifically RUF100, because it causes differences that are not a
+        // problem. Ruff would add a `# noqa: W292`  after the first run, black introduces a
+        // newline, and ruff removes the `# noqa: W292` again.
+        "--ignore",
+        "RUF",
+    ];
+
+    for entry in paths {
+        let path = entry.path();
+        run_test(path, &blackd, &ruff_args).context(format!("Testing {}", path.display()))?;
+    }
+
+    Ok(())
+}
--- a/crates/ruff_cli/tests/format.rs
+++ b/crates/ruff_cli/tests/format.rs
@@ -1,707 +0,0 @@
-#![cfg(not(target_family = "wasm"))]
-
-use std::fs;
-use std::path::Path;
-use std::process::Command;
-use std::str;
-
-use anyhow::Result;
-use insta_cmd::{assert_cmd_snapshot, get_cargo_bin};
-use tempfile::TempDir;
-
-const BIN_NAME: &str = "ruff";
-
-#[test]
-fn default_options() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.py"])
-        .arg("-")
-        .pass_stdin(r#"
-def foo(arg1, arg2,):
-    print('Should\'t change quotes')
-
-
-if condition:
-
-    print('Hy "Micha"') # Should not change quotes
-
-"#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    def foo(
-        arg1,
-        arg2,
-    ):
-        print("Should't change quotes")
-
-
-    if condition:
-        print('Hy "Micha"')  # Should not change quotes
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn format_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-indent-width = 8
-line-length = 84
-
-[format]
-indent-style = "tab"
-quote-style = "single"
-skip-magic-trailing-comma = true
-line-ending = "cr-lf"
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config"])
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"
-def foo(arg1, arg2,):
-    print("Shouldn't change quotes. It exceeds the line width with the tab size 8")
-
-
-if condition:
-
-    print("Should change quotes")
-
-"#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    def foo(arg1, arg2):
-    	print(
-    		"Shouldn't change quotes. It exceeds the line width with the tab size 8"
-    	)
-
-
-    if condition:
-    	print('Should change quotes')
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
-#[test]
-fn mixed_line_endings() -> Result<()> {
-    let tempdir = TempDir::new()?;
-
-    fs::write(
-        tempdir.path().join("main.py"),
-        "from test import say_hy\n\nif __name__ == \"__main__\":\n    say_hy(\"dear Ruff contributor\")\n",
-    )?;
-
-    fs::write(
-        tempdir.path().join("test.py"),
-        "def say_hy(name: str):\r\n    print(f\"Hy {name}\")\r\n",
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(["format", "--no-cache", "--diff", "--isolated"])
-        .arg("."), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    2 files left unchanged
-    "###);
-    Ok(())
-}
-
-#[test]
-fn exclude() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend-exclude = ["out"]
-
-[format]
-exclude = ["test.py", "generated.py"]
-"#,
-    )?;
-
-    fs::write(
-        tempdir.path().join("main.py"),
-        r#"
-from test import say_hy
-
-if __name__ == "__main__":
-    say_hy("dear Ruff contributor")
-"#,
-    )?;
-
-    // Excluded file but passed to the CLI directly, should be formatted
-    let test_path = tempdir.path().join("test.py");
-    fs::write(
-        &test_path,
-        r#"
-def say_hy(name: str):
-        print(f"Hy {name}")"#,
-    )?;
-
-    fs::write(
-        tempdir.path().join("generated.py"),
-        r#"NUMBERS = [
-     0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
-    10, 11, 12, 13, 14, 15, 16, 17, 18, 19
-]
-OTHER = "OTHER"
-"#,
-    )?;
-
-    let out_dir = tempdir.path().join("out");
-    fs::create_dir(&out_dir)?;
-
-    fs::write(out_dir.join("a.py"), "a = a")?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(["format", "--no-cache", "--check", "--config"])
-        .arg(ruff_toml.file_name().unwrap())
-        // Explicitly pass test.py, should be formatted regardless of it being excluded by format.exclude
-        .arg(test_path.file_name().unwrap())
-        // Format all other files in the directory, should respect the `exclude` and `format.exclude` options
-        .arg("."), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    Would reformat: main.py
-    Would reformat: test.py
-    2 files would be reformatted
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
-#[test]
-fn exclude_stdin() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend-select = ["B", "Q"]
-ignore = ["Q000", "Q001", "Q002", "Q003"]
-
-[format]
-exclude = ["generated.py"]
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(["format", "--config", &ruff_toml.file_name().unwrap().to_string_lossy(), "--stdin-filename", "generated.py", "-"])
-        .pass_stdin(r#"
-from test import say_hy
-
-if __name__ == '__main__':
-    say_hy("dear Ruff contributor")
-"#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
-#[test]
-fn format_option_inheritance() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    let base_toml = tempdir.path().join("base.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend = "base.toml"
-
-[lint]
-extend-select = ["COM812"]
-
-[format]
-quote-style = "single"
-"#,
-    )?;
-
-    fs::write(
-        base_toml,
-        r#"
-[format]
-indent-style = "tab"
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config"])
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"
-def foo(arg1, arg2,):
-    print("Shouldn't change quotes")
-
-
-if condition:
-
-    print("Should change quotes")
-
-"#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    def foo(
-    	arg1,
-    	arg2,
-    ):
-    	print("Shouldn't change quotes")
-
-
-    if condition:
-    	print('Should change quotes')
-
-    ----- stderr -----
-    warning: The following rules may cause conflicts when used with the formatter: `COM812`. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding then to the `ignore` configuration.
-    "###);
-    Ok(())
-}
-
-#[test]
-fn deprecated_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-tab-size = 2
-"#,
-    )?;
-
-    insta::with_settings!({filters => vec![
-        (&*regex::escape(ruff_toml.to_str().unwrap()), "[RUFF-TOML-PATH]"),
-    ]}, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(["format", "--config"])
-            .arg(&ruff_toml)
-            .arg("-")
-            .pass_stdin(r#"
-if True:
-    pass
-    "#), @r###"
-        success: true
-        exit_code: 0
-        ----- stdout -----
-        if True:
-          pass
-
-        ----- stderr -----
-        warning: The `tab-size` option has been renamed to `indent-width` to emphasize that it configures the indentation used by the formatter as well as the tab width. Please update your configuration to use `indent-width = <value>` instead.
-        "###);
-    });
-    Ok(())
-}
-
-/// Since 0.1.0 the legacy format option is no longer supported
-#[test]
-fn legacy_format_option() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-format = "json"
-"#,
-    )?;
-
-    insta::with_settings!({filters => vec![
-        (&*regex::escape(ruff_toml.to_str().unwrap()), "[RUFF-TOML-PATH]"),
-    ]}, {
-        assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-            .args(["check", "--select", "F401", "--no-cache", "--config"])
-            .arg(&ruff_toml)
-            .arg("-")
-            .pass_stdin(r#"
-    import os
-    "#), @r###"
-        success: false
-        exit_code: 2
-        ----- stdout -----
-
-        ----- stderr -----
-        ruff failed
-          Cause: Failed to parse `[RUFF-TOML-PATH]`: TOML parse error at line 2, column 10
-          |
-        2 | format = "json"
-          |          ^^^^^^
-        invalid type: string "json", expected struct FormatOptions
-
-        "###);
-    });
-    Ok(())
-}
-
-#[test]
-fn conflicting_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-indent-width = 2
-
-[lint]
-select = ["ALL"]
-ignore = ["D203", "D212"]
-
-[lint.isort]
-lines-after-imports = 3
-lines-between-types = 2
-force-wrap-aliases = true
-combine-as-imports = true
-split-on-trailing-comma = true
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-docstring-quotes = "single"
-multiline-quotes = "single"
-
-[format]
-skip-magic-trailing-comma = true
-indent-style = "tab"
-"#,
-    )?;
-
-    let test_path = tempdir.path().join("test.py");
-    fs::write(
-        &test_path,
-        r#"
-def say_hy(name: str):
-        print(f"Hy {name}")"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--no-cache", "--config"])
-        .arg(&ruff_toml)
-        .arg(test_path), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    1 file reformatted
-
-    ----- stderr -----
-    warning: The following rules may cause conflicts when used with the formatter: `COM812`, `D206`, `ISC001`, `W191`. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding then to the `ignore` configuration.
-    warning: The `flake8-quotes.inline-quotes="single"` option is incompatible with the formatter's `format.quote-style="double"`. We recommend disabling `Q000` and `Q003` when using the formatter, which enforces a consistent quote style. Alternatively, set both options to either `"single"` or `"double"`.
-    warning: The `flake8-quotes.multiline-quotes="single"` option is incompatible with the formatter. We recommend disabling `Q001` when using the formatter, which enforces double quotes for multiline strings. Alternatively, set the `flake8-quotes.multiline-quotes` option to `"double"`.`
-    warning: The `flake8-quotes.multiline-quotes="single"` option is incompatible with the formatter. We recommend disabling `Q002` when using the formatter, which enforces double quotes for docstrings. Alternatively, set the `flake8-quotes.docstring-quotes` option to `"double"`.`
-    warning: The isort option `isort.lines-after-imports` with a value other than `-1`, `1` or `2` is incompatible with the formatter. To avoid unexpected behavior, we recommend setting the option to one of: `2`, `1`, or `-1` (default).
-    warning: The isort option `isort.lines-between-types` with a value greater than 1 is incompatible with the formatter. To avoid unexpected behavior, we recommend setting the option to one of: `1` or `0` (default).
-    warning: The isort option `isort.force-wrap-aliases` is incompatible with the formatter `format.skip-magic-trailing-comma=true` option. To avoid unexpected behavior, we recommend either setting `isort.force-wrap-aliases=false` or `format.skip-magic-trailing-comma=false`.
-    warning: The isort option `isort.split-on-trailing-comma` is incompatible with the formatter `format.skip-magic-trailing-comma=true` option. To avoid unexpected behavior, we recommend either setting `isort.split-on-trailing-comma=false` or `format.skip-magic-trailing-comma=false`.
-    "###);
-    Ok(())
-}
-
-#[test]
-fn conflicting_options_stdin() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-indent-width = 2
-
-[lint]
-select = ["ALL"]
-ignore = ["D203", "D212"]
-
-[lint.isort]
-lines-after-imports = 3
-lines-between-types = 2
-force-wrap-aliases = true
-combine-as-imports = true
-split-on-trailing-comma = true
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-docstring-quotes = "single"
-multiline-quotes = "single"
-
-[format]
-skip-magic-trailing-comma = true
-indent-style = "tab"
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config"])
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"
-def say_hy(name: str):
-        print(f"Hy {name}")"#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    def say_hy(name: str):
-    	print(f"Hy {name}")
-
-    ----- stderr -----
-    warning: The following rules may cause conflicts when used with the formatter: `COM812`, `D206`, `ISC001`, `W191`. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding then to the `ignore` configuration.
-    warning: The `flake8-quotes.inline-quotes="single"` option is incompatible with the formatter's `format.quote-style="double"`. We recommend disabling `Q000` and `Q003` when using the formatter, which enforces a consistent quote style. Alternatively, set both options to either `"single"` or `"double"`.
-    warning: The `flake8-quotes.multiline-quotes="single"` option is incompatible with the formatter. We recommend disabling `Q001` when using the formatter, which enforces double quotes for multiline strings. Alternatively, set the `flake8-quotes.multiline-quotes` option to `"double"`.`
-    warning: The `flake8-quotes.multiline-quotes="single"` option is incompatible with the formatter. We recommend disabling `Q002` when using the formatter, which enforces double quotes for docstrings. Alternatively, set the `flake8-quotes.docstring-quotes` option to `"double"`.`
-    warning: The isort option `isort.lines-after-imports` with a value other than `-1`, `1` or `2` is incompatible with the formatter. To avoid unexpected behavior, we recommend setting the option to one of: `2`, `1`, or `-1` (default).
-    warning: The isort option `isort.lines-between-types` with a value greater than 1 is incompatible with the formatter. To avoid unexpected behavior, we recommend setting the option to one of: `1` or `0` (default).
-    warning: The isort option `isort.force-wrap-aliases` is incompatible with the formatter `format.skip-magic-trailing-comma=true` option. To avoid unexpected behavior, we recommend either setting `isort.force-wrap-aliases=false` or `format.skip-magic-trailing-comma=false`.
-    warning: The isort option `isort.split-on-trailing-comma` is incompatible with the formatter `format.skip-magic-trailing-comma=true` option. To avoid unexpected behavior, we recommend either setting `isort.split-on-trailing-comma=false` or `format.skip-magic-trailing-comma=false`.
-    "###);
-    Ok(())
-}
-
-#[test]
-fn valid_linter_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-select = ["ALL"]
-ignore = ["D203", "D212", "COM812", "ISC001"]
-
-[lint.isort]
-lines-after-imports = 2
-lines-between-types = 1
-force-wrap-aliases = true
-combine-as-imports = true
-split-on-trailing-comma = true
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-docstring-quotes = "double"
-multiline-quotes = "double"
-
-[format]
-skip-magic-trailing-comma = false
-quote-style = "single"
-"#,
-    )?;
-
-    let test_path = tempdir.path().join("test.py");
-    fs::write(
-        &test_path,
-        r#"
-def say_hy(name: str):
-        print(f"Hy {name}")"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--no-cache", "--config"])
-        .arg(&ruff_toml)
-        .arg(test_path), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    1 file reformatted
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
-#[test]
-fn all_rules_default_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-select = ["ALL"]
-"#,
-    )?;
-
-    let test_path = tempdir.path().join("test.py");
-    fs::write(
-        &test_path,
-        r#"
-def say_hy(name: str):
-        print(f"Hy {name}")"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--no-cache", "--config"])
-        .arg(&ruff_toml)
-        .arg(test_path), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    1 file reformatted
-
-    ----- stderr -----
-    warning: `one-blank-line-before-class` (D203) and `no-blank-line-before-class` (D211) are incompatible. Ignoring `one-blank-line-before-class`.
-    warning: `multi-line-summary-first-line` (D212) and `multi-line-summary-second-line` (D213) are incompatible. Ignoring `multi-line-summary-second-line`.
-    warning: The following rules may cause conflicts when used with the formatter: `COM812`, `ISC001`. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding then to the `ignore` configuration.
-    "###);
-    Ok(())
-}
-
-#[test]
-fn test_diff() {
-    let args = ["format", "--no-cache", "--isolated", "--diff"];
-    let fixtures = Path::new("resources").join("test").join("fixtures");
-    let paths = [
-        fixtures.join("unformatted.py"),
-        fixtures.join("formatted.py"),
-        fixtures.join("unformatted.ipynb"),
-    ];
-    insta::with_settings!({filters => vec![
-        // Replace windows paths
-        (r"\\", "/"),
-    ]}, {
-        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME)).args(args).args(paths),
-            @r###"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        --- resources/test/fixtures/unformatted.ipynb:cell 1
-        +++ resources/test/fixtures/unformatted.ipynb:cell 1
-        @@ -1,3 +1,4 @@
-         import numpy
-        -maths = (numpy.arange(100)**2).sum()
-        -stats= numpy.asarray([1,2,3,4]).median()
-        +
-        +maths = (numpy.arange(100) ** 2).sum()
-        +stats = numpy.asarray([1, 2, 3, 4]).median()
-        --- resources/test/fixtures/unformatted.ipynb:cell 3
-        +++ resources/test/fixtures/unformatted.ipynb:cell 3
-        @@ -1,4 +1,6 @@
-         # A cell with IPython escape command
-         def some_function(foo, bar):
-             pass
-        +
-        +
-         %matplotlib inline
-        --- resources/test/fixtures/unformatted.ipynb:cell 4
-        +++ resources/test/fixtures/unformatted.ipynb:cell 4
-        @@ -1,5 +1,10 @@
-         foo = %pwd
-        -def some_function(foo,bar,):
-        +
-        +
-        +def some_function(
-        +    foo,
-        +    bar,
-        +):
-             # Another cell with IPython escape command
-             foo = %pwd
-             print(foo)
-
-        --- resources/test/fixtures/unformatted.py
-        +++ resources/test/fixtures/unformatted.py
-        @@ -1,3 +1,3 @@
-         x = 1
-        -y=2
-        +y = 2
-         z = 3
-
-
-        ----- stderr -----
-        2 files would be reformatted, 1 file left unchanged
-        "###);
-    });
-}
-
-#[test]
-fn test_diff_no_change() {
-    let args = ["format", "--no-cache", "--isolated", "--diff"];
-    let fixtures = Path::new("resources").join("test").join("fixtures");
-    let paths = [fixtures.join("unformatted.py")];
-    insta::with_settings!({filters => vec![
-        // Replace windows paths
-        (r"\\", "/"),
-    ]}, {
-        assert_cmd_snapshot!(
-            Command::new(get_cargo_bin(BIN_NAME)).args(args).args(paths),
-            @r###"
-        success: false
-        exit_code: 1
-        ----- stdout -----
-        --- resources/test/fixtures/unformatted.py
-        +++ resources/test/fixtures/unformatted.py
-        @@ -1,3 +1,3 @@
-         x = 1
-        -y=2
-        +y = 2
-         z = 3
-
-
-        ----- stderr -----
-        1 file would be reformatted
-        "###
-        );
-    });
-}
-
-#[test]
-fn test_diff_stdin_unformatted() {
-    let args = [
-        "format",
-        "--isolated",
-        "--diff",
-        "-",
-        "--stdin-filename",
-        "unformatted.py",
-    ];
-    let fixtures = Path::new("resources").join("test").join("fixtures");
-    let unformatted = fs::read(fixtures.join("unformatted.py")).unwrap();
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME)).args(args).pass_stdin(unformatted),
-        @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    --- unformatted.py
-    +++ unformatted.py
-    @@ -1,3 +1,3 @@
-     x = 1
-    -y=2
-    +y = 2
-     z = 3
-
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn test_diff_stdin_formatted() {
-    let args = ["format", "--isolated", "--diff", "-"];
-    let fixtures = Path::new("resources").join("test").join("fixtures");
-    let unformatted = fs::read(fixtures.join("formatted.py")).unwrap();
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME)).args(args).pass_stdin(unformatted),
-        @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    "###);
-}
--- a/crates/ruff_cli/tests/integration_test.rs
+++ b/crates/ruff_cli/tests/integration_test.rs
@@ -1,5 +1,6 @@
 #![cfg(not(target_family = "wasm"))]

+#[cfg(unix)]
 use std::fs;
 #[cfg(unix)]
 use std::fs::Permissions;
@@ -18,6 +19,7 @@ use clap::Parser;
 use insta_cmd::{assert_cmd_snapshot, get_cargo_bin};
 #[cfg(unix)]
 use path_absolutize::path_dedot;
+#[cfg(unix)]
 use tempfile::TempDir;

 #[cfg(unix)]
@@ -45,16 +47,16 @@ fn stdin_success() {
 fn stdin_error() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
-        .pass_stdin("import os\n"), @r###"
+        .pass_stdin("import os\n"), @r#"
    success: false
    exit_code: 1
    ----- stdout -----
    -:1:8: F401 [*] `os` imported but unused
    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
+    [*] 1 potentially fixable with the --fix option.

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

 #[test]
@@ -68,14 +70,14 @@ fn stdin_filename() {
    ----- stdout -----
    F401.py:1:8: F401 [*] `os` imported but unused
    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
+    [*] 1 potentially fixable with the --fix option.

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

-/// Raise `TCH` errors in `.py` files ...
 #[test]
+/// Raise `TCH` errors in `.py` files ...
 fn stdin_source_type_py() {
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
@@ -86,7 +88,7 @@ fn stdin_source_type_py() {
    ----- stdout -----
    TCH.py:1:8: F401 [*] `os` imported but unused
    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
+    [*] 1 potentially fixable with the --fix option.

    ----- stderr -----
    "###);
@@ -135,7 +137,7 @@ fn stdin_json() {
 }

 #[test]
-fn stdin_fix_py() {
+fn stdin_autofix() {
    let args = ["--fix"];
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
@@ -149,180 +151,11 @@ fn stdin_fix_py() {
    print(sys.version)

    ----- stderr -----
-    Found 1 error (1 fixed, 0 remaining).
    "###);
 }

 #[test]
-fn stdin_fix_jupyter() {
-    let args = ["--fix", "--stdin-filename", "Jupyter.ipynb"];
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(args)
-        .pass_stdin(r#"{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "id": "dccc687c-96e2-4604-b957-a8a89b5bec06",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "19e1b029-f516-4662-a9b9-623b93edac1a",
-   "metadata": {},
-   "source": [
-    "Foo"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 2,
-   "id": "cdce7b92-b0fb-4c02-86f6-e233b26fa84f",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import sys"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 3,
-   "id": "e40b33d2-7fe4-46c5-bdf0-8802f3052565",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "1\n"
-     ]
-    }
-   ],
-   "source": [
-    "print(1)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "a1899bc8-d46f-4ec0-b1d1-e1ca0f04bf60",
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  }
- ],
- "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.11.2"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}"#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    {
-     "cells": [
-      {
-       "cell_type": "code",
-       "execution_count": 1,
-       "id": "dccc687c-96e2-4604-b957-a8a89b5bec06",
-       "metadata": {},
-       "outputs": [],
-       "source": []
-      },
-      {
-       "cell_type": "markdown",
-       "id": "19e1b029-f516-4662-a9b9-623b93edac1a",
-       "metadata": {},
-       "source": [
-        "Foo"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 2,
-       "id": "cdce7b92-b0fb-4c02-86f6-e233b26fa84f",
-       "metadata": {},
-       "outputs": [],
-       "source": []
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 3,
-       "id": "e40b33d2-7fe4-46c5-bdf0-8802f3052565",
-       "metadata": {},
-       "outputs": [
-        {
-         "name": "stdout",
-         "output_type": "stream",
-         "text": [
-          "1\n"
-         ]
-        }
-       ],
-       "source": [
-        "print(1)"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": null,
-       "id": "a1899bc8-d46f-4ec0-b1d1-e1ca0f04bf60",
-       "metadata": {},
-       "outputs": [],
-       "source": []
-      }
-     ],
-     "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.11.2"
-      }
-     },
-     "nbformat": 4,
-     "nbformat_minor": 5
-    }
-    ----- stderr -----
-    Found 2 errors (2 fixed, 0 remaining).
-    "###);
-}
-
-#[test]
-fn stdin_fix_when_not_fixable_should_still_print_contents() {
+fn stdin_autofix_when_not_fixable_should_still_print_contents() {
    let args = ["--fix"];
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
@@ -337,13 +170,11 @@ fn stdin_fix_when_not_fixable_should_still_print_contents() {
         print(sys.version)

    ----- stderr -----
-    -:3:4: F634 If test is a tuple, which is always `True`
-    Found 2 errors (1 fixed, 1 remaining).
    "###);
 }

 #[test]
-fn stdin_fix_when_no_issues_should_still_print_contents() {
+fn stdin_autofix_when_no_issues_should_still_print_contents() {
    let args = ["--fix"];
    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
        .args(STDIN_BASE_OPTIONS)
@@ -360,134 +191,6 @@ fn stdin_fix_when_no_issues_should_still_print_contents() {
    "###);
 }

-#[test]
-fn stdin_format_jupyter() {
-    let args = ["format", "--stdin-filename", "Jupyter.ipynb", "--isolated"];
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(args)
-        .pass_stdin(r#"{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "dccc687c-96e2-4604-b957-a8a89b5bec06",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "x=1"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "19e1b029-f516-4662-a9b9-623b93edac1a",
-   "metadata": {},
-   "source": [
-    "Foo"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "cdce7b92-b0fb-4c02-86f6-e233b26fa84f",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "def func():\n",
-    "  pass\n",
-    "print(1)\n",
-    "import os"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.10.13"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
-"#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    {
-     "cells": [
-      {
-       "cell_type": "code",
-       "execution_count": null,
-       "id": "dccc687c-96e2-4604-b957-a8a89b5bec06",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "x = 1"
-       ]
-      },
-      {
-       "cell_type": "markdown",
-       "id": "19e1b029-f516-4662-a9b9-623b93edac1a",
-       "metadata": {},
-       "source": [
-        "Foo"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": null,
-       "id": "cdce7b92-b0fb-4c02-86f6-e233b26fa84f",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "def func():\n",
-        "    pass\n",
-        "\n",
-        "\n",
-        "print(1)\n",
-        "import os"
-       ]
-      }
-     ],
-     "metadata": {
-      "kernelspec": {
-       "display_name": "Python 3 (ipykernel)",
-       "language": "python",
-       "name": "python3"
-      },
-      "language_info": {
-       "codemirror_mode": {
-        "name": "ipython",
-        "version": 3
-       },
-       "file_extension": ".py",
-       "mimetype": "text/x-python",
-       "name": "python",
-       "nbconvert_exporter": "python",
-       "pygments_lexer": "ipython3",
-       "version": "3.10.13"
-      }
-     },
-     "nbformat": 4,
-     "nbformat_minor": 5
-    }
-
-    ----- stderr -----
-    "###);
-}
-
 #[test]
 fn show_source() {
    let args = ["--show-source"];
@@ -634,9 +337,8 @@ fn nursery_group_selector_preview_enabled() {
    exit_code: 1
    ----- stdout -----
    -:1:1: CPY001 Missing copyright notice at top of file
-    -:1:2: E225 [*] Missing whitespace around operator
+    -:1:2: E225 Missing whitespace around operator
    Found 2 errors.
-    [*] 1 fixable with the `--fix` option.

    ----- stderr -----
    warning: The `NURSERY` selector has been deprecated.
@@ -655,9 +357,8 @@ fn preview_enabled_prefix() {
    exit_code: 1
    ----- stdout -----
    -:1:1: E741 Ambiguous variable name: `I`
-    -:1:2: E225 [*] Missing whitespace around operator
+    -:1:2: E225 Missing whitespace around operator
    Found 2 errors.
-    [*] 1 fixable with the `--fix` option.

    ----- stderr -----
    "###);
@@ -676,9 +377,8 @@ fn preview_enabled_all() {
    -:1:1: E741 Ambiguous variable name: `I`
    -:1:1: D100 Missing docstring in public module
    -:1:1: CPY001 Missing copyright notice at top of file
-    -:1:2: E225 [*] Missing whitespace around operator
+    -:1:2: E225 Missing whitespace around operator
    Found 4 errors.
-    [*] 1 fixable with the `--fix` option.

    ----- stderr -----
    warning: `one-blank-line-before-class` (D203) and `no-blank-line-before-class` (D211) are incompatible. Ignoring `one-blank-line-before-class`.
@@ -697,9 +397,8 @@ fn preview_enabled_direct() {
    success: false
    exit_code: 1
    ----- stdout -----
-    -:1:2: E225 [*] Missing whitespace around operator
+    -:1:2: E225 Missing whitespace around operator
    Found 1 error.
-    [*] 1 fixable with the `--fix` option.

    ----- stderr -----
    "###);
@@ -739,42 +438,6 @@ fn preview_disabled_prefix_empty() {
    "###);
 }

-#[test]
-fn preview_disabled_does_not_warn_for_empty_ignore_selections() {
-    // Does not warn that the selection is empty since the user is not trying to enable the rule
-    let args = ["--ignore", "CPY"];
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(args)
-        .pass_stdin("I=42\n"), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:1: E741 Ambiguous variable name: `I`
-    Found 1 error.
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn preview_disabled_does_not_warn_for_empty_fixable_selections() {
-    // Does not warn that the selection is empty since the user is not trying to enable the rule
-    let args = ["--fixable", "CPY"];
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(args)
-        .pass_stdin("I=42\n"), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:1: E741 Ambiguous variable name: `I`
-    Found 1 error.
-
-    ----- stderr -----
-    "###);
-}
-
 #[test]
 fn preview_group_selector() {
    // `--select PREVIEW` should error (selector was removed)
@@ -903,7 +566,7 @@ fn check_input_from_argfile() -> Result<()> {
        ----- stdout -----
        /path/to/a.py:1:8: F401 [*] `os` imported but unused
        Found 1 error.
-        [*] 1 fixable with the `--fix` option.
+        [*] 1 potentially fixable with the --fix option.

        ----- stderr -----
        "###);
@@ -911,499 +574,3 @@ fn check_input_from_argfile() -> Result<()> {

    Ok(())
 }
-
-#[test]
-fn check_hints_hidden_unsafe_fixes() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args([
-            "-",
-            "--output-format=text",
-            "--isolated",
-            "--select",
-            "F601,UP034",
-            "--no-cache",
-        ])
-        .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
-        @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:14: F601 Dictionary key literal `'a'` repeated
-    -:2:7: UP034 [*] Avoid extraneous parentheses
-    Found 2 errors.
-    [*] 1 fixable with the `--fix` option (1 hidden fix can be enabled with the `--unsafe-fixes` option).
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn check_hints_hidden_unsafe_fixes_with_no_safe_fixes() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["-", "--output-format", "text", "--no-cache", "--isolated", "--select", "F601"])
-        .pass_stdin("x = {'a': 1, 'a': 1}\n"),
-        @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:14: F601 Dictionary key literal `'a'` repeated
-    Found 1 error.
-    No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn check_shows_unsafe_fixes_with_opt_in() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args([
-            "-",
-            "--output-format=text",
-            "--isolated",
-            "--select",
-            "F601,UP034",
-            "--no-cache",
-            "--unsafe-fixes",
-        ])
-        .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
-        @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:14: F601 [*] Dictionary key literal `'a'` repeated
-    -:2:7: UP034 [*] Avoid extraneous parentheses
-    Found 2 errors.
-    [*] 2 fixable with the --fix option.
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn fix_applies_safe_fixes_by_default() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args([
-                "-",
-                "--output-format",
-                "text",
-                "--isolated",
-                "--no-cache",
-                "--select",
-                "F601,UP034",
-                "--fix",
-            ])
-            .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
-            @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    x = {'a': 1, 'a': 1}
-    print('foo')
-
-    ----- stderr -----
-    -:1:14: F601 Dictionary key literal `'a'` repeated
-    Found 2 errors (1 fixed, 1 remaining).
-    No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).
-    "###);
-}
-
-#[test]
-fn fix_applies_unsafe_fixes_with_opt_in() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args([
-                "-",
-                "--output-format",
-                "text",
-                "--isolated",
-                "--no-cache",
-                "--select",
-                "F601,UP034",
-                "--fix",
-                "--unsafe-fixes",
-            ])
-            .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
-            @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    x = {'a': 1}
-    print('foo')
-
-    ----- stderr -----
-    Found 2 errors (2 fixed, 0 remaining).
-    "###);
-}
-
-#[test]
-fn fix_does_not_apply_display_only_fixes() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args([
-                "-",
-                "--output-format",
-                "text",
-                "--isolated",
-                "--no-cache",
-                "--select",
-                "B006",
-                "--fix",
-            ])
-            .pass_stdin("def add_to_list(item, some_list=[]): ..."),
-            @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    def add_to_list(item, some_list=[]): ...
-    ----- stderr -----
-    -:1:33: B006 Do not use mutable data structures for argument defaults
-    Found 1 error.
-    "###);
-}
-
-#[test]
-fn fix_does_not_apply_display_only_fixes_with_unsafe_fixes_enabled() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args([
-                "-",
-                "--output-format",
-                "text",
-                "--isolated",
-                "--no-cache",
-                "--select",
-                "B006",
-                "--fix",
-                "--unsafe-fixes",
-            ])
-            .pass_stdin("def add_to_list(item, some_list=[]): ..."),
-            @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    def add_to_list(item, some_list=[]): ...
-    ----- stderr -----
-    -:1:33: B006 Do not use mutable data structures for argument defaults
-    Found 1 error.
-    "###);
-}
-
-#[test]
-fn fix_only_unsafe_fixes_available() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args([
-                "-",
-                "--output-format",
-                "text",
-                "--isolated",
-                "--no-cache",
-                "--select",
-                "F601",
-                "--fix",
-            ])
-            .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
-            @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    x = {'a': 1, 'a': 1}
-    print(('foo'))
-
-    ----- stderr -----
-    -:1:14: F601 Dictionary key literal `'a'` repeated
-    Found 1 error.
-    No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).
-    "###);
-}
-
-#[test]
-fn fix_only_flag_applies_safe_fixes_by_default() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args([
-                "-",
-                "--output-format",
-                "text",
-                "--isolated",
-                "--no-cache",
-                "--select",
-                "F601,UP034",
-                "--fix-only",
-            ])
-            .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
-            @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    x = {'a': 1, 'a': 1}
-    print('foo')
-
-    ----- stderr -----
-    Fixed 1 error (1 additional fix available with `--unsafe-fixes`).
-    "###);
-}
-
-#[test]
-fn fix_only_flag_applies_unsafe_fixes_with_opt_in() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args([
-                "-",
-                "--output-format",
-                "text",
-                "--isolated",
-                "--no-cache",
-                "--select",
-                "F601,UP034",
-                "--fix-only",
-                "--unsafe-fixes",
-            ])
-            .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
-            @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    x = {'a': 1}
-    print('foo')
-
-    ----- stderr -----
-    Fixed 2 errors.
-    "###);
-}
-
-#[test]
-fn diff_shows_safe_fixes_by_default() {
-    assert_cmd_snapshot!(
-    Command::new(get_cargo_bin(BIN_NAME))
-        .args([
-            "-",
-            "--output-format",
-            "text",
-            "--isolated",
-            "--no-cache",
-            "--select",
-            "F601,UP034",
-            "--diff",
-        ])
-        .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
-        @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    @@ -1,2 +1,2 @@
-     x = {'a': 1, 'a': 1}
-    -print(('foo'))
-    +print('foo')
-
-
-    ----- stderr -----
-    Would fix 1 error (1 additional fix available with `--unsafe-fixes`).
-    "###
-    );
-}
-
-#[test]
-fn diff_shows_unsafe_fixes_with_opt_in() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args([
-                "-",
-                "--output-format",
-                "text",
-                "--isolated",
-                "--no-cache",
-                "--select",
-                "F601,UP034",
-                "--diff",
-                "--unsafe-fixes",
-            ])
-            .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
-            @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    @@ -1,2 +1,2 @@
-    -x = {'a': 1, 'a': 1}
-    -print(('foo'))
-    +x = {'a': 1}
-    +print('foo')
-
-
-    ----- stderr -----
-    Would fix 2 errors.
-    "###
-    );
-}
-
-#[test]
-fn diff_does_not_show_display_only_fixes_with_unsafe_fixes_enabled() {
-    assert_cmd_snapshot!(
-        Command::new(get_cargo_bin(BIN_NAME))
-            .args([
-                "-",
-                "--output-format",
-                "text",
-                "--isolated",
-                "--no-cache",
-                "--select",
-                "B006",
-                "--diff",
-                "--unsafe-fixes",
-            ])
-            .pass_stdin("def add_to_list(item, some_list=[]): ..."),
-            @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn diff_only_unsafe_fixes_available() {
-    assert_cmd_snapshot!(
-    Command::new(get_cargo_bin(BIN_NAME))
-        .args([
-            "-",
-            "--output-format",
-            "text",
-            "--isolated",
-            "--no-cache",
-            "--select",
-            "F601",
-            "--diff",
-        ])
-        .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
-        @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    No errors would be fixed (1 fix available with `--unsafe-fixes`).
-    "###
-    );
-}
-
-#[test]
-fn check_extend_unsafe_fixes() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-extend-unsafe-fixes = ["UP034"]
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--config"])
-        .arg(&ruff_toml)
-        .arg("-")
-        .args([
-            "--output-format",
-            "text",
-            "--no-cache",
-            "--select",
-            "F601,UP034",
-        ])
-        .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
-            @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:14: F601 Dictionary key literal `'a'` repeated
-    -:2:7: UP034 Avoid extraneous parentheses
-    Found 2 errors.
-    No fixes available (2 hidden fixes can be enabled with the `--unsafe-fixes` option).
-
-    ----- stderr -----
-    "###);
-
-    Ok(())
-}
-
-#[test]
-fn check_extend_safe_fixes() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-extend-safe-fixes = ["F601"]
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--config"])
-        .arg(&ruff_toml)
-        .arg("-")
-        .args([
-            "--output-format",
-            "text",
-            "--no-cache",
-            "--select",
-            "F601,UP034",
-        ])
-        .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
-            @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:14: F601 [*] Dictionary key literal `'a'` repeated
-    -:2:7: UP034 [*] Avoid extraneous parentheses
-    Found 2 errors.
-    [*] 2 fixable with the `--fix` option.
-
-    ----- stderr -----
-    "###);
-
-    Ok(())
-}
-
-#[test]
-fn check_extend_unsafe_fixes_conflict_with_extend_safe_fixes() -> Result<()> {
-    // Adding a rule to both options should result in it being treated as unsafe
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-extend-unsafe-fixes = ["UP034"]
-extend-safe-fixes = ["UP034"]
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--config"])
-        .arg(&ruff_toml)
-        .arg("-")
-        .args([
-            "--output-format",
-            "text",
-            "--no-cache",
-            "--select",
-            "F601,UP034",
-        ])
-        .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
-            @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:14: F601 Dictionary key literal `'a'` repeated
-    -:2:7: UP034 Avoid extraneous parentheses
-    Found 2 errors.
-    No fixes available (2 hidden fixes can be enabled with the `--unsafe-fixes` option).
-
-    ----- stderr -----
-    "###);
-
-    Ok(())
-}
--- a/crates/ruff_cli/tests/lint.rs
+++ b/crates/ruff_cli/tests/lint.rs
@@ -1,310 +0,0 @@
-//! Tests the interaction of the `lint` configuration section
-
-#![cfg(not(target_family = "wasm"))]
-
-use std::fs;
-use std::process::Command;
-use std::str;
-
-use anyhow::Result;
-use insta_cmd::{assert_cmd_snapshot, get_cargo_bin};
-use tempfile::TempDir;
-
-const BIN_NAME: &str = "ruff";
-const STDIN_BASE_OPTIONS: &[&str] = &["--no-cache", "--output-format", "text"];
-
-#[test]
-fn top_level_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend-select = ["B", "Q"]
-
-[flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    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 -----
-    "###);
-    Ok(())
-}
-
-#[test]
-fn lint_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-extend-select = ["B", "Q"]
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"a = "abcba".strip("aba")"#), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:5: Q000 [*] Double quotes found but single quotes preferred
-    -:1:5: B005 Using `.strip()` with multi-character strings is misleading
-    -:1:19: Q000 [*] Double quotes found but single quotes preferred
-    Found 3 errors.
-    [*] 2 fixable with the `--fix` option.
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
-/// Tests that configurations from the top-level and `lint` section are merged together.
-#[test]
-fn mixed_levels() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend-select = ["B", "Q"]
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"a = "abcba".strip("aba")"#), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:5: Q000 [*] Double quotes found but single quotes preferred
-    -:1:5: B005 Using `.strip()` with multi-character strings is misleading
-    -:1:19: Q000 [*] Double quotes found but single quotes preferred
-    Found 3 errors.
-    [*] 2 fixable with the `--fix` option.
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
-/// Tests that options in the `lint` section have higher precedence than top-level options (because they are more specific).
-#[test]
-fn precedence() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint]
-extend-select = ["B", "Q"]
-
-[flake8-quotes]
-inline-quotes = "double"
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .arg("--config")
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"a = "abcba".strip("aba")"#), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:5: Q000 [*] Double quotes found but single quotes preferred
-    -:1:5: B005 Using `.strip()` with multi-character strings is misleading
-    -:1:19: Q000 [*] Double quotes found but single quotes preferred
-    Found 3 errors.
-    [*] 2 fixable with the `--fix` option.
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
-#[test]
-fn exclude() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend-select = ["B", "Q"]
-extend-exclude = ["out"]
-
-[lint]
-exclude = ["test.py", "generated.py"]
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    fs::write(
-        tempdir.path().join("main.py"),
-        r#"
-from test import say_hy
-
-if __name__ == "__main__":
-    say_hy("dear Ruff contributor")
-"#,
-    )?;
-
-    // Excluded file but passed to the CLI directly, should be linted
-    let test_path = tempdir.path().join("test.py");
-    fs::write(
-        &test_path,
-        r#"
-def say_hy(name: str):
-        print(f"Hy {name}")"#,
-    )?;
-
-    fs::write(
-        tempdir.path().join("generated.py"),
-        r#"NUMBERS = [
-     0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
-    10, 11, 12, 13, 14, 15, 16, 17, 18, 19
-]
-OTHER = "OTHER"
-"#,
-    )?;
-
-    let out_dir = tempdir.path().join("out");
-    fs::create_dir(&out_dir)?;
-
-    fs::write(out_dir.join("a.py"), r#"a = "a""#)?;
-
-    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
-        .arg(test_path.file_name().unwrap())
-        // Lint all other files in the directory, should respect the `exclude` and `lint.exclude` options
-        .arg("."), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    main.py:4:16: Q000 [*] Double quotes found but single quotes preferred
-    main.py:5:12: Q000 [*] Double quotes found but single quotes preferred
-    test.py:3:15: Q000 [*] Double quotes found but single quotes preferred
-    Found 3 errors.
-    [*] 3 fixable with the `--fix` option.
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
-#[test]
-fn exclude_stdin() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend-select = ["B", "Q"]
-
-[lint]
-exclude = ["generated.py"]
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    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"])
-        .arg("-")
-        .pass_stdin(r#"
-from test import say_hy
-
-if __name__ == "__main__":
-    say_hy("dear Ruff contributor")
-"#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
-#[test]
-fn line_too_long_width_override() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-line-length = 80
-select = ["E501"]
-
-[pycodestyle]
-max-line-length = 100
-"#,
-    )?;
-
-    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#"
-# longer than 80, but less than 100
-_ = "---------------------------------------------------------------------------亜亜亜亜亜亜"
-# longer than 100
-_ = "---------------------------------------------------------------------------亜亜亜亜亜亜亜亜亜亜亜亜亜亜"
-"#), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    test.py:5:91: E501 Line too long (109 > 100)
-    Found 1 error.
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
--- a/crates/ruff_cli/tests/snapshots/integration_test__explain_status_codes_f401.snap
+++ b/crates/ruff_cli/tests/snapshots/integration_test__explain_status_codes_f401.snap
@@ -13,7 +13,7 @@ exit_code: 0

 Derived from the **Pyflakes** linter.

-Fix is sometimes available.
+Autofix is sometimes available.

 ## What it does
 Checks for unused imports.
--- a/crates/ruff_cli/tests/snapshots/integration_test__stdin_json.snap
+++ b/crates/ruff_cli/tests/snapshots/integration_test__stdin_json.snap
@@ -6,7 +6,7 @@ info:
    - "-"
    - "--isolated"
    - "--no-cache"
-    - "--output-format"
+    - "--format"
    - json
    - "--stdin-filename"
    - F401.py
@@ -17,7 +17,6 @@ exit_code: 1
 ----- stdout -----
 [
  {
-    "cell": null,
    "code": "F401",
    "end_location": {
      "column": 10,
@@ -25,7 +24,7 @@ exit_code: 1
    },
    "filename": "/path/to/F401.py",
    "fix": {
-      "applicability": "safe",
+      "applicability": "Automatic",
      "edits": [
        {
          "content": "",
--- a/crates/ruff_dev/Cargo.toml
+++ b/crates/ruff_dev/Cargo.toml
@@ -28,7 +28,7 @@ ruff_workspace = { path = "../ruff_workspace", features = ["schemars"]}
 anyhow = { workspace = true }
 clap = { workspace = true }
 ignore = { workspace = true }
-indicatif = "0.17.7"
+indicatif = "0.17.5"
 itertools = { workspace = true }
 libcst = { workspace = true }
 once_cell = { workspace = true }
--- a/crates/ruff_dev/src/format_dev.rs
+++ b/crates/ruff_dev/src/format_dev.rs
@@ -11,6 +11,7 @@ use std::{fmt, fs, io, iter};

 use anyhow::{bail, format_err, Context, Error};
 use clap::{CommandFactory, FromArgMatches};
+use ignore::DirEntry;
 use imara_diff::intern::InternedInput;
 use imara_diff::sink::Counter;
 use imara_diff::{diff, Algorithm};
@@ -33,16 +34,16 @@ use ruff_formatter::{FormatError, LineWidth, PrintError};
 use ruff_linter::logging::LogLevel;
 use ruff_linter::settings::types::{FilePattern, FilePatternSet};
 use ruff_python_formatter::{
-    format_module_source, FormatModuleError, MagicTrailingComma, PreviewMode, PyFormatOptions,
+    format_module_source, FormatModuleError, MagicTrailingComma, PyFormatOptions,
 };
-use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig, ResolvedFile, Resolver};
+use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig, Resolver};

 /// Find files that ruff would check so we can format them. Adapted from `ruff_cli`.
 #[allow(clippy::type_complexity)]
 fn ruff_check_paths(
    dirs: &[PathBuf],
 ) -> anyhow::Result<(
-    Vec<Result<ResolvedFile, ignore::Error>>,
+    Vec<Result<DirEntry, ignore::Error>>,
    Resolver,
    PyprojectConfig,
 )> {
@@ -466,9 +467,9 @@ fn format_dev_project(
        let iter = { paths.into_par_iter() };
        #[cfg(feature = "singlethreaded")]
        let iter = { paths.into_iter() };
-        iter.map(|path| {
+        iter.map(|dir_entry| {
            let result = format_dir_entry(
-                path,
+                dir_entry,
                stability_check,
                write,
                &black_options,
@@ -526,24 +527,29 @@ fn format_dev_project(

 /// Error handling in between walkdir and `format_dev_file`
 fn format_dir_entry(
-    resolved_file: Result<ResolvedFile, ignore::Error>,
+    dir_entry: Result<DirEntry, ignore::Error>,
    stability_check: bool,
    write: bool,
    options: &BlackOptions,
    resolver: &Resolver,
    pyproject_config: &PyprojectConfig,
 ) -> anyhow::Result<(Result<Statistics, CheckFileError>, PathBuf), Error> {
-    let resolved_file = resolved_file.context("Iterating the files in the repository failed")?;
+    let dir_entry = match dir_entry.context("Iterating the files in the repository failed") {
+        Ok(dir_entry) => dir_entry,
+        Err(err) => return Err(err),
+    };
+    let file = dir_entry.path().to_path_buf();
    // For some reason it does not filter in the beginning
-    if resolved_file.file_name() == "pyproject.toml" {
-        return Ok((Ok(Statistics::default()), resolved_file.into_path()));
+    if dir_entry.file_name() == "pyproject.toml" {
+        return Ok((Ok(Statistics::default()), file));
    }

-    let path = resolved_file.into_path();
+    let path = dir_entry.path().to_path_buf();
    let mut options = options.to_py_format_options(&path);

    let settings = resolver.resolve(&path, pyproject_config);
    // That's a bad way of doing this but it's not worth doing something better for format_dev
+    // TODO(micha) use formatter settings instead
    if settings.formatter.line_width != LineWidth::default() {
        options = options.with_line_width(settings.formatter.line_width);
    }
@@ -871,7 +877,9 @@ struct BlackOptions {
    line_length: NonZeroU16,
    #[serde(alias = "skip-magic-trailing-comma")]
    skip_magic_trailing_comma: bool,
-    preview: bool,
+    #[allow(unused)]
+    #[serde(alias = "force-exclude")]
+    force_exclude: Option<String>,
 }

 impl Default for BlackOptions {
@@ -879,7 +887,7 @@ impl Default for BlackOptions {
        Self {
            line_length: NonZeroU16::new(88).unwrap(),
            skip_magic_trailing_comma: false,
-            preview: false,
+            force_exclude: None,
        }
    }
 }
@@ -927,11 +935,6 @@ impl BlackOptions {
            } else {
                MagicTrailingComma::Respect
            })
-            .with_preview(if self.preview {
-                PreviewMode::Enabled
-            } else {
-                PreviewMode::Disabled
-            })
    }
 }

--- a/crates/ruff_dev/src/generate_cli_help.rs
+++ b/crates/ruff_dev/src/generate_cli_help.rs
@@ -16,11 +16,8 @@ use crate::ROOT_DIR;
 const COMMAND_HELP_BEGIN_PRAGMA: &str = "<!-- Begin auto-generated command help. -->\n";
 const COMMAND_HELP_END_PRAGMA: &str = "<!-- End auto-generated command help. -->";

-const CHECK_HELP_BEGIN_PRAGMA: &str = "<!-- Begin auto-generated check help. -->\n";
-const CHECK_HELP_END_PRAGMA: &str = "<!-- End auto-generated check help. -->";
-
-const FORMAT_HELP_BEGIN_PRAGMA: &str = "<!-- Begin auto-generated format help. -->\n";
-const FORMAT_HELP_END_PRAGMA: &str = "<!-- End auto-generated format help. -->";
+const SUBCOMMAND_HELP_BEGIN_PRAGMA: &str = "<!-- Begin auto-generated subcommand help. -->\n";
+const SUBCOMMAND_HELP_END_PRAGMA: &str = "<!-- End auto-generated subcommand help. -->";

 #[derive(clap::Args)]
 pub(crate) struct Args {
@@ -59,15 +56,11 @@ pub(super) fn main(args: &Args) -> Result<()> {
    let command_help = trim_lines(&help_text());

    // Generate `ruff help check`.
-    let check_help = trim_lines(&subcommand_help_text("check")?);
-
-    // Generate `ruff help format`.
-    let format_help = trim_lines(&subcommand_help_text("format")?);
+    let subcommand_help = trim_lines(&check_help_text());

    if args.mode.is_dry_run() {
        print!("{command_help}");
-        print!("{check_help}");
-        print!("{format_help}");
+        print!("{subcommand_help}");
        return Ok(());
    }

@@ -84,15 +77,9 @@ pub(super) fn main(args: &Args) -> Result<()> {
    )?;
    let new = replace_docs_section(
        &new,
-        &format!("```text\n{check_help}\n```\n\n"),
-        CHECK_HELP_BEGIN_PRAGMA,
-        CHECK_HELP_END_PRAGMA,
-    )?;
-    let new = replace_docs_section(
-        &new,
-        &format!("```text\n{format_help}\n```\n\n"),
-        FORMAT_HELP_BEGIN_PRAGMA,
-        FORMAT_HELP_END_PRAGMA,
+        &format!("```text\n{subcommand_help}\n```\n\n"),
+        SUBCOMMAND_HELP_BEGIN_PRAGMA,
+        SUBCOMMAND_HELP_END_PRAGMA,
    )?;

    match args.mode {
@@ -117,19 +104,18 @@ fn help_text() -> String {
    args::Args::command().render_help().to_string()
 }

-/// Returns the output of a given subcommand (e.g., `ruff help check`).
-fn subcommand_help_text(subcommand: &str) -> Result<String> {
+/// Returns the output of `ruff help check`.
+fn check_help_text() -> String {
    let mut cmd = args::Args::command();

    // The build call is necessary for the help output to contain `Usage: ruff
    // check` instead of `Usage: check` see https://github.com/clap-rs/clap/issues/4685
    cmd.build();

-    Ok(cmd
-        .find_subcommand_mut(subcommand)
-        .with_context(|| format!("Unable to find subcommand `{subcommand}`"))?
+    cmd.find_subcommand_mut("check")
+        .expect("`check` subcommand not found")
        .render_help()
-        .to_string())
+        .to_string()
 }

 #[cfg(test)]
--- a/crates/ruff_dev/src/generate_docs.rs
+++ b/crates/ruff_dev/src/generate_docs.rs
@@ -8,10 +8,9 @@ use anyhow::Result;
 use regex::{Captures, Regex};
 use strum::IntoEnumIterator;

-use ruff_diagnostics::FixAvailability;
+use ruff_diagnostics::AutofixKind;
 use ruff_linter::registry::{Linter, Rule, RuleNamespace};
 use ruff_workspace::options::Options;
-use ruff_workspace::options_base::{OptionEntry, OptionsMetadata};

 use crate::ROOT_DIR;

@@ -37,29 +36,22 @@ pub(crate) fn main(args: &Args) -> Result<()> {
                output.push('\n');
            }

-            let fix_availability = rule.fixable();
-            if matches!(
-                fix_availability,
-                FixAvailability::Always | FixAvailability::Sometimes
-            ) {
-                output.push_str(&fix_availability.to_string());
+            let autofix = rule.autofixable();
+            if matches!(autofix, AutofixKind::Always | AutofixKind::Sometimes) {
+                output.push_str(&autofix.to_string());
                output.push('\n');
                output.push('\n');
            }

-            if rule.is_preview() || rule.is_nursery() {
+            if rule.is_preview() {
                output.push_str(
-                    r#"This rule is unstable and in [preview](../preview.md). The `--preview` flag is required for use."#,
+                    r#"This rule is in preview and is not stable. The `--preview` flag is required for use."#,
                );
                output.push('\n');
                output.push('\n');
            }

-            process_documentation(
-                explanation.trim(),
-                &mut output,
-                &rule.noqa_code().to_string(),
-            );
+            process_documentation(explanation.trim(), &mut output);

            let filename = PathBuf::from(ROOT_DIR)
                .join("docs")
@@ -78,7 +70,7 @@ pub(crate) fn main(args: &Args) -> Result<()> {
    Ok(())
 }

-fn process_documentation(documentation: &str, out: &mut String, rule_name: &str) {
+fn process_documentation(documentation: &str, out: &mut String) {
    let mut in_options = false;
    let mut after = String::new();

@@ -104,17 +96,10 @@ fn process_documentation(documentation: &str, out: &mut String, rule_name: &str)
            if let Some(rest) = line.strip_prefix("- `") {
                let option = rest.trim_end().trim_end_matches('`');

-                match Options::metadata().find(option) {
-                    Some(OptionEntry::Field(field)) => {
-                        if field.deprecated.is_some() {
-                            eprintln!("Rule {rule_name} references deprecated option {option}.");
-                        }
-                    }
-                    Some(_) => {}
-                    None => {
-                        panic!("Unknown option {option} referenced by rule {rule_name}");
-                    }
-                }
+                assert!(
+                    Options::metadata().get(option).is_some(),
+                    "unknown option {option}"
+                );

                let anchor = option.replace('.', "-");
                out.push_str(&format!("- [`{option}`][{option}]\n"));
@@ -152,7 +137,6 @@ Something [`else`][other].

 [other]: http://example.com.",
            &mut output,
-            "example",
        );
        assert_eq!(
            output,
--- a/crates/ruff_dev/src/generate_options.rs
+++ b/crates/ruff_dev/src/generate_options.rs
@@ -1,124 +1,24 @@
 //! Generate a Markdown-compatible listing of configuration options for `pyproject.toml`.
 //!
 //! Used for <https://docs.astral.sh/ruff/settings/>.
-use std::fmt::Write;
-
+use itertools::Itertools;
 use ruff_workspace::options::Options;
-use ruff_workspace::options_base::{OptionField, OptionSet, OptionsMetadata, Visit};
+use ruff_workspace::options_base::{OptionEntry, OptionField};

-pub(crate) fn generate() -> String {
-    let mut output = String::new();
-    generate_set(&mut output, &Set::Toplevel(Options::metadata()));
-
-    output
-}
-
-fn generate_set(output: &mut String, set: &Set) {
-    if set.level() < 2 {
-        writeln!(output, "### {title}\n", title = set.title()).unwrap();
-    } else {
-        writeln!(output, "#### {title}\n", title = set.title()).unwrap();
-    }
-
-    if let Some(documentation) = set.metadata().documentation() {
-        output.push_str(documentation);
-        output.push('\n');
-        output.push('\n');
-    }
-
-    let mut visitor = CollectOptionsVisitor::default();
-    set.metadata().record(&mut visitor);
-
-    let (mut fields, mut sets) = (visitor.fields, visitor.groups);
-
-    fields.sort_unstable_by(|(name, _), (name2, _)| name.cmp(name2));
-    sets.sort_unstable_by(|(name, _), (name2, _)| name.cmp(name2));
-
-    // Generate the fields.
-    for (name, field) in &fields {
-        emit_field(output, name, field, set);
-        output.push_str("---\n\n");
-    }
-
-    // Generate all the sub-sets.
-    for (set_name, sub_set) in &sets {
-        generate_set(output, &Set::Named(set_name, *sub_set, set.level() + 1));
-    }
-}
-
-enum Set<'a> {
-    Toplevel(OptionSet),
-    Named(&'a str, OptionSet, u32),
-}
-
-impl<'a> Set<'a> {
-    fn name(&self) -> Option<&'a str> {
-        match self {
-            Set::Toplevel(_) => None,
-            Set::Named(name, _, _) => Some(name),
-        }
-    }
-
-    fn title(&self) -> &'a str {
-        match self {
-            Set::Toplevel(_) => "Top-level",
-            Set::Named(name, _, _) => name,
-        }
-    }
-
-    fn metadata(&self) -> &OptionSet {
-        match self {
-            Set::Toplevel(set) => set,
-            Set::Named(_, set, _) => set,
-        }
-    }
-
-    fn level(&self) -> u32 {
-        match self {
-            Set::Toplevel(_) => 0,
-            Set::Named(_, _, level) => *level,
-        }
-    }
-}
-
-fn emit_field(output: &mut String, name: &str, field: &OptionField, parent_set: &Set) {
-    let header_level = if parent_set.level() < 2 {
-        "####"
-    } else {
-        "#####"
-    };
-
-    // if there's a set name, we need to add it to the anchor
-    if let Some(set_name) = parent_set.name() {
+fn emit_field(output: &mut String, name: &str, field: &OptionField, group_name: Option<&str>) {
+    // if there's a group name, we need to add it to the anchor
+    if let Some(group_name) = group_name {
        // the anchor used to just be the name, but now it's the group name
        // for backwards compatibility, we need to keep the old anchor
        output.push_str(&format!("<span id=\"{name}\"></span>\n"));

        output.push_str(&format!(
-            "{header_level} [`{name}`](#{set_name}-{name}) {{: #{set_name}-{name} }}\n"
+            "#### [`{name}`](#{group_name}-{name}) {{: #{group_name}-{name} }}\n"
        ));
    } else {
-        output.push_str(&format!("{header_level} [`{name}`](#{name})\n"));
+        output.push_str(&format!("#### [`{name}`](#{name})\n"));
    }
    output.push('\n');
-
-    if let Some(deprecated) = &field.deprecated {
-        output.push_str("!!! warning \"Deprecated\"\n");
-        output.push_str("    This option has been deprecated");
-
-        if let Some(since) = deprecated.since {
-            write!(output, " in {since}").unwrap();
-        }
-
-        output.push('.');
-
-        if let Some(message) = deprecated.message {
-            writeln!(output, " {message}").unwrap();
-        }
-
-        output.push('\n');
-    }
-
    output.push_str(field.doc);
    output.push_str("\n\n");
    output.push_str(&format!("**Default value**: `{}`\n", field.default));
@@ -127,8 +27,8 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parent_set:
    output.push('\n');
    output.push_str(&format!(
        "**Example usage**:\n\n```toml\n[tool.ruff{}]\n{}\n```\n",
-        if let Some(set_name) = parent_set.name() {
-            format!(".{set_name}")
+        if group_name.is_some() {
+            format!(".{}", group_name.unwrap())
        } else {
            String::new()
        },
@@ -137,18 +37,38 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parent_set:
    output.push('\n');
 }

-#[derive(Default)]
-struct CollectOptionsVisitor {
-    groups: Vec<(String, OptionSet)>,
-    fields: Vec<(String, OptionField)>,
-}
+pub(crate) fn generate() -> String {
+    let mut output: String = "### Top-level\n\n".into();

-impl Visit for CollectOptionsVisitor {
-    fn record_set(&mut self, name: &str, group: OptionSet) {
-        self.groups.push((name.to_owned(), group));
+    let sorted_options: Vec<_> = Options::metadata()
+        .into_iter()
+        .sorted_by_key(|(name, _)| *name)
+        .collect();
+
+    // Generate all the top-level fields.
+    for (name, entry) in &sorted_options {
+        let OptionEntry::Field(field) = entry else {
+            continue;
+        };
+        emit_field(&mut output, name, field, None);
+        output.push_str("---\n\n");
    }

-    fn record_field(&mut self, name: &str, field: OptionField) {
-        self.fields.push((name.to_owned(), field));
+    // Generate all the sub-groups.
+    for (group_name, entry) in &sorted_options {
+        let OptionEntry::Group(fields) = entry else {
+            continue;
+        };
+        output.push_str(&format!("### {group_name}\n"));
+        output.push('\n');
+        for (name, entry) in fields.iter().sorted_by_key(|(name, _)| name) {
+            let OptionEntry::Field(field) = entry else {
+                continue;
+            };
+            emit_field(&mut output, name, field, Some(group_name));
+            output.push_str("---\n\n");
+        }
    }
+
+    output
 }
--- a/crates/ruff_dev/src/generate_rules_table.rs
+++ b/crates/ruff_dev/src/generate_rules_table.rs
@@ -5,11 +5,10 @@
 use itertools::Itertools;
 use strum::IntoEnumIterator;

-use ruff_diagnostics::FixAvailability;
+use ruff_diagnostics::AutofixKind;
 use ruff_linter::registry::{Linter, Rule, RuleNamespace};
 use ruff_linter::upstream_categories::UpstreamCategoryAndPrefix;
 use ruff_workspace::options::Options;
-use ruff_workspace::options_base::OptionsMetadata;

 const FIX_SYMBOL: &str = "🛠️";
 const PREVIEW_SYMBOL: &str = "🧪";
@@ -20,18 +19,16 @@ 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 fix_token = match rule.fixable() {
-            FixAvailability::Always | FixAvailability::Sometimes => {
-                format!("<span title='Automatic fix available'>{FIX_SYMBOL}</span>")
-            }
-            FixAvailability::None => {
-                format!("<span style='opacity: 0.1' aria-hidden='true'>{FIX_SYMBOL}</span>")
+        let fix_token = match rule.autofixable() {
+            AutofixKind::Always | AutofixKind::Sometimes => {
+                format!("<span style='opacity: 1'>{FIX_SYMBOL}</span>")
            }
+            AutofixKind::None => format!("<span style='opacity: 0.1'>{FIX_SYMBOL}</span>"),
        };
        let preview_token = if rule.is_preview() || rule.is_nursery() {
-            format!("<span title='Rule is in preview'>{PREVIEW_SYMBOL}</span>")
+            format!("<span style='opacity: 1'>{PREVIEW_SYMBOL}</span>")
        } else {
-            format!("<span style='opacity: 0.1' aria-hidden='true'>{PREVIEW_SYMBOL}</span>")
+            format!("<span style='opacity: 0.1'>{PREVIEW_SYMBOL}</span>")
        };
        let status_token = format!("{fix_token} {preview_token}");

@@ -107,7 +104,10 @@ pub(crate) fn generate() -> String {
            table_out.push('\n');
        }

-        if Options::metadata().has(linter.name()) {
+        if Options::metadata()
+            .iter()
+            .any(|(name, _)| name == &linter.name())
+        {
            table_out.push_str(&format!(
                "For related settings, see [{}](settings.md#{}).",
                linter.name(),
--- a/crates/ruff_diagnostics/Cargo.toml
+++ b/crates/ruff_diagnostics/Cargo.toml
@@ -17,5 +17,4 @@ ruff_text_size = { path = "../ruff_text_size" }

 anyhow = { workspace = true }
 log = { workspace = true }
-is-macro = { workspace = true }
 serde = { workspace = true, optional = true, features = [] }
--- a/crates/ruff_diagnostics/src/fix.rs
+++ b/crates/ruff_diagnostics/src/fix.rs
@@ -5,22 +5,27 @@ use ruff_text_size::{Ranged, TextSize};

 use crate::edit::Edit;

-/// Indicates if a fix can be applied.
-#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord, is_macro::Is)]
+/// Indicates confidence in the correctness of a suggested fix.
+#[derive(Default, Copy, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "serde", serde(rename_all = "lowercase"))]
 pub enum Applicability {
-    /// The fix is unsafe and should only be displayed for manual application by the user.
-    /// The fix is likely to be incorrect or the resulting code may have invalid syntax.
-    Display,
+    /// The fix is definitely what the user intended, or maintains the exact meaning of the code.
+    /// This fix should be automatically applied.
+    Automatic,

-    /// The fix is unsafe and should only be applied with user opt-in.
-    /// The fix may be what the user intended, but it is uncertain; the resulting code will have valid syntax.
-    Unsafe,
+    /// The fix may be what the user intended, but it is uncertain.
+    /// The fix should result in valid code if it is applied.
+    /// The fix can be applied with user opt-in.
+    Suggested,

-    /// The fix is safe and can always be applied.
-    /// The fix is definitely what the user intended, or it maintains the exact meaning of the code.
-    Safe,
+    /// The fix has a good chance of being incorrect or the code be incomplete.
+    /// The fix may result in invalid code if it is applied.
+    /// The fix should only be manually applied by the user.
+    Manual,
+
+    /// The applicability of the fix is unknown.
+    #[default]
+    Unspecified,
 }

 /// Indicates the level of isolation required to apply a fix.
@@ -47,62 +52,86 @@ pub struct Fix {
 }

 impl Fix {
-    /// Create a new [`Fix`] that is [safe](Applicability::Safe) to apply from an [`Edit`] element.
-    pub fn safe_edit(edit: Edit) -> Self {
+    /// Create a new [`Fix`] with an unspecified applicability from an [`Edit`] element.
+    #[deprecated(
+        note = "Use `Fix::automatic`, `Fix::suggested`, or `Fix::manual` instead to specify an applicability."
+    )]
+    pub fn unspecified(edit: Edit) -> Self {
        Self {
            edits: vec![edit],
-            applicability: Applicability::Safe,
+            applicability: Applicability::Unspecified,
            isolation_level: IsolationLevel::default(),
        }
    }

-    /// Create a new [`Fix`] that is [safe](Applicability::Safe) to apply from multiple [`Edit`] elements.
-    pub fn safe_edits(edit: Edit, rest: impl IntoIterator<Item = Edit>) -> Self {
-        let mut edits: Vec<Edit> = std::iter::once(edit).chain(rest).collect();
-        edits.sort_by_key(|edit| (edit.start(), edit.end()));
+    /// Create a new [`Fix`] with an unspecified applicability from multiple [`Edit`] elements.
+    #[deprecated(
+        note = "Use `Fix::automatic_edits`, `Fix::suggested_edits`, or `Fix::manual_edits` instead to specify an applicability."
+    )]
+    pub fn unspecified_edits(edit: Edit, rest: impl IntoIterator<Item = Edit>) -> Self {
        Self {
-            edits,
-            applicability: Applicability::Safe,
+            edits: std::iter::once(edit).chain(rest).collect(),
+            applicability: Applicability::Unspecified,
            isolation_level: IsolationLevel::default(),
        }
    }

-    /// Create a new [`Fix`] that is [unsafe](Applicability::Unsafe) to apply from an [`Edit`] element.
-    pub fn unsafe_edit(edit: Edit) -> Self {
+    /// Create a new [`Fix`] with [automatic applicability](Applicability::Automatic) from an [`Edit`] element.
+    pub fn automatic(edit: Edit) -> Self {
        Self {
            edits: vec![edit],
-            applicability: Applicability::Unsafe,
+            applicability: Applicability::Automatic,
            isolation_level: IsolationLevel::default(),
        }
    }

-    /// Create a new [`Fix`] that is [unsafe](Applicability::Unsafe) to apply from multiple [`Edit`] elements.
-    pub fn unsafe_edits(edit: Edit, rest: impl IntoIterator<Item = Edit>) -> Self {
+    /// Create a new [`Fix`] with [automatic applicability](Applicability::Automatic) from multiple [`Edit`] elements.
+    pub fn automatic_edits(edit: Edit, rest: impl IntoIterator<Item = Edit>) -> Self {
        let mut edits: Vec<Edit> = std::iter::once(edit).chain(rest).collect();
-        edits.sort_by_key(|edit| (edit.start(), edit.end()));
+        edits.sort_by_key(Ranged::start);
        Self {
            edits,
-            applicability: Applicability::Unsafe,
+            applicability: Applicability::Automatic,
            isolation_level: IsolationLevel::default(),
        }
    }

-    /// Create a new [`Fix`] that should only [display](Applicability::Display) and not apply from an [`Edit`] element .
-    pub fn display_edit(edit: Edit) -> Self {
+    /// Create a new [`Fix`] with [suggested applicability](Applicability::Suggested) from an [`Edit`] element.
+    pub fn suggested(edit: Edit) -> Self {
        Self {
            edits: vec![edit],
-            applicability: Applicability::Display,
+            applicability: Applicability::Suggested,
            isolation_level: IsolationLevel::default(),
        }
    }

-    /// Create a new [`Fix`] that should only [display](Applicability::Display) and not apply from multiple [`Edit`] elements.
-    pub fn display_edits(edit: Edit, rest: impl IntoIterator<Item = Edit>) -> Self {
+    /// Create a new [`Fix`] with [suggested applicability](Applicability::Suggested) from multiple [`Edit`] elements.
+    pub fn suggested_edits(edit: Edit, rest: impl IntoIterator<Item = Edit>) -> Self {
        let mut edits: Vec<Edit> = std::iter::once(edit).chain(rest).collect();
-        edits.sort_by_key(|edit| (edit.start(), edit.end()));
+        edits.sort_by_key(Ranged::start);
        Self {
            edits,
-            applicability: Applicability::Display,
+            applicability: Applicability::Suggested,
+            isolation_level: IsolationLevel::default(),
+        }
+    }
+
+    /// Create a new [`Fix`] with [manual applicability](Applicability::Manual) from an [`Edit`] element.
+    pub fn manual(edit: Edit) -> Self {
+        Self {
+            edits: vec![edit],
+            applicability: Applicability::Manual,
+            isolation_level: IsolationLevel::default(),
+        }
+    }
+
+    /// Create a new [`Fix`] with [manual applicability](Applicability::Manual) from multiple [`Edit`] elements.
+    pub fn manual_edits(edit: Edit, rest: impl IntoIterator<Item = Edit>) -> Self {
+        let mut edits: Vec<Edit> = std::iter::once(edit).chain(rest).collect();
+        edits.sort_by_key(Ranged::start);
+        Self {
+            edits,
+            applicability: Applicability::Manual,
            isolation_level: IsolationLevel::default(),
        }
    }
@@ -133,16 +162,4 @@ impl Fix {
        self.isolation_level = isolation;
        self
    }
-
-    /// Return [`true`] if this [`Fix`] should be applied with at a given [`Applicability`].
-    pub fn applies(&self, applicability: Applicability) -> bool {
-        self.applicability >= applicability
-    }
-
-    /// Create a new [`Fix`] with the given [`Applicability`].
-    #[must_use]
-    pub fn with_applicability(mut self, applicability: Applicability) -> Self {
-        self.applicability = applicability;
-        self
-    }
 }
--- a/crates/ruff_diagnostics/src/lib.rs
+++ b/crates/ruff_diagnostics/src/lib.rs
@@ -2,7 +2,7 @@ pub use diagnostic::{Diagnostic, DiagnosticKind};
 pub use edit::Edit;
 pub use fix::{Applicability, Fix, IsolationLevel};
 pub use source_map::{SourceMap, SourceMarker};
-pub use violation::{AlwaysFixableViolation, FixAvailability, Violation};
+pub use violation::{AlwaysAutofixableViolation, AutofixKind, Violation};

 mod diagnostic;
 mod edit;
--- a/crates/ruff_diagnostics/src/source_map.rs
+++ b/crates/ruff_diagnostics/src/source_map.rs
@@ -46,7 +46,10 @@ impl SourceMap {
    /// The `output_length` is the length of the transformed string before the
    /// edit is applied.
    pub fn push_start_marker(&mut self, edit: &Edit, output_length: TextSize) {
-        self.push_marker(edit.start(), output_length);
+        self.0.push(SourceMarker {
+            source: edit.start(),
+            dest: output_length,
+        });
    }

    /// Push the end marker for an [`Edit`].
@@ -55,18 +58,16 @@ impl SourceMap {
    /// edit has been applied.
    pub fn push_end_marker(&mut self, edit: &Edit, output_length: TextSize) {
        if edit.is_insertion() {
-            self.push_marker(edit.start(), output_length);
+            self.0.push(SourceMarker {
+                source: edit.start(),
+                dest: output_length,
+            });
        } else {
            // Deletion or replacement
-            self.push_marker(edit.end(), output_length);
+            self.0.push(SourceMarker {
+                source: edit.end(),
+                dest: output_length,
+            });
        }
    }
-
-    /// Push a new marker to the sourcemap.
-    pub fn push_marker(&mut self, offset: TextSize, output_length: TextSize) {
-        self.0.push(SourceMarker {
-            source: offset,
-            dest: output_length,
-        });
-    }
 }
--- a/crates/ruff_diagnostics/src/violation.rs
+++ b/crates/ruff_diagnostics/src/violation.rs
@@ -1,26 +1,26 @@
 use std::fmt::{Debug, Display};

 #[derive(Debug, Copy, Clone)]
-pub enum FixAvailability {
+pub enum AutofixKind {
    Sometimes,
    Always,
    None,
 }

-impl Display for FixAvailability {
+impl Display for AutofixKind {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        match self {
-            FixAvailability::Sometimes => write!(f, "Fix is sometimes available."),
-            FixAvailability::Always => write!(f, "Fix is always available."),
-            FixAvailability::None => write!(f, "Fix is not available."),
+            AutofixKind::Sometimes => write!(f, "Autofix is sometimes available."),
+            AutofixKind::Always => write!(f, "Autofix is always available."),
+            AutofixKind::None => write!(f, "Autofix is not available."),
        }
    }
 }

 pub trait Violation: Debug + PartialEq + Eq {
-    /// `None` in the case an fix is never available or otherwise Some
-    /// [`FixAvailability`] describing the available fix.
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::None;
+    /// `None` in the case an autofix is never available or otherwise Some
+    /// [`AutofixKind`] describing the available autofix.
+    const AUTOFIX: AutofixKind = AutofixKind::None;

    /// The message used to describe the violation.
    fn message(&self) -> String;
@@ -30,13 +30,13 @@ pub trait Violation: Debug + PartialEq + Eq {
        None
    }

-    // TODO(micha): Move `fix_title` to `Fix`, add new `advice` method that is shown as an advice.
+    // TODO(micha): Move `autofix_title` to `Fix`, add new `advice` method that is shown as an advice.
    // Change the `Diagnostic` renderer to show the advice, and render the fix message after the `Suggested fix: <here>`

-    /// Returns the title for the fix. The message is also shown as an advice as part of the diagnostics.
+    /// Returns the title for the autofix. The message is also shown as an advice as part of the diagnostics.
    ///
-    /// Required for rules that have fixes.
-    fn fix_title(&self) -> Option<String> {
+    /// Required for rules that have autofixes.
+    fn autofix_title(&self) -> Option<String> {
        None
    }

@@ -45,8 +45,8 @@ pub trait Violation: Debug + PartialEq + Eq {
 }

 /// This trait exists just to make implementing the [`Violation`] trait more
-/// convenient for violations that can always be fixed.
-pub trait AlwaysFixableViolation: Debug + PartialEq + Eq {
+/// convenient for violations that can always be autofixed.
+pub trait AlwaysAutofixableViolation: Debug + PartialEq + Eq {
    /// The message used to describe the violation.
    fn message(&self) -> String;

@@ -55,31 +55,31 @@ pub trait AlwaysFixableViolation: Debug + PartialEq + Eq {
        None
    }

-    /// The title displayed for the available fix.
-    fn fix_title(&self) -> String;
+    /// The title displayed for the available autofix.
+    fn autofix_title(&self) -> String;

    /// Returns the format strings used by
-    /// [`message`](AlwaysFixableViolation::message).
+    /// [`message`](AlwaysAutofixableViolation::message).
    fn message_formats() -> &'static [&'static str];
 }

 /// A blanket implementation.
-impl<V: AlwaysFixableViolation> Violation for V {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Always;
+impl<VA: AlwaysAutofixableViolation> Violation for VA {
+    const AUTOFIX: AutofixKind = AutofixKind::Always;

    fn message(&self) -> String {
-        <Self as AlwaysFixableViolation>::message(self)
+        <Self as AlwaysAutofixableViolation>::message(self)
    }

    fn explanation() -> Option<&'static str> {
-        <Self as AlwaysFixableViolation>::explanation()
+        <Self as AlwaysAutofixableViolation>::explanation()
    }

-    fn fix_title(&self) -> Option<String> {
-        Some(<Self as AlwaysFixableViolation>::fix_title(self))
+    fn autofix_title(&self) -> Option<String> {
+        Some(<Self as AlwaysAutofixableViolation>::autofix_title(self))
    }

    fn message_formats() -> &'static [&'static str] {
-        <Self as AlwaysFixableViolation>::message_formats()
+        <Self as AlwaysAutofixableViolation>::message_formats()
    }
 }
--- a/crates/ruff_formatter/Cargo.toml
+++ b/crates/ruff_formatter/Cargo.toml
@@ -20,7 +20,7 @@ rustc-hash = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 static_assertions = { workspace = true }
-tracing = { workspace = true }
+tracing = { version = "0.1.37", default-features = false, features = ["std"] }
 unicode-width = { workspace = true }

 [dev-dependencies]
--- a/crates/ruff_formatter/src/builders.rs
+++ b/crates/ruff_formatter/src/builders.rs
@@ -2448,7 +2448,7 @@ where

    /// Adds a new entry to the join output.
    pub fn entry(&mut self, entry: &dyn Format<Context>) -> &mut Self {
-        self.result = self.result.and_then(|()| {
+        self.result = self.result.and_then(|_| {
            if let Some(with) = &self.with {
                if self.has_elements {
                    with.fmt(self.fmt)?;
@@ -2519,7 +2519,7 @@ impl<'a, 'buf, Context> FillBuilder<'a, 'buf, Context> {
        separator: &dyn Format<Context>,
        entry: &dyn Format<Context>,
    ) -> &mut Self {
-        self.result = self.result.and_then(|()| {
+        self.result = self.result.and_then(|_| {
            if self.empty {
                self.empty = false;
            } else {
--- a/crates/ruff_formatter/src/diagnostics.rs
+++ b/crates/ruff_formatter/src/diagnostics.rs
@@ -1,6 +1,5 @@
 use crate::prelude::TagKind;
 use crate::GroupId;
-use ruff_text_size::TextRange;
 use std::error::Error;

 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
@@ -12,7 +11,7 @@ pub enum FormatError {
    SyntaxError { message: &'static str },
    /// In case range formatting failed because the provided range was larger
    /// than the formatted syntax tree
-    RangeError { input: TextRange, tree: TextRange },
+    RangeError { row: usize, col: usize },

    /// In case printing the document failed because it has an invalid structure.
    InvalidDocument(InvalidDocumentError),
@@ -32,9 +31,9 @@ impl std::fmt::Display for FormatError {
            FormatError::SyntaxError {message} => {
                std::write!(fmt, "syntax error: {message}")
            },
-            FormatError::RangeError { input, tree } => std::write!(
+            FormatError::RangeError { row, col } => std::write!(
                fmt,
-                "formatting range {input:?} is larger than syntax tree {tree:?}"
+                "formatting range {row}:{col} is not a valid index"
            ),
            FormatError::InvalidDocument(error) => std::write!(fmt, "Invalid document: {error}\n\n This is an internal Rome error. Please report if necessary."),
            FormatError::PoorLayout => {
--- a/crates/ruff_formatter/src/lib.rs
+++ b/crates/ruff_formatter/src/lib.rs
@@ -55,11 +55,7 @@ use ruff_macros::CacheKey;
 use ruff_text_size::{TextRange, TextSize};

 #[derive(Debug, Eq, PartialEq, Clone, Copy, Hash, CacheKey)]
-#[cfg_attr(
-    feature = "serde",
-    derive(serde::Serialize, serde::Deserialize),
-    serde(rename_all = "kebab-case")
-)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[derive(Default)]
 pub enum IndentStyle {
@@ -95,7 +91,7 @@ impl std::fmt::Display for IndentStyle {
 ///
 /// Determines the visual width of a tab character (`\t`) and the number of
 /// spaces per indent when using [`IndentStyle::Space`].
-#[derive(Clone, Copy, Debug, Eq, PartialEq, CacheKey)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct IndentWidth(NonZeroU8);
@@ -575,10 +571,6 @@ where
            context: PhantomData,
        }
    }
-
-    pub fn rule(&self) -> &R {
-        &self.rule
-    }
 }

 impl<T, R, O, C> FormatRefWithRule<'_, T, R, C>
--- a/crates/ruff_formatter/src/macros.rs
+++ b/crates/ruff_formatter/src/macros.rs
@@ -334,7 +334,7 @@ macro_rules! best_fitting {
            $crate::BestFitting::from_arguments_unchecked($crate::format_args!($least_expanded, $($tail),+))
        }
    }}
-}
+    }

 #[cfg(test)]
 mod tests {
--- a/crates/ruff_formatter/src/printer/mod.rs
+++ b/crates/ruff_formatter/src/printer/mod.rs
@@ -54,7 +54,7 @@ impl<'a> Printer<'a> {

    /// Prints the passed in element as well as all its content,
    /// starting at the specified indentation level
-    #[tracing::instrument(level = "debug", name = "Printer::print", skip_all)]
+    #[tracing::instrument(name = "Printer::print", skip_all)]
    pub fn print_with_indent(
        mut self,
        document: &'a Document,
--- a/crates/ruff_formatter/src/printer/printer_options/mod.rs
+++ b/crates/ruff_formatter/src/printer/printer_options/mod.rs
@@ -1,4 +1,5 @@
 use crate::{FormatOptions, IndentStyle, IndentWidth, LineWidth};
+use ruff_macros::CacheKey;

 /// Options that affect how the [`crate::Printer`] prints the format tokens
 #[derive(Clone, Debug, Eq, PartialEq, Default)]
@@ -120,7 +121,7 @@ impl SourceMapGeneration {
    }
 }

-#[derive(Copy, Clone, Debug, Eq, PartialEq, Default)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Default, CacheKey)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum LineEnding {
    ///  Line Feed only (\n), common on Linux and macOS as well as inside git repos
--- a/crates/ruff_linter/Cargo.toml
+++ b/crates/ruff_linter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.1.3"
+version = "0.0.290"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -29,7 +29,6 @@ ruff_python_parser = { path = "../ruff_python_parser" }
 ruff_source_file = { path = "../ruff_source_file", features = ["serde"] }
 ruff_text_size = { path = "../ruff_text_size" }

-aho-corasick = { version = "1.1.2" }
 annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { workspace = true }
 bitflags = { workspace = true }
@@ -46,20 +45,22 @@ libcst = { workspace = true }
 log = { workspace = true }
 memchr = { workspace = true }
 natord = { version = "1.0.9" }
+num-bigint = { workspace = true }
+num-traits = { workspace = true }
 once_cell = { workspace = true }
 path-absolutize = { workspace = true, features = [
  "once_cell_cache",
  "use_unix_paths_on_wasm",
 ] }
 pathdiff = { version = "0.2.1" }
-pep440_rs = { version = "0.3.12", features = ["serde"] }
+pep440_rs = { version = "0.3.1", features = ["serde"] }
 pyproject-toml = { version = "0.7.0" }
 quick-junit = { version = "0.3.2" }
 regex = { workspace = true }
 result-like = { version = "0.4.6" }
 rustc-hash = { workspace = true }
 schemars = { workspace = true, optional = true }
-semver = { version = "1.0.20" }
+semver = { version = "1.0.16" }
 serde = { workspace = true }
 serde_json = { workspace = true }
 similar = { workspace = true }
@@ -70,7 +71,7 @@ thiserror = { workspace = true }
 toml = { workspace = true }
 typed-arena = { version = "2.0.2" }
 unicode-width = { workspace = true }
-unicode_names2 = { workspace = true }
+unicode_names2 = { version = "0.6.0", git = "https://github.com/youknowone/unicode_names2.git", rev = "4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" }
 wsl = { version = "0.1.0" }

 [dev-dependencies]
--- a/crates/ruff_linter/resources/test/fixtures/flake8_annotations/annotation_presence.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_annotations/annotation_presence.py
@@ -158,9 +158,3 @@ class Foo:
    @decorator()
    def __init__(self: "Foo", foo: int):
       ...
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7711
-class Class:
-    def __init__(self):
-        print(f"{self.attr=}")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S103.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S103.py
@@ -20,4 +20,3 @@ os.chmod(keyfile, stat.S_IRWXO | stat.S_IRWXG | stat.S_IRWXU)  # Error
 os.chmod("~/hidden_exec", stat.S_IXGRP)  # Error
 os.chmod("~/hidden_exec", stat.S_IXOTH)  # OK
 os.chmod("/etc/passwd", stat.S_IWOTH)  # Error
-os.chmod("/etc/passwd", 0o100000000)  # Error
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S310.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S310.py
@@ -1,19 +0,0 @@
-import urllib.request
-
-urllib.request.urlopen(url='http://www.google.com')
-urllib.request.urlopen(url='http://www.google.com', **kwargs)
-urllib.request.urlopen('http://www.google.com')
-urllib.request.urlopen('file:///foo/bar/baz')
-urllib.request.urlopen(url)
-
-urllib.request.Request(url='http://www.google.com', **kwargs)
-urllib.request.Request(url='http://www.google.com')
-urllib.request.Request('http://www.google.com')
-urllib.request.Request('file:///foo/bar/baz')
-urllib.request.Request(url)
-
-urllib.request.URLopener().open(fullurl='http://www.google.com', **kwargs)
-urllib.request.URLopener().open(fullurl='http://www.google.com')
-urllib.request.URLopener().open('http://www.google.com')
-urllib.request.URLopener().open('file:///foo/bar/baz')
-urllib.request.URLopener().open(url)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S505.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S505.py
@@ -1,54 +0,0 @@
-from cryptography.hazmat import backends
-from cryptography.hazmat.primitives.asymmetric import dsa
-from cryptography.hazmat.primitives.asymmetric import ec
-from cryptography.hazmat.primitives.asymmetric import rsa
-from Crypto.PublicKey import DSA as pycrypto_dsa
-from Crypto.PublicKey import RSA as pycrypto_rsa
-from Cryptodome.PublicKey import DSA as pycryptodomex_dsa
-from Cryptodome.PublicKey import RSA as pycryptodomex_rsa
-
-# OK
-dsa.generate_private_key(key_size=2048, backend=backends.default_backend())
-ec.generate_private_key(curve=ec.SECP384R1, backend=backends.default_backend())
-rsa.generate_private_key(
-    public_exponent=65537, key_size=2048, backend=backends.default_backend()
-)
-pycrypto_dsa.generate(bits=2048)
-pycrypto_rsa.generate(bits=2048)
-pycryptodomex_dsa.generate(bits=2048)
-pycryptodomex_rsa.generate(bits=2048)
-dsa.generate_private_key(2048, backends.default_backend())
-ec.generate_private_key(ec.SECP256K1, backends.default_backend())
-rsa.generate_private_key(3, 2048, backends.default_backend())
-pycrypto_dsa.generate(2048)
-pycrypto_rsa.generate(2048)
-pycryptodomex_dsa.generate(2048)
-pycryptodomex_rsa.generate(2048)
-
-# Errors
-dsa.generate_private_key(key_size=2047, backend=backends.default_backend())
-ec.generate_private_key(curve=ec.SECT163R2, backend=backends.default_backend())
-rsa.generate_private_key(
-    public_exponent=65537, key_size=2047, backend=backends.default_backend()
-)
-pycrypto_dsa.generate(bits=2047)
-pycrypto_rsa.generate(bits=2047)
-pycryptodomex_dsa.generate(bits=2047)
-pycryptodomex_rsa.generate(bits=2047)
-dsa.generate_private_key(2047, backends.default_backend())
-ec.generate_private_key(ec.SECT163R2, backends.default_backend())
-rsa.generate_private_key(3, 2047, backends.default_backend())
-pycrypto_dsa.generate(2047)
-pycrypto_rsa.generate(2047)
-pycryptodomex_dsa.generate(2047)
-pycryptodomex_rsa.generate(2047)
-
-# Don't crash when the size is variable.
-rsa.generate_private_key(
-    public_exponent=65537, key_size=some_key_size, backend=backends.default_backend()
-)
-
-# Can't reliably know which curve was passed, in some cases like below.
-ec.generate_private_key(
-    curve=curves[self.curve]["create"](self.size), backend=backends.default_backend()
-)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S507.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S507.py
@@ -1,9 +1,7 @@
-import paramiko
 from paramiko import client
 from paramiko.client import AutoAddPolicy, WarningPolicy

 ssh_client = client.SSHClient()
-ssh_client_from_paramiko = paramiko.SSHClient()

 # OK
 ssh_client.set_missing_host_key_policy(policy=foo)
@@ -14,12 +12,10 @@ ssh_client.set_missing_host_key_policy(foo)
 # Errors
 ssh_client.set_missing_host_key_policy(client.AutoAddPolicy)
 ssh_client.set_missing_host_key_policy(client.WarningPolicy)
-ssh_client.set_missing_host_key_policy(client.AutoAddPolicy())
 ssh_client.set_missing_host_key_policy(AutoAddPolicy)
 ssh_client.set_missing_host_key_policy(policy=client.AutoAddPolicy)
 ssh_client.set_missing_host_key_policy(policy=client.WarningPolicy)
 ssh_client.set_missing_host_key_policy(policy=WarningPolicy)
-ssh_client_from_paramiko.set_missing_host_key_policy(paramiko.AutoAddPolicy)

 # Unrelated
 set_missing_host_key_policy(client.AutoAddPolicy)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_blind_except/BLE.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_blind_except/BLE.py
@@ -92,35 +92,3 @@ try:
    pass
 except Exception:
    logging.error("...", exc_info=True)
-
-
-from logging import error, exception
-
-try:
-    pass
-except Exception:
-    error("...")
-
-
-try:
-    pass
-except Exception:
-    error("...", exc_info=False)
-
-
-try:
-    pass
-except Exception:
-    error("...", exc_info=None)
-
-
-try:
-    pass
-except Exception:
-    exception("...")
-
-
-try:
-    pass
-except Exception:
-    error("...", exc_info=True)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_boolean_trap/FBT.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_boolean_trap/FBT.py
@@ -70,8 +70,6 @@ settings.set_enable_developer_extras(True)
 foo.is_(True)
 bar.is_not(False)
 next(iter([]), False)
-sa.func.coalesce(tbl.c.valid, False)
-

 class Registry:
    def __init__(self) -> None:
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B006_5.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B006_5.py
@@ -1,74 +0,0 @@
-# Move mutable arguments below imports and docstrings
-# https://github.com/astral-sh/ruff/issues/7616
-
-
-def import_module_wrong(value: dict[str, str] = {}):
-    import os
-
-
-def import_module_with_values_wrong(value: dict[str, str] = {}):
-    import os
-
-    return 2
-
-
-def import_modules_wrong(value: dict[str, str] = {}):
-    import os
-    import sys
-    import itertools
-
-
-def from_import_module_wrong(value: dict[str, str] = {}):
-    from os import path
-
-
-def from_imports_module_wrong(value: dict[str, str] = {}):
-    from os import path
-    from sys import version_info
-
-
-def import_and_from_imports_module_wrong(value: dict[str, str] = {}):
-    import os
-    from sys import version_info
-
-
-def import_docstring_module_wrong(value: dict[str, str] = {}):
-    """Docstring"""
-    import os
-
-
-def import_module_wrong(value: dict[str, str] = {}):
-    """Docstring"""
-    import os; import sys
-
-
-def import_module_wrong(value: dict[str, str] = {}):
-    """Docstring"""
-    import os; import sys; x = 1
-
-
-def import_module_wrong(value: dict[str, str] = {}):
-    """Docstring"""
-    import os; import sys
-
-
-def import_module_wrong(value: dict[str, str] = {}):
-    import os; import sys
-
-
-def import_module_wrong(value: dict[str, str] = {}):
-    import os; import sys; x = 1
-
-
-def import_module_wrong(value: dict[str, str] = {}):
-    import os; import sys
-
-
-def import_module_wrong(value: dict[str, str] = {}): import os
-
-
-def import_module_wrong(value: dict[str, str] = {}): import os; import sys
-
-
-def import_module_wrong(value: dict[str, str] = {}): \
-    import os
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B006_6.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B006_6.py
@@ -1,5 +0,0 @@
-# Import followed by whitespace with no newline
-# Same as B006_2.py, but import instead of docstring
-
-def foobar(foor, bar={}):    
-    import os                    
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B006_7.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B006_7.py
@@ -1,5 +0,0 @@
-# Import with no newline
-# Same as B006_3.py, but import instead of docstring
-
-def foobar(foor, bar={}):    
-    import os
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B009_B010.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B009_B010.py
@@ -56,11 +56,3 @@ setattr(foo.bar, r"baz", None)

 # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
 assert getattr(func, '_rpc')is True
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1732387247
-getattr(*foo, "bar")
-setattr(*foo, "bar", None)
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1739800901
-getattr(self.
-   registration.registry, '__name__')
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B014.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B014.py
@@ -76,15 +76,8 @@ except (ValueError, binascii.Error):
    pass


-# Regression test for: https://github.com/astral-sh/ruff/issues/6412
+# https://github.com/astral-sh/ruff/issues/6412
 try:
    pass
 except (ValueError, ValueError, TypeError):
    pass
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1739801758
-try:
-    pas
-except(re.error, re.error):
-    p
--- a/crates/ruff_linter/resources/test/fixtures/flake8_commas/COM81.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_commas/COM81.py
@@ -627,7 +627,7 @@ result = function(
    **{'ham': spam}
 )

-# Make sure the COM812 and UP034 rules don't fix simultaneously and cause a syntax error.
+# Make sure the COM812 and UP034 rules don't autofix simultaneously and cause a syntax error.
 the_first_one = next(
    (i for i in range(10) if i // 2 == 0)  # COM812 fix should include the final bracket
 )
--- a/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C414.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C414.py
@@ -32,16 +32,3 @@ sorted(sorted(x, key=lambda y: y))
 sorted(sorted(x, key=lambda y: y), key=lambda x: x)
 sorted(sorted(x), reverse=True)
 sorted(sorted(x, reverse=False), reverse=True)
-
-# Preserve trailing comments.
-xxxxxxxxxxx_xxxxx_xxxxx = sorted(
-    list(x_xxxx_xxxxxxxxxxx_xxxxx.xxxx()),
-    # xxxxxxxxxxx xxxxx xxxx xxx xx Nxxx, xxx xxxxxx3 xxxxxxxxx xx
-    # xx xxxx xxxxxxx xxxx xxx xxxxxxxx Nxxx
-    key=lambda xxxxx: xxxxx or "",
-)
-
-xxxxxxxxxxx_xxxxx_xxxxx = sorted(
-    list(x_xxxx_xxxxxxxxxxx_xxxxx.xxxx()),  # xxxxxxxxxxx xxxxx xxxx xxx xx Nxxx
-    key=lambda xxxxx: xxxxx or "",
-)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC.py
@@ -59,23 +59,3 @@ _ = "abc" + "def" + foo
 _ = foo + bar + "abc"
 _ = "abc" + foo + bar
 _ = foo + "abc" + bar
-
-# Multiple strings nested inside a f-string
-_ = f"a {'b' 'c' 'd'} e"
-_ = f"""abc {"def" "ghi"} jkl"""
-_ = f"""abc {
-    "def"
-    "ghi"
-} jkl"""
-
-# Nested f-strings
-_ = "a" f"b {f"c" f"d"} e" "f"
-_ = f"b {f"c" f"d {f"e" f"f"} g"} h"
-_ = f"b {f"abc" \
-    f"def"} g"
-
-# Explicitly concatenated nested f-strings
-_ = f"a {f"first"
-    + f"second"} d"
-_ = f"a {f"first {f"middle"}"
-    + f"second"} d"
--- a/crates/ruff_linter/resources/test/fixtures/flake8_logging/LOG007.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging/LOG007.py
@@ -16,9 +16,3 @@ from logging import exception

 exception("foo", exc_info=False)  # LOG007
 exception("foo", exc_info=True)  # OK
-
-
-exception = lambda *args, **kwargs: None
-
-exception("foo", exc_info=False)  # OK
-exception("foo", exc_info=True)  # OK
--- a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G001.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G001.py
@@ -16,12 +16,3 @@ from flask import current_app as app
 flask.current_app.logger.info("Hello {}".format("World!"))
 current_app.logger.info("Hello {}".format("World!"))
 app.logger.log(logging.INFO, "Hello {}".format("World!"))
-
-from logging import info, log
-
-info("Hello {}".format("World!"))
-log(logging.INFO, "Hello {}".format("World!"))
-info("Hello {}".format("World!"))
-log(logging.INFO, msg="Hello {}".format("World!"))
-log(level=logging.INFO, msg="Hello {}".format("World!"))
-log(msg="Hello {}".format("World!"), level=logging.INFO)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G002.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G002.py
@@ -2,8 +2,3 @@ import logging

 logging.info("Hello %s" % "World!")
 logging.log(logging.INFO, "Hello %s" % "World!")
-
-from logging import info, log
-
-info("Hello %s" % "World!")
-log(logging.INFO, "Hello %s" % "World!")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G003.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G003.py
@@ -2,8 +2,3 @@ import logging

 logging.info("Hello" + " " + "World!")
 logging.log(logging.INFO, "Hello" + " " + "World!")
-
-from logging import info, log
-
-info("Hello" + " " + "World!")
-log(logging.INFO, "Hello" + " " + "World!")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G004.py
@@ -6,7 +6,3 @@ logging.log(logging.INFO, f"Hello {name}")

 _LOGGER = logging.getLogger()
 _LOGGER.info(f"{__name__}")
-
-from logging import info
-info(f"{name}")
-info(f"{__name__}")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G010.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G010.py
@@ -8,8 +8,3 @@ log.warn("Hello world!")  # This shouldn't be considered as a logger candidate
 logger.warn("Hello world!")

 logging . warn("Hello World!")
-
-from logging import warn, warning, exception
-warn("foo")
-warning("foo")
-exception("foo")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G101_1.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G101_1.py
@@ -6,12 +6,3 @@ logging.info(
        "name": "foobar",
    },
 )
-
-from logging import info
-
-info(
-    "Hello world!",
-    extra={
-        "name": "foobar",
-    },
-)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G101_2.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G101_2.py
@@ -6,12 +6,3 @@ logging.info(
        name="foobar",
    ),
 )
-
-from logging import info
-
-info(
-    "Hello world!",
-    extra=dict(
-        name="foobar",
-    ),
-)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G201.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G201.py
@@ -19,24 +19,3 @@ except:
    logging.error("Hello World", exc_info=False)

 logging.error("Hello World", exc_info=sys.exc_info())
-
-# G201
-from logging import error
-try:
-    pass
-except:
-    error("Hello World", exc_info=True)
-
-try:
-    pass
-except:
-    error("Hello World", exc_info=sys.exc_info())
-
-# OK
-try:
-    pass
-except:
-    error("Hello World", exc_info=False)
-
-error("Hello World", exc_info=sys.exc_info())
-
--- a/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G202.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_logging_format/G202.py
@@ -19,23 +19,3 @@ except:
    logging.exception("Hello World", exc_info=False)

 logging.exception("Hello World", exc_info=True)
-
-# G202
-from logging import exception
-try:
-    pass
-except:
-    exception("Hello World", exc_info=True)
-
-try:
-    pass
-except:
-    exception("Hello World", exc_info=sys.exc_info())
-
-# OK
-try:
-    pass
-except:
-    exception("Hello World", exc_info=False)
-
-exception("Hello World", exc_info=True)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE790.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE790.py
@@ -123,28 +123,3 @@ except NetworkError:

 def foo() -> None:
    pass
-
-
-def foo():
-    print("foo")
-    pass
-
-
-def foo():
-    """A docstring."""
-    print("foo")
-    pass
-
-
-for i in range(10):
-    pass
-    pass
-
-for i in range(10):
-    pass
-
-    pass
-
-for i in range(10):
-    pass  # comment
-    pass
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE804.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE804.py
@@ -8,8 +8,6 @@ Foo.objects.create(**{"_id": some_id})  # PIE804

 Foo.objects.create(**{**bar})  # PIE804

-foo(**{})
-

 foo(**{**data, "foo": "buzz"})
 foo(**buzz)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
konstin	de239ace74	Add test cases	2023-09-22 15:50:34 +02:00
konstin	53b5121f30	.	2023-09-21 16:58:54 +02:00
konstin	be93983e8e	Basic nested range formatting	2023-09-21 15:23:17 +02:00
konstin	a1239b8f2d	Make basic range formatting work in vs code	2023-09-21 13:38:05 +02:00
konstin	d1b12acb3c	Add byte offset indexing	2023-09-21 13:37:52 +02:00
konstin	1aabf59f77	Formatter and parser refactoring I got confused and refactored a bit	2023-09-21 13:28:59 +02:00