Fix test

Remove empty line before raw dostrings
**Summary** This fixes a deviation with black where black would remove empty lines before raw docstrings for some reason.
2023-10-13 17:14:17 +02:00 · 2023-10-13 16:04:01 +02:00
386 changed files with 6974 additions and 15924 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -225,12 +225,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"
@@ -337,45 +337,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
-    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.2.0
        with:
          apiToken: ${{ secrets.CF_API_TOKEN }}
          accountId: ${{ secrets.CF_ACCOUNT_ID }}
--- a/.github/workflows/playground.yaml
+++ b/.github/workflows/playground.yaml
@@ -40,7 +40,7 @@ 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.2.0
        with:
          apiToken: ${{ secrets.CF_API_TOKEN }}
          accountId: ${{ secrets.CF_ACCOUNT_ID }}
--- 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
@@ -24,10 +24,6 @@ repos:
        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
@@ -2,16 +2,6 @@

 ## 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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,230 +0,0 @@
-# Changelog
-
-## 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`.
-
-### 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))
-
-### Rule changes
-
- Add `backports.strenum` to `deprecated-imports` ([#8113](https://github.com/astral-sh/ruff/pull/8113))
- Update `E721` to allow `is` and `is` not for direct type comparisons ([#7905](https://github.com/astral-sh/ruff/pull/7905))
- 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.

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,9 +28,9 @@ dependencies = [

 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
 dependencies = [
 "memchr",
 ]
@@ -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",
@@ -810,7 +810,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"

 [[package]]
 name = "flake8-to-ruff"
-version = "0.1.2"
+version = "0.0.292"
 dependencies = [
 "anyhow",
 "clap",
@@ -1084,9 +1084,9 @@ dependencies = [

 [[package]]
 name = "insta"
-version = "1.34.0"
+version = "1.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc"
+checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686"
 dependencies = [
 "console",
 "globset",
@@ -1925,14 +1925,14 @@ dependencies = [

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

 [[package]]
@@ -1949,16 +1949,10 @@ name = "regex-automata"
 version = "0.3.9"
 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"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.7.5",
 ]

 [[package]]
@@ -1973,12 +1967,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 +2039,7 @@ dependencies = [

 [[package]]
 name = "ruff_cli"
-version = "0.1.2"
+version = "0.0.292"
 dependencies = [
 "annotate-snippets 0.9.1",
 "anyhow",
@@ -2188,7 +2176,7 @@ dependencies = [

 [[package]]
 name = "ruff_linter"
-version = "0.1.2"
+version = "0.0.292"
 dependencies = [
 "aho-corasick",
 "annotate-snippets 0.9.1",
@@ -2438,7 +2426,7 @@ dependencies = [

 [[package]]
 name = "ruff_shrinking"
-version = "0.1.2"
+version = "0.1.0"
 dependencies = [
 "anyhow",
 "clap",
@@ -2658,9 +2646,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"

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

 [[package]]
 name = "serde"
@@ -2735,9 +2723,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",
@@ -2745,9 +2733,9 @@ 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",
@@ -2839,9 +2827,9 @@ 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",
@@ -2970,18 +2958,18 @@ dependencies = [

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

 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3104,10 +3092,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",
@@ -3116,9 +3105,9 @@ 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",
@@ -3127,9 +3116,9 @@ dependencies = [

 [[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",
@@ -3259,9 +3248,8 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"

 [[package]]
 name = "unicode_names2"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5506ae2c3c1ccbdf468e52fc5ef536c2ccd981f01273a4cb81aa61021f3a5f"
+version = "1.1.0"
+source = "git+https://github.com/konstin/unicode_names2?rev=e2ee8155795a13afbea5caa4dbce8d1f93bc26eb#e2ee8155795a13afbea5caa4dbce8d1f93bc26eb"
 dependencies = [
 "phf",
 "unicode_names2_generator",
@@ -3269,9 +3257,8 @@ dependencies = [

 [[package]]
 name = "unicode_names2_generator"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6dfc680313e95bc6637fa278cd7a22390c3c2cd7b8b2bd28755bc6c0fc811e7"
+version = "1.1.0"
+source = "git+https://github.com/konstin/unicode_names2?rev=e2ee8155795a13afbea5caa4dbce8d1f93bc26eb#e2ee8155795a13afbea5caa4dbce8d1f93bc26eb"
 dependencies = [
 "getopts",
 "log",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ 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.33.0", feature = ["filters", "glob"] }
 is-macro = { version = "0.3.0" }
 itertools = { version = "0.11.0" }
 libcst = { version = "1.1.0", default-features = false }
@@ -31,7 +31,7 @@ once_cell = { version = "1.17.1" }
 path-absolutize = { version = "3.1.1" }
 proc-macro2 = { version = "1.0.69" }
 quote = { version = "1.0.23" }
-regex = { version = "1.10.2" }
+regex = { version = "1.9.6" }
 rustc-hash = { version = "1.1.0" }
 schemars = { version = "0.8.15" }
 serde = { version = "1.0.152", features = ["derive"] }
@@ -41,16 +41,16 @@ similar = { version = "2.3.0", 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" }
+strum_macros = { version = "0.25.2" }
 syn = { version = "2.0.38" }
 test-case = { version = "3.2.1" }
-thiserror = { version = "1.0.50" }
+thiserror = { version = "1.0.49" }
 toml = { version = "0.7.8" }
-tracing = { version = "0.1.40" }
+tracing = { version = "0.1.37" }
 tracing-indicatif = { version = "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_names2 = { git = "https://github.com/konstin/unicode_names2", rev = "e2ee8155795a13afbea5caa4dbce8d1f93bc26eb" }
 unicode-width = { version = "0.1.11" }
 uuid = { version = "1.4.1", features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
 wsl = { version = "0.1.0" }
--- 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
 - 📦 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
+- 📏 Over [700 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.2
+  rev: v0.0.292
  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 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 = ["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,46 +207,27 @@ 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.
-magic-trailing-comma = "respect"
-
-# 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

@@ -262,8 +237,9 @@ for more on the linting and formatting commands, respectively.
 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 a formatter, 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).

--- 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.2"
+version = "0.0.292"
 description = """
 Convert Flake8 configuration files to Ruff configuration files.
 """
--- a/crates/flake8_to_ruff/src/converter.rs
+++ b/crates/flake8_to_ruff/src/converter.rs
@@ -17,8 +17,8 @@ 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, LintOptions,
+    McCabeOptions, Options, Pep8NamingOptions, PydocstyleOptions,
 };
 use ruff_workspace::pyproject::Pyproject;

@@ -99,7 +99,7 @@ pub(crate) fn convert(

    // Parse each supported option.
    let mut options = Options::default();
-    let mut lint_options = LintCommonOptions::default();
+    let mut lint_options = LintOptions::default();
    let mut flake8_annotations = Flake8AnnotationsOptions::default();
    let mut flake8_bugbear = Flake8BugbearOptions::default();
    let mut flake8_builtins = Flake8BuiltinsOptions::default();
@@ -433,11 +433,8 @@ pub(crate) fn convert(
        }
    }

-    if lint_options != LintCommonOptions::default() {
-        options.lint = Some(LintOptions {
-            common: lint_options,
-            ..LintOptions::default()
-        });
+    if lint_options != LintOptions::default() {
+        options.lint = Some(lint_options);
    }

    // Create the pyproject.toml.
@@ -468,9 +465,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, LintOptions, Options, PydocstyleOptions};
    use ruff_workspace::pyproject::Pyproject;

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

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

@@ -503,10 +498,7 @@ mod tests {
            None,
        );
        let expected = Pyproject::new(Options {
-            lint: Some(LintOptions {
-                common: lint_default_options([]),
-                ..LintOptions::default()
-            }),
+            lint: Some(lint_default_options([])),
            ..Options::default()
        });
        assert_eq!(actual, expected);
@@ -524,10 +516,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()
-            }),
+            lint: Some(lint_default_options([])),
            ..Options::default()
        });
        assert_eq!(actual, expected);
@@ -545,10 +534,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()
-            }),
+            lint: Some(lint_default_options([])),
            ..Options::default()
        });
        assert_eq!(actual, expected);
@@ -565,10 +551,7 @@ mod tests {
            Some(vec![]),
        );
        let expected = Pyproject::new(Options {
-            lint: Some(LintOptions {
-                common: lint_default_options([]),
-                ..LintOptions::default()
-            }),
+            lint: Some(lint_default_options([])),
            ..Options::default()
        });
        assert_eq!(actual, expected);
@@ -586,16 +569,13 @@ mod tests {
        );
        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,
+                }),
+                ..lint_default_options([])
            }),
            ..Options::default()
        });
@@ -617,15 +597,12 @@ mod tests {
        );
        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,
+                }),
+                ..lint_default_options([Linter::Pydocstyle.into()])
            }),
            ..Options::default()
        });
@@ -644,16 +621,13 @@ mod tests {
        );
        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,
+                }),
+                ..lint_default_options([Linter::Flake8Quotes.into()])
            }),
            ..Options::default()
        });
@@ -674,10 +648,7 @@ mod tests {
        );
        let expected = Pyproject::new(Options {
            target_version: Some(PythonVersion::Py38),
-            lint: Some(LintOptions {
-                common: lint_default_options([]),
-                ..LintOptions::default()
-            }),
+            lint: Some(lint_default_options([])),
            ..Options::default()
        });
        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/ruff_benchmark/Cargo.toml
+++ b/crates/ruff_benchmark/Cargo.toml
@@ -37,7 +37,7 @@ serde_json.workspace = true
 url = "2.3.1"
 ureq = "2.8.0"
 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_cli/Cargo.toml
+++ b/crates/ruff_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_cli"
-version = "0.1.2"
+version = "0.0.292"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -66,7 +66,7 @@ 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 }
--- 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/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,37 +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()"
-   ]
-  }
- ],
- "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
@@ -13,7 +13,6 @@ use ruff_linter::settings::types::{
 };
 use ruff_linter::{RuleParser, RuleSelector, RuleSelectorParser};
 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
@@ -121,6 +117,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>,
@@ -357,21 +363,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 +376,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,18 +386,19 @@ 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,
@@ -521,7 +507,7 @@ impl CheckCommand {
                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,19 @@ 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,
            },
            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,8 +577,6 @@ 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,
@@ -684,17 +663,11 @@ 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()));
@@ -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,33 @@ 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 ruff_linter::settings::types::UnsafeFixes;
    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 +377,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();
@@ -644,7 +427,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);
@@ -689,21 +472,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 +497,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 +509,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 +524,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 +545,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 +583,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 +603,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 +615,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 +626,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 +637,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);

@@ -1050,21 +718,6 @@ mod tests {
                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),
-            )
-        }
    }

    impl Drop for TestCache {
--- a/crates/ruff_cli/src/commands/add_noqa.rs
+++ b/crates/ruff_cli/src/commands/add_noqa.rs
@@ -10,7 +10,7 @@ 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;

@@ -36,7 +36,7 @@ pub(crate) fn add_noqa(
        &paths
            .iter()
            .flatten()
-            .map(ResolvedFile::path)
+            .map(ignore::DirEntry::path)
            .collect::<Vec<_>>(),
        pyproject_config,
    );
@@ -45,15 +45,14 @@ 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);
--- 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,26 +7,25 @@ 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::*;
+use ruff_linter::settings::types::UnsafeFixes;
 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;

@@ -42,144 +42,163 @@ pub(crate) fn check(
    // 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,
+                        fix_mode,
+                        unsafe_fixes,
+                    )
+                    .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
@@ -226,12 +245,13 @@ mod test {
    use std::os::unix::fs::OpenOptionsExt;

    use anyhow::Result;
+
+    use ruff_linter::settings::types::UnsafeFixes;
    use rustc_hash::FxHashMap;
    use tempfile::TempDir;

    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;
--- 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};
@@ -22,14 +22,6 @@ pub(crate) fn check_stdin(
        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)
--- a/crates/ruff_cli/src/commands/format.rs
+++ b/crates/ruff_cli/src/commands/format.rs
@@ -1,38 +1,29 @@
 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 similar::TextDiff;
+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::isort;
-use ruff_linter::settings::rule_table::RuleTable;
 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};
 use ruff_text_size::{TextLen, TextRange, TextSize};
-use ruff_workspace::resolver::{
-    match_exclusion, python_files_in_path, PyprojectConfig, ResolvedFile, Resolver,
-};
+use ruff_workspace::resolver::python_files_in_path;
 use ruff_workspace::FormatterSettings;

 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;
@@ -43,20 +34,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.
@@ -71,7 +48,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() {
@@ -79,87 +60,31 @@ 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 (mut 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();
+                Ok(entry) => {
+                    let path = entry.into_path();
+
                    let SourceType::Python(source_type) = SourceType::from(&path) else {
                        // Ignore any non-Python files.
                        return None;
                    };

-                    let resolved_settings = resolver.resolve(path, &pyproject_config);
-
-                    // 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);
+                    let resolved_settings = resolver.resolve(&path, &pyproject_config);

                    Some(
                        match catch_unwind(|| {
-                            format_path(
-                                path,
-                                &resolved_settings.formatter,
-                                source_type,
-                                mode,
-                                cache,
-                            )
+                            format_path(&path, &resolved_settings.formatter, source_type, mode)
                        }) {
-                            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,
-                            )),
+                            Ok(inner) => inner.map(|result| FormatPathResult { path, result }),
+                            Err(error) => Err(FormatCommandError::Panic(Some(path), error)),
                        },
                    )
                }
-                Err(err) => Some(Err(FormatCommandError::Ignore(err.clone()))),
+                Err(err) => Some(Err(FormatCommandError::Ignore(err))),
            }
        })
        .partition_map(|result| match result {
@@ -168,54 +93,24 @@ pub(crate) fn format(
        });
    let duration = start.elapsed();

-    // Make output deterministic, at least as long as we have a path
-    results.sort_unstable_by(|x, y| x.path.cmp(&y.path));
-    errors.sort_by(|x, y| {
-        fn get_key(error: &FormatCommandError) -> Option<&PathBuf> {
-            match &error {
-                FormatCommandError::Ignore(ignore) => {
-                    if let ignore::Error::WithPath { path, .. } = ignore {
-                        Some(path)
-                    } else {
-                        None
-                    }
-                }
-                FormatCommandError::Panic(path, _)
-                | FormatCommandError::Read(path, _)
-                | FormatCommandError::Format(path, _)
-                | FormatCommandError::Write(path, _) => path.as_ref(),
-            }
-        }
-        get_key(x).cmp(&get_key(y))
-    });
-
    debug!(
        "Formatted {} files in {:.2?}",
        results.len() + errors.len(),
        duration
    );

-    caches.persist()?;
-
    // Report on any errors.
    for error in &errors {
        error!("{error}");
    }

-    results.sort_unstable_by(|a, b| a.path.cmp(&b.path));
-    let results = FormatResults::new(results.as_slice(), mode);
-
-    if mode.is_diff() {
-        results.write_diff(&mut stdout().lock())?;
-    }
+    let summary = FormatSummary::new(results.as_slice(), 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}");
        }
    }

@@ -227,9 +122,9 @@ pub(crate) fn format(
                Ok(ExitStatus::Error)
            }
        }
-        FormatMode::Check | FormatMode::Diff => {
+        FormatMode::Check => {
            if errors.is_empty() {
-                if results.any_formatted() {
+                if summary.any_formatted() {
                    Ok(ExitStatus::Failure)
                } else {
                    Ok(ExitStatus::Success)
@@ -242,94 +137,61 @@ 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,
    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");
-
-        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) {
+    let source_kind = match SourceKind::from_path(path, source_type) {
        Ok(Some(source_kind)) => source_kind,
-        // Non Python Jupyter notebook
-        Ok(None) => return Ok(FormatResult::Skipped),
+        Ok(None) => return Ok(FormatResult::Unchanged),
        Err(err) => {
            return Err(FormatCommandError::Read(Some(path.to_path_buf()), err));
        }
    };

    // Format the source.
-    let format_result = match format_source(&unformatted, source_type, Some(path), settings)? {
-        FormattedSource::Formatted(formatted) => match mode {
-            FormatMode::Write => {
+    match format_source(source_kind, source_type, Some(path), settings)? {
+        FormattedSource::Formatted(formatted) => {
+            if mode.is_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))?;
-
-                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::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(FormatResult::Formatted)
        }
-    };
-
-    Ok(format_result)
+        FormattedSource::Unchanged(_) => Ok(FormatResult::Unchanged),
+    }
 }

 #[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,
+    /// The source was unchanged, and the [`SourceKind`] contains the original source code.
+    Unchanged(SourceKind),
 }

 impl From<FormattedSource> for FormatResult {
    fn from(value: FormattedSource) -> Self {
        match value {
            FormattedSource::Formatted(_) => FormatResult::Formatted,
-            FormattedSource::Unchanged => FormatResult::Unchanged,
+            FormattedSource::Unchanged(_) => FormatResult::Unchanged,
+        }
+    }
+}
+
+impl FormattedSource {
+    pub(crate) fn source_kind(&self) -> &SourceKind {
+        match self {
+            FormattedSource::Formatted(source_kind) => source_kind,
+            FormattedSource::Unchanged(source_kind) => source_kind,
        }
    }
 }
@@ -337,28 +199,30 @@ impl From<FormattedSource> for FormatResult {
 /// Format a [`SourceKind`], returning the transformed [`SourceKind`], or `None` if the source was
 /// unchanged.
 pub(crate) fn format_source(
-    source_kind: &SourceKind,
+    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 options = settings.to_format_options(source_type, &unformatted);

-            let formatted = format_module_source(unformatted, options)
+            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)
+                Ok(FormattedSource::Unchanged(SourceKind::Python(unformatted)))
            } else {
                Ok(FormattedSource::Formatted(SourceKind::Python(formatted)))
            }
        }
        SourceKind::IpyNotebook(notebook) => {
            if !notebook.is_python_notebook() {
-                return Ok(FormattedSource::Unchanged);
+                return Ok(FormattedSource::Unchanged(SourceKind::IpyNotebook(
+                    notebook,
+                )));
            }

            let options = settings.to_format_options(source_type, notebook.source_code());
@@ -406,7 +270,9 @@ pub(crate) fn format_source(

            // If the file was unchanged, return `None`.
            let (Some(mut output), Some(last)) = (output, last) else {
-                return Ok(FormattedSource::Unchanged);
+                return Ok(FormattedSource::Unchanged(SourceKind::IpyNotebook(
+                    notebook,
+                )));
            };

            // Add the remaining content.
@@ -414,31 +280,23 @@ pub(crate) fn format_source(
            output.push_str(slice);

            // Update the notebook.
-            let mut formatted = notebook.clone();
-            formatted.update(&source_map, output);
+            let mut notebook = notebook.clone();
+            notebook.update(&source_map, output);

            Ok(FormattedSource::Formatted(SourceKind::IpyNotebook(
-                formatted,
+                notebook,
            )))
        }
    }
 }

 /// The result of an individual formatting operation.
-#[derive(Debug, Clone, is_macro::Is)]
+#[derive(Debug, Clone, Copy, is_macro::Is)]
 pub(crate) enum FormatResult {
    /// 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.
@@ -448,55 +306,35 @@ struct FormatPathResult {
    result: FormatResult,
 }

-/// The results of formatting a set of files
+/// A summary of the formatting results.
 #[derive(Debug)]
-struct FormatResults<'a> {
+struct FormatSummary<'a> {
    /// The individual formatting results.
    results: &'a [FormatPathResult],
    /// The format mode that was used.
    mode: FormatMode,
 }

-impl<'a> FormatResults<'a> {
+impl<'a> FormatSummary<'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,
-        })
+        self.results
+            .iter()
+            .any(|result| result.result.is_formatted())
    }
+}

-    fn write_diff(&self, f: &mut impl Write) -> io::Result<()> {
-        for result in self.results {
-            if let FormatResult::Diff {
-                unformatted,
-                formatted,
-            } = &result.result
-            {
-                let text_diff =
-                    TextDiff::from_lines(unformatted.source_code(), formatted.source_code());
-                let mut unified_diff = text_diff.unified_diff();
-                unified_diff.header(
-                    &fs::relativize_path(&result.path),
-                    &fs::relativize_path(&result.path),
-                );
-                unified_diff.to_writer(&mut *f)?;
-            }
-        }
-
-        Ok(())
-    }
-
-    fn write_summary(&self, f: &mut impl Write) -> io::Result<()> {
+impl Display for FormatSummary<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
        // Compute the number of changed and unchanged files.
-        let mut changed = 0u32;
+        let mut formatted = 0u32;
        let mut unchanged = 0u32;
        for result in self.results {
-            match &result.result {
+            match result.result {
                FormatResult::Formatted => {
                    // If we're running in check mode, report on any files that would be formatted.
                    if self.mode.is_check() {
@@ -506,43 +344,39 @@ impl<'a> FormatResults<'a> {
                            fs::relativize_path(&result.path).bold()
                        )?;
                    }
-                    changed += 1;
+                    formatted += 1;
                }
                FormatResult::Unchanged => unchanged += 1,
-                FormatResult::Diff { .. } => {
-                    changed += 1;
-                }
-                FormatResult::Skipped => {}
            }
        }

        // Write out a summary of the formatting results.
-        if changed > 0 && unchanged > 0 {
-            writeln!(
+        if formatted > 0 && unchanged > 0 {
+            write!(
                f,
                "{} file{} {}, {} file{} left unchanged",
-                changed,
-                if changed == 1 { "" } else { "s" },
+                formatted,
+                if 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" },
            )
-        } else if changed > 0 {
-            writeln!(
+        } else if formatted > 0 {
+            write!(
                f,
                "{} file{} {}",
-                changed,
-                if changed == 1 { "" } else { "s" },
+                formatted,
+                if 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!(
+            write!(
                f,
                "{} file{} left unchanged",
                unchanged,
@@ -653,69 +487,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 incompatible_rule in RuleTable::from_iter([
-            Rule::LineTooLong,
-            Rule::TabIndentation,
-            Rule::IndentationWithInvalidMultiple,
-            Rule::IndentationWithInvalidMultipleComment,
-            Rule::OverIndented,
-            Rule::IndentWithSpaces,
-            Rule::SingleLineImplicitStringConcatenation,
-            Rule::MissingTrailingComma,
-            Rule::ProhibitedTrailingComma,
-            Rule::BadQuotesInlineString,
-            Rule::BadQuotesMultilineString,
-            Rule::BadQuotesDocstring,
-            Rule::AvoidableEscapedQuote,
-        ])
-        .iter_enabled()
-        {
-            if setting.linter.rules.enabled(incompatible_rule) {
-                incompatible_rules.push(format!("'{}'", incompatible_rule.noqa_code()));
-            }
-        }
-
-        if !incompatible_rules.is_empty() {
-            incompatible_rules.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.", incompatible_rules.join(", "));
-        }
-
-        let mut incompatible_options = Vec::new();
-
-        let isort_defaults = isort::settings::Settings::default();
-
-        if setting.linter.isort.force_single_line != isort_defaults.force_single_line {
-            incompatible_options.push("'isort.force-single-line'");
-        }
-
-        if setting.linter.isort.force_wrap_aliases != isort_defaults.force_wrap_aliases {
-            incompatible_options.push("'isort.force-wrap-aliases'");
-        }
-
-        if setting.linter.isort.lines_after_imports != isort_defaults.lines_after_imports {
-            incompatible_options.push("'isort.lines-after-imports'");
-        }
-
-        if setting.linter.isort.lines_between_types != isort_defaults.lines_between_types {
-            incompatible_options.push("'isort.lines_between_types'");
-        }
-
-        if setting.linter.isort.split_on_trailing_comma != isort_defaults.split_on_trailing_comma {
-            incompatible_options.push("'isort.split_on_trailing_comma'");
-        }
-
-        if !incompatible_options.is_empty() {
-            warn!("The following isort options may cause conflicts when used with the formatter: {}. To avoid unexpected behavior, we recommend disabling these options by removing them from the configuration.", incompatible_options.join(", "));
-        }
-    }
-}
--- a/crates/ruff_cli/src/commands/format_stdin.rs
+++ b/crates/ruff_cli/src/commands/format_stdin.rs
@@ -3,19 +3,14 @@ use std::path::Path;

 use anyhow::Result;
 use log::error;
-use ruff_linter::fs;
-use similar::TextDiff;

 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::resolver::python_file_at_path;
 use ruff_workspace::FormatterSettings;

 use crate::args::{CliOverrides, FormatArguments};
-use crate::commands::format::{
-    format_source, warn_incompatible_formatter_settings, FormatCommandError, FormatMode,
-    FormatResult, FormattedSource,
-};
+use crate::commands::format::{format_source, FormatCommandError, FormatMode, FormatResult};
 use crate::resolve::resolve;
 use crate::stdin::read_from_stdin;
 use crate::ExitStatus;
@@ -28,23 +23,16 @@ 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);
-        }
    }

    let path = cli.stdin_filename.as_deref();
@@ -62,7 +50,7 @@ pub(crate) fn format_stdin(cli: &FormatArguments, overrides: &CliOverrides) -> R
    ) {
        Ok(result) => match mode {
            FormatMode::Write => Ok(ExitStatus::Success),
-            FormatMode::Check | FormatMode::Diff => {
+            FormatMode::Check => {
                if result.is_formatted() {
                    Ok(ExitStatus::Failure)
                } else {
@@ -97,37 +85,15 @@ fn format_source_code(
    };

    // Format the source.
-    let formatted = format_source(&source_kind, source_type, path, settings)?;
+    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 => {
-                let mut writer = stdout().lock();
-                let text_diff =
-                    TextDiff::from_lines(source_kind.source_code(), formatted.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));
-                }
-                unified_diff.to_writer(&mut writer).unwrap();
-            }
-        },
-        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))?;
-            }
-        }
+    // Write to stdout regardless of whether the source was formatted.
+    if mode.is_write() {
+        let mut writer = stdout().lock();
+        formatted
+            .source_kind()
+            .write(&mut writer)
+            .map_err(|err| FormatCommandError::Write(path.map(Path::to_path_buf), err))?;
    }

    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/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
@@ -2,25 +2,28 @@

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

 use anyhow::{Context, Result};
 use colored::Colorize;
+use filetime::FileTime;
 use log::{debug, error, warn};
+use ruff_linter::settings::types::UnsafeFixes;
 use rustc_hash::FxHashMap;

-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::{fs, IOError, SyntaxError};
+use ruff_macros::CacheKey;
 use ruff_notebook::{Notebook, NotebookError, NotebookIndex};
 use ruff_python_ast::imports::ImportMap;
 use ruff_python_ast::{SourceType, TomlSourceType};
@@ -28,10 +31,37 @@ 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,7 +74,7 @@ impl Diagnostics {
    ) -> Self {
        Self {
            messages,
-            fixed: FixMap::default(),
+            fixed: FxHashMap::default(),
            imports,
            notebook_indexes,
        }
@@ -112,68 +142,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);
    }
 }

@@ -200,11 +184,9 @@ pub(crate) fn lint_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
@@ -304,14 +286,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),
            );
        }
    }
@@ -338,7 +318,7 @@ pub(crate) fn lint_path(

    Ok(Diagnostics {
        messages,
-        fixed: FixMap::from_iter([(fs::relativize_path(path), fixed)]),
+        fixed: FxHashMap::from_iter([(fs::relativize_path(path), fixed)]),
        imports,
        notebook_indexes,
    })
@@ -456,7 +436,7 @@ pub(crate) fn lint_stdin(

    Ok(Diagnostics {
        messages,
-        fixed: FixMap::from_iter([(
+        fixed: FxHashMap::from_iter([(
            fs::relativize_path(path.unwrap_or_else(|| Path::new("-"))),
            fixed,
        )]),
--- 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};
@@ -29,7 +27,6 @@ mod panic;
 mod printer;
 pub mod resolve;
 mod stdin;
-mod version;

 #[derive(Copy, Clone)]
 pub enum ExitStatus {
@@ -137,10 +134,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 +165,8 @@ pub fn run(
 }

 fn format(args: FormatCommand, log_level: LogLevel) -> Result<ExitStatus> {
+    warn_user_once!("`ruff format` is not yet stable, and subject to change in future versions.");
+
    let (cli, overrides) = args.partition();

    if is_stdin(&cli.files, cli.stdin_filename.as_deref()) {
@@ -182,6 +177,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`
--- 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,
@@ -20,7 +22,7 @@ use ruff_linter::registry::{AsRule, Rule};
 use ruff_linter::settings::flags::{self};
 use ruff_linter::settings::types::{SerializationFormat, UnsafeFixes};

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

 bitflags! {
    #[derive(Default, Debug, Copy, Clone)]
@@ -159,7 +161,7 @@ impl Printer {
                                "es"
                            };
                            writeln!(writer,
-                                "No fixes available ({} hidden fix{es} can be enabled with the `--unsafe-fixes` option).",
+                                "{} hidden fix{es} can be enabled with the `--unsafe-fixes` option.",
                                fixables.unapplicable_unsafe
                            )?;
                        }
@@ -460,7 +462,7 @@ fn show_fix_status(fix_mode: flags::FixMode, fixables: Option<&FixableStatistics
    (!fix_mode.is_apply()) && fixables.is_some_and(FixableStatistics::any_applicable_fixes)
 }

-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>())
--- 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/format.rs
+++ b/crates/ruff_cli/tests/format.rs
@@ -1,7 +1,6 @@
 #![cfg(not(target_family = "wasm"))]

 use std::fs;
-use std::path::Path;
 use std::process::Command;
 use std::str;

@@ -14,7 +13,7 @@ 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"])
+        .args(["format", "--isolated"])
        .arg("-")
        .pass_stdin(r#"
 def foo(arg1, arg2,):
@@ -40,6 +39,7 @@ if condition:
        print('Hy "Micha"')  # Should not change quotes

    ----- stderr -----
+    warning: `ruff format` is not yet stable, and subject to change in future versions.
    "###);
 }

@@ -50,9 +50,6 @@ fn format_options() -> Result<()> {
    fs::write(
        &ruff_toml,
        r#"
-indent-width = 8
-line-length = 84
-
 [format]
 indent-style = "tab"
 quote-style = "single"
@@ -67,7 +64,7 @@ line-ending = "cr-lf"
        .arg("-")
        .pass_stdin(r#"
 def foo(arg1, arg2,):
-    print("Shouldn't change quotes. It exceeds the line width with the tab size 8")
+    print("Shouldn't change quotes")


 if condition:
@@ -79,144 +76,14 @@ if condition:
    exit_code: 0
    ----- stdout -----
    def foo(arg1, arg2):
-    	print(
-    		"Shouldn't change quotes. It exceeds the line width with the tab size 8"
-    	)
+    	print("Shouldn't change quotes")


    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 -----
+    warning: `ruff format` is not yet stable, and subject to change in future versions.
    "###);
    Ok(())
 }
@@ -230,7 +97,6 @@ fn format_option_inheritance() -> Result<()> {
        &ruff_toml,
        r#"
 extend = "base.toml"
-extend-select = ["Q000"]

 [format]
 quote-style = "single"
@@ -273,47 +139,12 @@ if condition:
    	print('Should change quotes')

    ----- stderr -----
-    warning: The following rules may cause conflicts when used with the formatter: 'Q000'. 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: `ruff format` is not yet stable, and subject to change in future versions.
    "###);
    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
+/// Tests that the legacy `format` option continues to work but emits a warning.
 #[test]
 fn legacy_format_option() -> Result<()> {
    let tempdir = TempDir::new()?;
@@ -325,228 +156,53 @@ 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#"
-select = ["ALL"]
-ignore = ["D203", "D212"]
-
-[isort]
-force-single-line = true
-force-wrap-aliases = true
-lines-after-imports = 0
-lines-between-types = 2
-split-on-trailing-comma = true
-"#,
-    )?;
-
-    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', 'COM819', 'D206', 'E501', 'ISC001', 'Q000', 'Q001', 'Q002', 'Q003', '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 following isort options may cause conflicts when used with the formatter: 'isort.force-single-line', 'isort.force-wrap-aliases', 'isort.lines-after-imports', 'isort.lines_between_types'. To avoid unexpected behavior, we recommend disabling these options by removing them from the configuration.
-    "###);
-    Ok(())
-}
-
-#[test]
-fn conflicting_options_stdin() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-select = ["ALL"]
-ignore = ["D203", "D212"]
-
-[isort]
-force-single-line = true
-force-wrap-aliases = true
-lines-after-imports = 0
-lines-between-types = 2
-split-on-trailing-comma = true
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config"])
+        .args(["check", "--select", "F401", "--no-cache", "--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', 'COM819', 'D206', 'E501', 'ISC001', 'Q000', 'Q001', 'Q002', 'Q003', '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 following isort options may cause conflicts when used with the formatter: 'isort.force-single-line', 'isort.force-wrap-aliases', 'isort.lines-after-imports', 'isort.lines_between_types'. To avoid unexpected behavior, we recommend disabling these options by removing them from the 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
-        +++ resources/test/fixtures/unformatted.ipynb
-        @@ -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.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###"
+import os
+"#), @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 -----
-
+    [
+      {
+        "cell": null,
+        "code": "F401",
+        "end_location": {
+          "column": 10,
+          "row": 2
+        },
+        "filename": "-",
+        "fix": {
+          "applicability": "safe",
+          "edits": [
+            {
+              "content": "",
+              "end_location": {
+                "column": 1,
+                "row": 3
+              },
+              "location": {
+                "column": 1,
+                "row": 2
+              }
+            }
+          ],
+          "message": "Remove unused import: `os`"
+        },
+        "location": {
+          "column": 8,
+          "row": 2
+        },
+        "message": "`os` imported but unused",
+        "noqa_row": 2,
+        "url": "https://docs.astral.sh/ruff/rules/unused-import"
+      }
+    ]
    ----- stderr -----
+    warning: The option `format` has been deprecated to avoid ambiguity with Ruff's upcoming formatter. Use `output-format` instead.
    "###);
+    Ok(())
 }
--- a/crates/ruff_cli/tests/integration_test.rs
+++ b/crates/ruff_cli/tests/integration_test.rs
@@ -485,6 +485,7 @@ fn stdin_format_jupyter() {
    }

    ----- stderr -----
+    warning: `ruff format` is not yet stable, and subject to change in future versions.
    "###);
 }

@@ -634,9 +635,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 +655,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 +675,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 +695,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 -----
    "###);
@@ -948,7 +945,7 @@ fn check_hints_hidden_unsafe_fixes_with_no_safe_fixes() {
    ----- 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).
+    1 hidden fix can be enabled with the `--unsafe-fixes` option.

    ----- stderr -----
    "###);
@@ -1005,7 +1002,7 @@ fn fix_applies_safe_fixes_by_default() {
    ----- 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).
+    1 hidden fix can be enabled with the `--unsafe-fixes` option.
    "###);
 }

@@ -1115,7 +1112,7 @@ fn fix_only_unsafe_fixes_available() {
    ----- 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).
+    1 hidden fix can be enabled with the `--unsafe-fixes` option.
    "###);
 }

@@ -1255,8 +1252,8 @@ fn diff_does_not_show_display_only_fixes_with_unsafe_fixes_enabled() {
            ])
            .pass_stdin("def add_to_list(item, some_list=[]): ..."),
            @r###"
-    success: true
-    exit_code: 0
+    success: false
+    exit_code: 1
    ----- stdout -----

    ----- stderr -----
@@ -1279,8 +1276,8 @@ fn diff_only_unsafe_fixes_available() {
        ])
        .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
        @r###"
-    success: true
-    exit_code: 0
+    success: false
+    exit_code: 1
    ----- stdout -----

    ----- stderr -----
@@ -1308,7 +1305,7 @@ extend-unsafe-fixes = ["UP034"]
        .args([
            "--output-format",
            "text",
-            "--no-cache",
+            "--no-cache", 
            "--select",
            "F601,UP034",
        ])
@@ -1320,7 +1317,7 @@ extend-unsafe-fixes = ["UP034"]
    -: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).
+    2 hidden fixes can be enabled with the `--unsafe-fixes` option.

    ----- stderr -----
    "###);
@@ -1347,7 +1344,7 @@ extend-safe-fixes = ["F601"]
        .args([
            "--output-format",
            "text",
-            "--no-cache",
+            "--no-cache", 
            "--select",
            "F601,UP034",
        ])
@@ -1400,7 +1397,7 @@ extend-safe-fixes = ["UP034"]
    -: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).
+    2 hidden fixes can be enabled with the `--unsafe-fixes` option.

    ----- stderr -----
    "###);
--- a/crates/ruff_cli/tests/lint.rs
+++ b/crates/ruff_cli/tests/lint.rs
@@ -31,15 +31,14 @@ inline-quotes = "single"
        .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
+    -: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.

@@ -156,155 +155,3 @@ inline-quotes = "single"
    "###);
    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_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};
@@ -35,14 +36,14 @@ use ruff_linter::settings::types::{FilePattern, FilePatternSet};
 use ruff_python_formatter::{
    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,20 +527,24 @@ 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);
--- 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
@@ -11,7 +11,7 @@ use strum::IntoEnumIterator;
 use ruff_diagnostics::FixAvailability;
 use ruff_linter::registry::{Linter, Rule, RuleNamespace};
 use ruff_workspace::options::Options;
-use ruff_workspace::options_base::{OptionEntry, OptionsMetadata};
+use ruff_workspace::options_base::OptionsMetadata;

 use crate::ROOT_DIR;

@@ -55,11 +55,7 @@ pub(crate) fn main(args: &Args) -> Result<()> {
                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 +74,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 +100,7 @@ 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().has(option), "unknown option {option}");

                let anchor = option.replace('.', "-");
                out.push_str(&format!("- [`{option}`][{option}]\n"));
@@ -152,7 +138,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
@@ -101,24 +101,6 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parent_set:
        output.push_str(&format!("{header_level} [`{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));
--- 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/lib.rs
+++ b/crates/ruff_formatter/src/lib.rs
@@ -95,7 +95,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 +575,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/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_linter/Cargo.toml
+++ b/crates/ruff_linter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.1.2"
+version = "0.0.292"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -29,7 +29,7 @@ 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" }
+aho-corasick = { version = "1.1.1" }
 annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { workspace = true }
 bitflags = { workspace = true }
@@ -59,7 +59,7 @@ 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.19" }
 serde = { workspace = true }
 serde_json = { workspace = true }
 similar = { workspace = true }
--- 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_simplify/SIM108.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM108.py
@@ -126,12 +126,3 @@ def f():
        x = yield 3
    else:
        x = yield 5
-
-
-from typing import TYPE_CHECKING
-
-# OK
-if TYPE_CHECKING:
-    x = 3
-else:
-    x = 5
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM112.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM112.py
@@ -38,7 +38,3 @@ env = os.environ['FOO']

 if env := os.environ['FOO']:
    pass
-
-os.environ['https_proxy']
-os.environ.get['http_proxy']
-os.getenv('no_proxy')
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM401.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM401.py
@@ -114,16 +114,3 @@ elif key in a_dict:
    vars[idx] = a_dict[key]
 else:
    vars[idx] = "default"
-
-###
-# Positive cases (preview)
-###
-
-# SIM401
-var = a_dict[key] if key in a_dict else "default3"
-
-# SIM401
-var = "default-1" if key not in a_dict else a_dict[key]
-
-# OK (default contains effect)
-var = a_dict[key] if key in a_dict else val1 + val2
--- a/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TCH004_15.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TCH004_15.py
@@ -1,19 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Callable
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from .foo import Record
-
-type RecordOrThings = Record | int | str
-type RecordCallback[R: Record] = Callable[[R], None]
-
-
-def process_record[R: Record](record: R) -> None:
-    ...
-
-
-class RecordContainer[R: Record]:
-    def add_record(self, record: R) -> None:
-        ...
--- a/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/runtime_evaluated_base_classes_3.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/runtime_evaluated_base_classes_3.py
@@ -22,10 +22,3 @@ class C:

 class D(C):
    x: UUID
-
-
-import collections
-
-
-class E(BaseModel[int]):
-    x: collections.Awaitable
--- a/crates/ruff_linter/resources/test/fixtures/pycodestyle/E721.py
+++ b/crates/ruff_linter/resources/test/fixtures/pycodestyle/E721.py
@@ -4,18 +4,18 @@ if type(res) == type(42):
 #: E721
 if type(res) != type(""):
    pass
-#: Okay
+#: E721
 import types

 if res == types.IntType:
    pass
-#: Okay
+#: E721
 import types

 if type(res) is not types.ListType:
    pass
 #: E721
-assert type(res) == type(False) or type(res) == type(None)
+assert type(res) == type(False)
 #: E721
 assert type(res) == type([])
 #: E721
@@ -25,18 +25,21 @@ assert type(res) == type((0,))
 #: E721
 assert type(res) == type((0))
 #: E721
-assert type(res) != type((1, ))
-#: Okay
-assert type(res) is type((1, ))
-#: Okay
-assert type(res) is not type((1, ))
+assert type(res) != type((1,))
+#: E721
+assert type(res) is type((1,))
+#: E721
+assert type(res) is not type((1,))
 #: E211 E721
-assert type(res) == type ([2, ])
+assert type(res) == type(
+    [
+        2,
+    ]
+)
 #: E201 E201 E202 E721
-assert type(res) == type( ( ) )
+assert type(res) == type(())
 #: E201 E202 E721
-assert type(res) == type( (0, ) )
-#:
+assert type(res) == type((0,))

 #: Okay
 import types
@@ -47,48 +50,18 @@ if isinstance(res, str):
    pass
 if isinstance(res, types.MethodType):
    pass
-#: Okay
-def func_histype(a, b, c):
+if type(a) != type(b) or type(a) == type(ccc):
    pass
-#: E722
-try:
-    pass
-except:
-    pass
-#: E722
-try:
-    pass
-except Exception:
-    pass
-except:
-    pass
-#: E722 E203 E271
-try:
-    pass
-except  :
-    pass
-#: Okay
-fake_code = """"
-try:
-    do_something()
-except:
-    pass
-"""
-try:
-    pass
-except Exception:
-    pass
-#: Okay
-from . import custom_types as types

-red = types.ColorTypeRED
-red is types.ColorType.RED
-#: Okay
-from . import compute_type
+assert type(res) == type(None)

-if compute_type(foo) == 5:
+types = StrEnum
+if x == types.X:
    pass

+#: E721
+assert type(res) is int
+

 class Foo:
    def asdf(self, value: str | None):
--- a/crates/ruff_linter/resources/test/fixtures/pydocstyle/D300.py
+++ b/crates/ruff_linter/resources/test/fixtures/pydocstyle/D300.py
@@ -1,10 +0,0 @@
-def with_backslash():
-    """Sum\\mary."""
-
-
-def ends_in_quote():
-    'Sum\\mary."'
-
-
-def contains_quote():
-    'Sum"\\mary.'
--- a/crates/ruff_linter/resources/test/fixtures/pydocstyle/D301.py
+++ b/crates/ruff_linter/resources/test/fixtures/pydocstyle/D301.py
@@ -10,10 +10,6 @@ def double_quotes_backslash_uppercase():
    R"""Sum\\mary."""


-def shouldnt_add_raw_here():
-    "Ruff \U000026a1"
-
-
 def make_unique_pod_id(pod_id: str) -> str | None:
    r"""
    Generate a unique Pod name.
--- a/crates/ruff_linter/resources/test/fixtures/pyflakes/F401_19.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F401_19.py
@@ -1,17 +0,0 @@
-"""Test that type parameters are considered used."""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
-    from .foo import Record as Record1
-    from .bar import Record as Record2
-
-type RecordCallback[R: Record1] = Callable[[R], None]
-
-
-def process_record[R: Record2](record: R) -> None:
-    ...
--- a/crates/ruff_linter/resources/test/fixtures/pyflakes/F821_20.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F821_20.py
@@ -1,5 +0,0 @@
-"""Test lazy evaluation of type alias values."""
-
-type RecordCallback[R: Record] = Callable[[R], None]
-
-from collections.abc import Callable
--- a/crates/ruff_linter/resources/test/fixtures/pylint/bad_dunder_method_name.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/bad_dunder_method_name.py
@@ -63,15 +63,6 @@ class Apples:
    def __html__(self):
        pass

-    # Allow _missing_, used by enum.Enum.
-    @classmethod
-    def _missing_(cls, value):
-        pass
-
-    # Allow anonymous functions.
-    def _(self):
-        pass
-

 def __foo_bar__():  # this is not checked by the [bad-dunder-name] rule
    ...
--- a/crates/ruff_linter/resources/test/fixtures/pylint/global_at_module_level.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/global_at_module_level.py
@@ -1,10 +0,0 @@
-global price  # W0604
-
-price = 25
-
-if True:
-    global X  # W0604
-
-def no_error():
-    global price
-    price = 30
--- a/crates/ruff_linter/resources/test/fixtures/pylint/iteration_over_set.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/iteration_over_set.py
@@ -6,14 +6,6 @@ for item in {1}:
 for item in {"apples", "lemons", "water"}:  # flags in-line set literals
    print(f"I like {item}.")

-for item in {1,}:
-    print(f"I can count to {item}!")
-
-for item in {
-    "apples", "lemons", "water"
-}:  # flags in-line set literals
-    print(f"I like {item}.")
-
 numbers_list = [i for i in {1, 2, 3}]  # flags sets in list comprehensions

 numbers_set = {i for i in {1, 2, 3}}  # flags sets in set comprehensions
--- a/crates/ruff_linter/resources/test/fixtures/pylint/literal_membership.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/literal_membership.py
@@ -1,10 +0,0 @@
-# Errors
-1 in [1, 2, 3]
-1 in (1, 2, 3)
-1 in (
-    1, 2, 3
-)
-
-# OK
-fruits = ["cherry", "grapes"]
-"cherry" in fruits
--- a/crates/ruff_linter/resources/test/fixtures/pylint/misplaced_bare_raise.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/misplaced_bare_raise.py
@@ -1,71 +0,0 @@
-# bare raise is an except block
-try:
-    pass
-except Exception:
-    raise
-
-try:
-    pass
-except Exception:
-    if True:
-        raise
-
-# bare raise is in a finally block which is in an except block
-try:
-    raise Exception
-except Exception:
-    try:
-        raise Exception
-    finally:
-        raise
-
-# bare raise is in an __exit__ method
-class ContextManager:
-    def __enter__(self):
-        return self
-    def __exit__(self, *args):
-        raise
-
-try:
-    raise # [misplaced-bare-raise]
-except Exception:
-    pass
-
-def f():
-    try:
-        raise # [misplaced-bare-raise]
-    except Exception:
-        pass
-
-def g():
-    raise # [misplaced-bare-raise]
-
-def h():
-    try:
-        if True:
-            def i():
-                raise # [misplaced-bare-raise]
-    except Exception:
-        pass
-    raise # [misplaced-bare-raise]
-
-raise # [misplaced-bare-raise]
-
-try:
-    pass
-except:
-    def i():
-        raise # [misplaced-bare-raise]
-
-try:
-    pass
-except:
-    class C:
-        raise # [misplaced-bare-raise]
-
-try:
-    pass
-except:
-    pass
-finally:
-    raise # [misplaced-bare-raise]
--- a/crates/ruff_linter/resources/test/fixtures/pylint/no_self_use.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/no_self_use.py
@@ -1,7 +1,5 @@
 import abc

-from typing_extensions import override
-

 class Person:
    def developer_greeting(self, name):  # [no-self-use]
@@ -62,24 +60,3 @@ class Prop:
    @property
    def count(self):
        return 24
-
-
-class A:
-    def foo(self):
-        ...
-
-
-class B(A):
-    @override
-    def foo(self):
-        ...
-
-    def foobar(self):
-        super()
-
-    def bar(self):
-        super().foo()
-
-    def baz(self):
-        if super().foo():
-            ...
--- a/crates/ruff_linter/resources/test/fixtures/pylint/non_ascii_module_import.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/non_ascii_module_import.py
@@ -1,17 +0,0 @@
-from os.path import join as łos  # Error
-from os.path import join as los  # OK
-
-import os.path.join as łos  # Error
-import os.path.join as los  # OK
-
-import os.path.łos  # Error (recommend an ASCII alias)
-import os.path.los  # OK
-
-from os.path import łos  # Error (recommend an ASCII alias)
-from os.path import los  # OK
-
-from os.path.łos import foo  # OK
-from os.path.los import foo  # OK
-
-from os.path import łos as foo  # OK
-from os.path import los as foo  # OK
--- a/crates/ruff_linter/resources/test/fixtures/pylint/non_ascii_name.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/non_ascii_name.py
@@ -1,31 +0,0 @@
-ápple_count: int = 1  # C2401
-ápple_count += 2  # C2401
-ápple_count = 3  # C2401
-
-(ápple_count for ápple_count in y)
-
-
-def func(ápple_count):
-    global ápple_count
-    nonlocal ápple_count
-
-
-def ápple_count():
-    pass
-
-
-match ápple_count:
-    case ápple_count:
-        pass
-
-ápple_count: int
-
-try:
-    1/0
-except ápple_count:
-    pass
-
-# OK
-print(ápple_count)
-ápple_count == 3
-apple_count = 4
--- a/crates/ruff_linter/resources/test/fixtures/pylint/too_many_boolean_expressions.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/too_many_boolean_expressions.py
@@ -1,54 +0,0 @@
-if a:
-    ...
-elif (a and b):
-    ...
-elif (a and b) and c:
-    ...
-elif (a and b) and c and d:
-    ...
-elif (a and b) and c and d and e:
-    ...
-elif (a and b) and c and d and e and f:
-    ...
-elif (a and b) and c and d and e and f and g:
-    ...
-elif (a and b) and c and d and e and f and g and h:
-    ...
-elif (a and b) and c and d and e and f and g and h and i:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k and l:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k and l and m:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k and l and m and n:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k and l and m and n and o:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k and l and m and n and o and p:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k and l and m and n and o and p and q:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k and l and m and n and o and p and q and r:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k and l and m and n and o and p and q and r and s:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k and l and m and n and o and p and q and r and s and t:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k and l and m and n and o and p and q and r and s and t and u:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k and l and m and n and o and p and q and r and s and t and u and v:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k and l and m and n and o and p and q and r and s and t and u and v and w:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k and l and m and n and o and p and q and r and s and t and u and v and w and x:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k and l and m and n and o and p and q and r and s and t and u and v and w and x and y:
-    ...
-elif (a and b) and c and d and e and f and g and h and i and j and k and l and m and n and o and p and q and r and s and t and u and v and w and x and y and z:
-    ...
-else:
-    ...
--- a/crates/ruff_linter/resources/test/fixtures/pylint/unnecessary_lambda.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/unnecessary_lambda.py
@@ -1,59 +0,0 @@
-_ = lambda: print()  # [unnecessary-lambda]
-_ = lambda x, y: min(x, y) # [unnecessary-lambda]
-
-_ = lambda *args: f(*args) # [unnecessary-lambda]
-_ = lambda **kwargs: f(**kwargs) # [unnecessary-lambda]
-_ = lambda *args, **kwargs: f(*args, **kwargs) # [unnecessary-lambda]
-_ = lambda x, y, z, *args, **kwargs: f(x, y, z, *args, **kwargs) # [unnecessary-lambda]
-
-_ = lambda x: f(lambda x: x)(x) # [unnecessary-lambda]
-_ = lambda x, y: f(lambda x, y: x + y)(x, y) # [unnecessary-lambda]
-
-# default value in lambda parameters
-_ = lambda x=42: print(x)
-
-# lambda body is not a call
-_ = lambda x: x
-
-# ignore chained calls
-_ = lambda: chained().call()
-
-# lambda has kwargs but not the call
-_ = lambda **kwargs: f()
-
-# lambda has kwargs and the call has kwargs named differently
-_ = lambda **kwargs: f(**dict([('forty-two', 42)]))
-
-# lambda has kwargs and the call has unnamed kwargs
-_ = lambda **kwargs: f(**{1: 2})
-
-# lambda has starred parameters but not the call
-_ = lambda *args: f()
-
-# lambda has starred parameters and the call has starargs named differently
-_ = lambda *args: f(*list([3, 4]))
-# lambda has starred parameters and the call has unnamed starargs
-_ = lambda *args: f(*[3, 4])
-
-# lambda has parameters but not the call
-_ = lambda x: f()
-_ = lambda *x: f()
-_ = lambda **x: f()
-
-# lambda parameters and call args are not the same length
-_ = lambda x, y: f(x)
-
-# lambda parameters and call args are not in the same order
-_ = lambda x, y: f(y, x)
-
-# lambda parameters and call args are not the same
-_ = lambda x: f(y)
-
-# the call uses the lambda parameters
-_ = lambda x: x(x)
-_ = lambda x, y: x(x, y)
-_ = lambda x: z(lambda y: x + y)(x)
-
-# lambda uses an additional keyword
-_ = lambda *args: f(*args, y=1)
-_ = lambda *args: f(*args, y=x)
--- a/crates/ruff_linter/resources/test/fixtures/pylint/unspecified_encoding.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/unspecified_encoding.py
@@ -1,44 +0,0 @@
-import io
-import sys
-import tempfile
-import io as hugo
-import codecs
-
-# Errors.
-open("test.txt")
-io.TextIOWrapper(io.FileIO("test.txt"))
-hugo.TextIOWrapper(hugo.FileIO("test.txt"))
-tempfile.NamedTemporaryFile("w")
-tempfile.TemporaryFile("w")
-codecs.open("test.txt")
-tempfile.SpooledTemporaryFile(0, "w")
-
-# Non-errors.
-open("test.txt", encoding="utf-8")
-open("test.bin", "wb")
-open("test.bin", mode="wb")
-open("test.txt", "r", -1, "utf-8")
-open("test.txt", mode=sys.argv[1])
-
-def func(*args, **kwargs):
-    open(*args)
-    open("text.txt", **kwargs)
-
-io.TextIOWrapper(io.FileIO("test.txt"), encoding="utf-8")
-io.TextIOWrapper(io.FileIO("test.txt"), "utf-8")
-tempfile.TemporaryFile("w", encoding="utf-8")
-tempfile.TemporaryFile("w", -1, "utf-8")
-tempfile.TemporaryFile("wb")
-tempfile.TemporaryFile()
-tempfile.NamedTemporaryFile("w", encoding="utf-8")
-tempfile.NamedTemporaryFile("w", -1, "utf-8")
-tempfile.NamedTemporaryFile("wb")
-tempfile.NamedTemporaryFile()
-codecs.open("test.txt", encoding="utf-8")
-codecs.open("test.bin", "wb")
-codecs.open("test.bin", mode="wb")
-codecs.open("test.txt", "r", -1, "utf-8")
-tempfile.SpooledTemporaryFile(0, "w", encoding="utf-8")
-tempfile.SpooledTemporaryFile(0, "w", -1, "utf-8")
-tempfile.SpooledTemporaryFile(0, "wb")
-tempfile.SpooledTemporaryFile(0, )
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP035.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP035.py
@@ -80,14 +80,11 @@ from typing import cast
 # OK
 from a import b

-# OK: `typing_extensions` contains backported improvements.
+# Ok: `typing_extensions` contains backported improvements.
 from typing_extensions import SupportsIndex

-# OK: `typing_extensions` contains backported improvements.
+# Ok: `typing_extensions` contains backported improvements.
 from typing_extensions import NamedTuple

-# OK: `typing_extensions` supports `frozen_default` (backported from 3.12).
+# Ok: `typing_extensions` supports `frozen_default` (backported from 3.12).
 from typing_extensions import dataclass_transform
-
-# UP035
-from backports.strenum import StrEnum
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP036_0.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP036_0.py
@@ -202,16 +202,3 @@ if sys.version_info > (3,12):

 if sys.version_info >= (3,12):
    print("py3")
-
-# Slices on `sys.version_info` should be treated equivalently.
-if sys.version_info[:2] >= (3,0):
-    print("py3")
-
-if sys.version_info[:3] >= (3,0):
-    print("py3")
-
-if sys.version_info[:2] > (3,13):
-    print("py3")
-
-if sys.version_info[:3] > (3,13):
-    print("py3")
--- a/crates/ruff_linter/resources/test/fixtures/refurb/FURB101.py
+++ b/crates/ruff_linter/resources/test/fixtures/refurb/FURB101.py
@@ -1,126 +0,0 @@
-def foo():
-    ...
-
-
-def bar(x):
-    ...
-
-
-# Errors.
-
-# FURB101
-with open("file.txt") as f:
-    x = f.read()
-
-# FURB101
-with open("file.txt", "rb") as f:
-    x = f.read()
-
-# FURB101
-with open("file.txt", mode="rb") as f:
-    x = f.read()
-
-# FURB101
-with open("file.txt", encoding="utf8") as f:
-    x = f.read()
-
-# FURB101
-with open("file.txt", errors="ignore") as f:
-    x = f.read()
-
-# FURB101
-with open("file.txt", errors="ignore", mode="rb") as f:
-    x = f.read()
-
-# FURB101
-with open("file.txt", mode="r") as f:  # noqa: FURB120
-    x = f.read()
-
-# FURB101
-with open(foo(), "rb") as f:
-    # The body of `with` is non-trivial, but the recommendation holds.
-    bar("pre")
-    bar(f.read())
-    bar("post")
-    print("Done")
-
-# FURB101
-with open("a.txt") as a, open("b.txt", "rb") as b:
-    x = a.read()
-    y = b.read()
-
-# FURB101
-with foo() as a, open("file.txt") as b, foo() as c:
-    # We have other things in here, multiple with items, but
-    # the user reads the whole file and that bit they can replace.
-    bar(a)
-    bar(bar(a + b.read()))
-    bar(c)
-
-
-# Non-errors.
-
-f2 = open("file2.txt")
-with open("file.txt") as f:
-    x = f2.read()
-
-with open("file.txt") as f:
-    # Path.read_text() does not support size, so ignore this
-    x = f.read(100)
-
-# mode is dynamic
-with open("file.txt", foo()) as f:
-    x = f.read()
-
-# keyword mode is incorrect
-with open("file.txt", mode="a+") as f:
-    x = f.read()
-
-# enables line buffering, not supported in read_text()
-with open("file.txt", buffering=1) as f:
-    x = f.read()
-
-# force CRLF, not supported in read_text()
-with open("file.txt", newline="\r\n") as f:
-    x = f.read()
-
-# dont mistake "newline" for "mode"
-with open("file.txt", newline="b") as f:
-    x = f.read()
-
-# I guess we can possibly also report this case, but the question
-# is why the user would put "r+" here in the first place.
-with open("file.txt", "r+") as f:
-    x = f.read()
-
-# Even though we read the whole file, we do other things.
-with open("file.txt") as f:
-    x = f.read()
-    f.seek(0)
-    x += f.read(100)
-
-# This shouldn't error, since it could contain unsupported arguments, like `buffering`.
-with open(*filename) as f:
-    x = f.read()
-
-# This shouldn't error, since it could contain unsupported arguments, like `buffering`.
-with open(**kwargs) as f:
-    x = f.read()
-
-# This shouldn't error, since it could contain unsupported arguments, like `buffering`.
-with open("file.txt", **kwargs) as f:
-    x = f.read()
-
-# This shouldn't error, since it could contain unsupported arguments, like `buffering`.
-with open("file.txt", mode="r", **kwargs) as f:
-    x = f.read()
-
-# This could error (but doesn't), since it can't contain unsupported arguments, like
-# `buffering`.
-with open(*filename, mode="r") as f:
-    x = f.read()
-
-# This could error (but doesn't), since it can't contain unsupported arguments, like
-# `buffering`.
-with open(*filename, file="file.txt", mode="r") as f:
-    x = f.read()
--- a/crates/ruff_linter/resources/test/fixtures/refurb/FURB105.py
+++ b/crates/ruff_linter/resources/test/fixtures/refurb/FURB105.py
@@ -31,4 +31,3 @@ print("", "foo", sep=",")
 print("foo", "", sep=",")
 print("foo", "", "bar", "", sep=",")
 print("", "", **kwargs)
-print(*args, sep=",")
--- a/crates/ruff_linter/src/checkers/ast/analyze/bindings.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/bindings.rs
@@ -10,7 +10,6 @@ pub(crate) fn bindings(checker: &mut Checker) {
    if !checker.any_enabled(&[
        Rule::InvalidAllFormat,
        Rule::InvalidAllObject,
-        Rule::NonAsciiName,
        Rule::UnaliasedCollectionsAbcSetImport,
        Rule::UnconventionalImportAlias,
        Rule::UnusedVariable,
@@ -50,11 +49,6 @@ pub(crate) fn bindings(checker: &mut Checker) {
                checker.diagnostics.push(diagnostic);
            }
        }
-        if checker.enabled(Rule::NonAsciiName) {
-            if let Some(diagnostic) = pylint::rules::non_ascii_name(binding, checker.locator) {
-                checker.diagnostics.push(diagnostic);
-            }
-        }
        if checker.enabled(Rule::UnconventionalImportAlias) {
            if let Some(diagnostic) = flake8_import_conventions::rules::unconventional_import_alias(
                checker,
--- a/crates/ruff_linter/src/checkers/ast/analyze/deferred_lambdas.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/deferred_lambdas.rs
@@ -1,26 +0,0 @@
-use ruff_python_ast::Expr;
-
-use crate::checkers::ast::Checker;
-use crate::codes::Rule;
-use crate::rules::{flake8_pie, pylint};
-
-/// Run lint rules over all deferred lambdas in the [`SemanticModel`].
-pub(crate) fn deferred_lambdas(checker: &mut Checker) {
-    while !checker.deferred.lambdas.is_empty() {
-        let lambdas = std::mem::take(&mut checker.deferred.lambdas);
-        for snapshot in lambdas {
-            checker.semantic.restore(snapshot);
-
-            let Some(Expr::Lambda(lambda)) = checker.semantic.current_expression() else {
-                unreachable!("Expected Expr::Lambda");
-            };
-
-            if checker.enabled(Rule::UnnecessaryLambda) {
-                pylint::rules::unnecessary_lambda(checker, lambda);
-            }
-            if checker.enabled(Rule::ReimplementedListBuiltin) {
-                flake8_pie::rules::reimplemented_list_builtin(checker, lambda);
-            }
-        }
-    }
-}
--- a/crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs
@@ -306,7 +306,7 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {

        if scope.kind.is_function() {
            if checker.enabled(Rule::NoSelfUse) {
-                pylint::rules::no_self_use(checker, scope_id, scope, &mut diagnostics);
+                pylint::rules::no_self_use(checker, scope, &mut diagnostics);
            }
        }
    }
--- a/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
@@ -786,9 +786,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
            if checker.enabled(Rule::SubprocessRunWithoutCheck) {
                pylint::rules::subprocess_run_without_check(checker, call);
            }
-            if checker.enabled(Rule::UnspecifiedEncoding) {
-                pylint::rules::unspecified_encoding(checker, call);
-            }
            if checker.any_enabled(&[
                Rule::PytestRaisesWithoutException,
                Rule::PytestRaisesTooBroad,
@@ -1197,9 +1194,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
            if checker.enabled(Rule::ComparisonWithItself) {
                pylint::rules::comparison_with_itself(checker, left, ops, comparators);
            }
-            if checker.enabled(Rule::LiteralMembership) {
-                pylint::rules::literal_membership(checker, compare);
-            }
            if checker.enabled(Rule::ComparisonOfConstant) {
                pylint::rules::comparison_of_constant(checker, left, ops, comparators);
            }
@@ -1267,17 +1261,23 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                }
            }
        }
+        Expr::Lambda(
+            lambda @ ast::ExprLambda {
+                parameters: _,
+                body: _,
+                range: _,
+            },
+        ) => {
+            if checker.enabled(Rule::ReimplementedListBuiltin) {
+                flake8_pie::rules::reimplemented_list_builtin(checker, lambda);
+            }
+        }
        Expr::IfExp(ast::ExprIfExp {
            test,
            body,
            orelse,
            range: _,
        }) => {
-            if checker.enabled(Rule::IfElseBlockInsteadOfDictGet) {
-                flake8_simplify::rules::if_exp_instead_of_dict_get(
-                    checker, expr, test, body, orelse,
-                );
-            }
            if checker.enabled(Rule::IfExprWithTrueFalse) {
                flake8_simplify::rules::if_expr_with_true_false(checker, expr, test, body, orelse);
            }
--- a/crates/ruff_linter/src/checkers/ast/analyze/mod.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/mod.rs
@@ -1,7 +1,6 @@
 pub(super) use bindings::bindings;
 pub(super) use comprehension::comprehension;
 pub(super) use deferred_for_loops::deferred_for_loops;
-pub(super) use deferred_lambdas::deferred_lambdas;
 pub(super) use deferred_scopes::deferred_scopes;
 pub(super) use definitions::definitions;
 pub(super) use except_handler::except_handler;
@@ -16,7 +15,6 @@ pub(super) use unresolved_references::unresolved_references;
 mod bindings;
 mod comprehension;
 mod deferred_for_loops;
-mod deferred_lambdas;
 mod deferred_scopes;
 mod definitions;
 mod except_handler;
--- a/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
@@ -21,9 +21,6 @@ use crate::settings::types::PythonVersion;
 pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
    match stmt {
        Stmt::Global(ast::StmtGlobal { names, range: _ }) => {
-            if checker.enabled(Rule::GlobalAtModuleLevel) {
-                pylint::rules::global_at_module_level(checker, stmt);
-            }
            if checker.enabled(Rule::AmbiguousVariableName) {
                checker.diagnostics.extend(names.iter().filter_map(|name| {
                    pycodestyle::rules::ambiguous_variable_name(name, name.range())
@@ -547,9 +544,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
            }

            for alias in names {
-                if checker.enabled(Rule::NonAsciiImportName) {
-                    pylint::rules::non_ascii_module_import(checker, alias);
-                }
                if let Some(asname) = &alias.asname {
                    if checker.enabled(Rule::BuiltinVariableShadowing) {
                        flake8_builtins::rules::builtin_variable_shadowing(
@@ -701,8 +695,8 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                range: _,
            },
        ) => {
-            let level = *level;
            let module = module.as_deref();
+            let level = *level;
            if checker.enabled(Rule::ModuleImportNotAtTopOfFile) {
                pycodestyle::rules::module_import_not_at_top_of_file(checker, stmt);
            }
@@ -715,11 +709,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                    }
                }
            }
-            if checker.enabled(Rule::NonAsciiImportName) {
-                for alias in names {
-                    pylint::rules::non_ascii_module_import(checker, alias);
-                }
-            }
            if checker.enabled(Rule::UnnecessaryFutureImport) {
                if checker.settings.target_version >= PythonVersion::Py37 {
                    if let Some("__future__") = module {
@@ -975,7 +964,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                }
            }
        }
-        Stmt::Raise(raise @ ast::StmtRaise { exc, .. }) => {
+        Stmt::Raise(ast::StmtRaise { exc, .. }) => {
            if checker.enabled(Rule::RaiseNotImplemented) {
                if let Some(expr) = exc {
                    pyflakes::rules::raise_not_implemented(checker, expr);
@@ -1015,9 +1004,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                    flake8_raise::rules::unnecessary_paren_on_raise_exception(checker, expr);
                }
            }
-            if checker.enabled(Rule::MisplacedBareRaise) {
-                pylint::rules::misplaced_bare_raise(checker, raise);
-            }
        }
        Stmt::AugAssign(ast::StmtAugAssign { target, .. }) => {
            if checker.enabled(Rule::GlobalStatement) {
@@ -1052,16 +1038,16 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                flake8_simplify::rules::if_with_same_arms(checker, checker.locator, if_);
            }
            if checker.enabled(Rule::NeedlessBool) {
-                flake8_simplify::rules::needless_bool(checker, if_);
+                flake8_simplify::rules::needless_bool(checker, stmt);
            }
            if checker.enabled(Rule::IfElseBlockInsteadOfDictLookup) {
-                flake8_simplify::rules::if_else_block_instead_of_dict_lookup(checker, if_);
+                flake8_simplify::rules::manual_dict_lookup(checker, if_);
            }
            if checker.enabled(Rule::IfElseBlockInsteadOfIfExp) {
-                flake8_simplify::rules::if_else_block_instead_of_if_exp(checker, if_);
+                flake8_simplify::rules::use_ternary_operator(checker, stmt);
            }
            if checker.enabled(Rule::IfElseBlockInsteadOfDictGet) {
-                flake8_simplify::rules::if_else_block_instead_of_dict_get(checker, if_);
+                flake8_simplify::rules::use_dict_get_with_default(checker, if_);
            }
            if checker.enabled(Rule::TypeCheckWithoutTypeError) {
                tryceratops::rules::type_check_without_type_error(
@@ -1081,9 +1067,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
            if checker.enabled(Rule::CheckAndRemoveFromSet) {
                refurb::rules::check_and_remove_from_set(checker, if_);
            }
-            if checker.enabled(Rule::TooManyBooleanExpressions) {
-                pylint::rules::too_many_boolean_expressions(checker, if_);
-            }
            if checker.source_type.is_stub() {
                if checker.any_enabled(&[
                    Rule::UnrecognizedVersionInfoCheck,
@@ -1183,9 +1166,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
            if checker.enabled(Rule::RedefinedLoopName) {
                pylint::rules::redefined_loop_name(checker, stmt);
            }
-            if checker.enabled(Rule::ReadWholeFile) {
-                refurb::rules::read_whole_file(checker, with_stmt);
-            }
        }
        Stmt::While(ast::StmtWhile { body, orelse, .. }) => {
            if checker.enabled(Rule::FunctionUsesLoopVariable) {
@@ -1325,7 +1305,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
            }
        }
        Stmt::Assign(assign @ ast::StmtAssign { targets, value, .. }) => {
-            checker.enabled(Rule::NonAsciiName);
            if checker.enabled(Rule::LambdaAssignment) {
                if let [target] = &targets[..] {
                    pycodestyle::rules::lambda_assignment(checker, target, value, None, stmt);
--- a/crates/ruff_linter/src/checkers/ast/deferred.rs
+++ b/crates/ruff_linter/src/checkers/ast/deferred.rs
@@ -1,4 +1,4 @@
-use ruff_python_ast::Expr;
+use ruff_python_ast::{Expr, TypeParam};
 use ruff_python_semantic::{ScopeId, Snapshot};
 use ruff_text_size::TextRange;

@@ -10,8 +10,8 @@ pub(crate) struct Deferred<'a> {
    pub(crate) scopes: Vec<ScopeId>,
    pub(crate) string_type_definitions: Vec<(TextRange, &'a str, Snapshot)>,
    pub(crate) future_type_definitions: Vec<(&'a Expr, Snapshot)>,
-    pub(crate) type_param_definitions: Vec<(&'a Expr, Snapshot)>,
+    pub(crate) type_param_definitions: Vec<(&'a TypeParam, Snapshot)>,
    pub(crate) functions: Vec<Snapshot>,
-    pub(crate) lambdas: Vec<Snapshot>,
+    pub(crate) lambdas: Vec<(&'a Expr, Snapshot)>,
    pub(crate) for_loops: Vec<Snapshot>,
 }
--- a/crates/ruff_linter/src/checkers/ast/mod.rs
+++ b/crates/ruff_linter/src/checkers/ast/mod.rs
@@ -52,8 +52,8 @@ use ruff_python_parser::typing::{parse_type_annotation, AnnotationKind};
 use ruff_python_semantic::analyze::{typing, visibility};
 use ruff_python_semantic::{
    BindingFlags, BindingId, BindingKind, Exceptions, Export, FromImport, Globals, Import, Module,
-    ModuleKind, NodeId, ScopeId, ScopeKind, SemanticModel, SemanticModelFlags, Snapshot,
-    StarImport, SubmoduleImport,
+    ModuleKind, NodeId, ScopeId, ScopeKind, SemanticModel, SemanticModelFlags, StarImport,
+    SubmoduleImport,
 };
 use ruff_python_stdlib::builtins::{BUILTINS, MAGIC_GLOBALS};
 use ruff_source_file::Locator;
@@ -524,7 +524,6 @@ where
                );
                self.semantic.push_definition(definition);
                self.semantic.push_scope(ScopeKind::Function(function_def));
-                self.semantic.flags -= SemanticModelFlags::EXCEPTION_HANDLER;

                self.deferred.functions.push(self.semantic.snapshot());

@@ -563,7 +562,6 @@ where
                );
                self.semantic.push_definition(definition);
                self.semantic.push_scope(ScopeKind::Class(class_def));
-                self.semantic.flags -= SemanticModelFlags::EXCEPTION_HANDLER;

                // Extract any global bindings from the class body.
                if let Some(globals) = Globals::from_body(body) {
@@ -582,9 +580,7 @@ where
                if let Some(type_params) = type_params {
                    self.visit_type_params(type_params);
                }
-                self.deferred
-                    .type_param_definitions
-                    .push((value, self.semantic.snapshot()));
+                self.visit_expr(value);
                self.semantic.pop_scope();
                self.visit_expr(name);
            }
@@ -902,7 +898,7 @@ where
                }

                self.semantic.push_scope(ScopeKind::Lambda(lambda));
-                self.deferred.lambdas.push(self.semantic.snapshot());
+                self.deferred.lambdas.push((expr, self.semantic.snapshot()));
            }
            Expr::IfExp(ast::ExprIfExp {
                test,
@@ -1389,14 +1385,9 @@ where
            }
        }
        // Step 2: Traversal
-        if let ast::TypeParam::TypeVar(ast::TypeParamTypeVar {
-            bound: Some(bound), ..
-        }) = type_param
-        {
-            self.deferred
-                .type_param_definitions
-                .push((bound, self.semantic.snapshot()));
-        }
+        self.deferred
+            .type_param_definitions
+            .push((type_param, self.semantic.snapshot()));
    }
 }

@@ -1771,9 +1762,12 @@ impl<'a> Checker<'a> {
            for (type_param, snapshot) in type_params {
                self.semantic.restore(snapshot);

-                self.semantic.flags |=
-                    SemanticModelFlags::TYPE_PARAM_DEFINITION | SemanticModelFlags::TYPE_DEFINITION;
-                self.visit_expr(type_param);
+                if let ast::TypeParam::TypeVar(ast::TypeParamTypeVar {
+                    bound: Some(bound), ..
+                }) = type_param
+                {
+                    self.visit_expr(bound);
+                }
            }
        }
        self.semantic.restore(snapshot);
@@ -1834,15 +1828,15 @@ impl<'a> Checker<'a> {
            for snapshot in deferred_functions {
                self.semantic.restore(snapshot);

-                let Stmt::FunctionDef(ast::StmtFunctionDef {
+                if let Stmt::FunctionDef(ast::StmtFunctionDef {
                    body, parameters, ..
                }) = self.semantic.current_statement()
-                else {
+                {
+                    self.visit_parameters(parameters);
+                    self.visit_body(body);
+                } else {
                    unreachable!("Expected Stmt::FunctionDef")
-                };
-
-                self.visit_parameters(parameters);
-                self.visit_body(body);
+                }
            }
        }
        self.semantic.restore(snapshot);
@@ -1850,31 +1844,26 @@ impl<'a> Checker<'a> {

    fn visit_deferred_lambdas(&mut self) {
        let snapshot = self.semantic.snapshot();
-        let mut deferred: Vec<Snapshot> = Vec::with_capacity(self.deferred.lambdas.len());
        while !self.deferred.lambdas.is_empty() {
            let lambdas = std::mem::take(&mut self.deferred.lambdas);
-            for snapshot in lambdas {
+            for (expr, snapshot) in lambdas {
                self.semantic.restore(snapshot);

-                let Some(Expr::Lambda(ast::ExprLambda {
+                if let Expr::Lambda(ast::ExprLambda {
                    parameters,
                    body,
                    range: _,
-                })) = self.semantic.current_expression()
-                else {
+                }) = expr
+                {
+                    if let Some(parameters) = parameters {
+                        self.visit_parameters(parameters);
+                    }
+                    self.visit_expr(body);
+                } else {
                    unreachable!("Expected Expr::Lambda");
-                };
-
-                if let Some(parameters) = parameters {
-                    self.visit_parameters(parameters);
                }
-                self.visit_expr(body);
-
-                deferred.push(snapshot);
            }
        }
-        // Reset the deferred lambdas, so we can analyze them later on.
-        self.deferred.lambdas = deferred;
        self.semantic.restore(snapshot);
    }

@@ -1994,7 +1983,6 @@ pub(crate) fn check_ast(
    checker.visit_exports();

    // Check docstrings, bindings, and unresolved references.
-    analyze::deferred_lambdas(&mut checker);
    analyze::deferred_for_loops(&mut checker);
    analyze::definitions(&mut checker);
    analyze::bindings(&mut checker);
--- a/crates/ruff_linter/src/checkers/physical_lines.rs
+++ b/crates/ruff_linter/src/checkers/physical_lines.rs
@@ -95,7 +95,6 @@ mod tests {

    use crate::line_width::LineLength;
    use crate::registry::Rule;
-    use crate::rules::pycodestyle;
    use crate::settings::LinterSettings;

    use super::check_physical_lines;
@@ -115,10 +114,7 @@ mod tests {
                &indexer,
                &[],
                &LinterSettings {
-                    pycodestyle: pycodestyle::settings::Settings {
-                        max_line_length: line_length,
-                        ..pycodestyle::settings::Settings::default()
-                    },
+                    line_length,
                    ..LinterSettings::for_rule(Rule::LineTooLong)
                },
            )
--- a/crates/ruff_linter/src/codes.rs
+++ b/crates/ruff_linter/src/codes.rs
--- a/crates/ruff_linter/src/fix/edits.rs
+++ b/crates/ruff_linter/src/fix/edits.rs
@@ -3,7 +3,7 @@
 use anyhow::{Context, Result};

 use ruff_diagnostics::Edit;
-use ruff_python_ast::AnyNodeRef;
+use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::{self as ast, Arguments, ExceptHandler, Stmt};
 use ruff_python_codegen::Stylist;
 use ruff_python_index::Indexer;
@@ -14,7 +14,7 @@ use ruff_source_file::{Locator, NewlineWithTrailingNewline, UniversalNewlines};
 use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};

 use crate::fix::codemods;
-use crate::line_width::{IndentWidth, LineLength, LineWidthBuilder};
+use crate::line_width::{LineLength, LineWidthBuilder, TabSize};

 /// Return the `Fix` to use when deleting a `Stmt`.
 ///
@@ -293,7 +293,7 @@ pub(crate) fn fits(
    node: AnyNodeRef,
    locator: &Locator,
    line_length: LineLength,
-    tab_size: IndentWidth,
+    tab_size: TabSize,
 ) -> bool {
    all_lines_fit(fix, node, locator, line_length.value() as usize, tab_size)
 }
@@ -305,7 +305,7 @@ pub(crate) fn fits_or_shrinks(
    node: AnyNodeRef,
    locator: &Locator,
    line_length: LineLength,
-    tab_size: IndentWidth,
+    tab_size: TabSize,
 ) -> bool {
    // Use the larger of the line length limit, or the longest line in the existing AST node.
    let line_length = std::iter::once(line_length.value() as usize)
@@ -327,7 +327,7 @@ fn all_lines_fit(
    node: AnyNodeRef,
    locator: &Locator,
    line_length: usize,
-    tab_size: IndentWidth,
+    tab_size: TabSize,
 ) -> bool {
    let prefix = locator.slice(TextRange::new(
        locator.line_start(node.start()),
--- a/crates/ruff_linter/src/line_width.rs
+++ b/crates/ruff_linter/src/line_width.rs
@@ -129,12 +129,12 @@ pub struct LineWidthBuilder {
    /// This is used to calculate the width of tabs.
    column: usize,
    /// The tab size to use when calculating the width of tabs.
-    tab_size: IndentWidth,
+    tab_size: TabSize,
 }

 impl Default for LineWidthBuilder {
    fn default() -> Self {
-        Self::new(IndentWidth::default())
+        Self::new(TabSize::default())
    }
 }

@@ -164,7 +164,7 @@ impl LineWidthBuilder {
    }

    /// Creates a new `LineWidth` with the given tab size.
-    pub fn new(tab_size: IndentWidth) -> Self {
+    pub fn new(tab_size: TabSize) -> Self {
        LineWidthBuilder {
            width: 0,
            column: 0,
@@ -234,28 +234,22 @@ impl PartialOrd<LineLength> for LineWidthBuilder {
 /// The size of a tab.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, CacheKey)]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-pub struct IndentWidth(NonZeroU8);
+pub struct TabSize(NonZeroU8);

-impl IndentWidth {
+impl TabSize {
    pub(crate) fn as_usize(self) -> usize {
        self.0.get() as usize
    }
 }

-impl Default for IndentWidth {
+impl Default for TabSize {
    fn default() -> Self {
        Self(NonZeroU8::new(4).unwrap())
    }
 }

-impl From<NonZeroU8> for IndentWidth {
+impl From<NonZeroU8> for TabSize {
    fn from(tab_size: NonZeroU8) -> Self {
        Self(tab_size)
    }
 }
-
-impl From<IndentWidth> for NonZeroU8 {
-    fn from(value: IndentWidth) -> Self {
-        value.0
-    }
-}
--- a/crates/ruff_linter/src/message/text.rs
+++ b/crates/ruff_linter/src/message/text.rs
@@ -12,7 +12,7 @@ use ruff_source_file::{OneIndexed, SourceLocation};
 use ruff_text_size::{Ranged, TextRange, TextSize};

 use crate::fs::relativize_path;
-use crate::line_width::{IndentWidth, LineWidthBuilder};
+use crate::line_width::{LineWidthBuilder, TabSize};
 use crate::message::diff::Diff;
 use crate::message::{Emitter, EmitterContext, Message};
 use crate::registry::AsRule;
@@ -300,7 +300,7 @@ fn replace_whitespace(source: &str, annotation_range: TextRange) -> SourceCode {
    let mut result = String::new();
    let mut last_end = 0;
    let mut range = annotation_range;
-    let mut line_width = LineWidthBuilder::new(IndentWidth::default());
+    let mut line_width = LineWidthBuilder::new(TabSize::default());

    for (index, c) in source.char_indices() {
        let old_width = line_width.get();
--- a/crates/ruff_linter/src/noqa.rs
+++ b/crates/ruff_linter/src/noqa.rs
@@ -253,7 +253,7 @@ impl FileExemption {
                        #[allow(deprecated)]
                        let line = locator.compute_line_index(range.start());
                        let path_display = relativize_path(path);
-                        warn!("Unexpected `# ruff: noqa` directive at {path_display}:{line}. File-level suppression comments must appear on their own line. For line-level suppression, omit the `ruff:` prefix.");
+                        warn!("Unexpected `# ruff: noqa` directive at {path_display}:{line}. File-level suppression comments must appear on their own line.");
                        continue;
                    }

--- a/crates/ruff_linter/src/rules/flake8_bandit/mod.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/mod.rs
@@ -42,7 +42,6 @@ mod tests {
    #[test_case(Rule::SubprocessWithoutShellEqualsTrue, Path::new("S603.py"))]
    #[test_case(Rule::SuspiciousPickleUsage, Path::new("S301.py"))]
    #[test_case(Rule::SuspiciousEvalUsage, Path::new("S307.py"))]
-    #[test_case(Rule::SuspiciousURLOpenUsage, Path::new("S310.py"))]
    #[test_case(Rule::SuspiciousTelnetUsage, Path::new("S312.py"))]
    #[test_case(Rule::TryExceptContinue, Path::new("S112.py"))]
    #[test_case(Rule::TryExceptPass, Path::new("S110.py"))]
--- a/crates/ruff_linter/src/rules/flake8_bandit/rules/suspicious_function_call.rs
+++ b/crates/ruff_linter/src/rules/flake8_bandit/rules/suspicious_function_call.rs
@@ -1,9 +1,10 @@
 //! Check for calls to suspicious functions, or calls into suspicious modules.
 //!
 //! See: <https://bandit.readthedocs.io/en/latest/blacklists/blacklist_calls.html>
+use ruff_python_ast::ExprCall;
+
 use ruff_diagnostics::{Diagnostic, DiagnosticKind, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::{self as ast, Expr, ExprCall};
 use ruff_text_size::Ranged;

 use crate::checkers::ast::Checker;
@@ -849,23 +850,10 @@ pub(crate) fn suspicious_function_call(checker: &mut Checker, call: &ExprCall) {
            ["" | "builtins", "eval"] => Some(SuspiciousEvalUsage.into()),
            // MarkSafe
            ["django", "utils", "safestring", "mark_safe"] => Some(SuspiciousMarkSafeUsage.into()),
-            // URLOpen (`urlopen`, `urlretrieve`, `Request`)
-            ["urllib", "request", "urlopen" | "urlretrieve" | "Request"] |
-            ["six", "moves", "urllib", "request", "urlopen" | "urlretrieve" | "Request"] => {
-                // If the `url` argument is a string literal, allow `http` and `https` schemes.
-                if call.arguments.args.iter().all(|arg| !arg.is_starred_expr()) && call.arguments.keywords.iter().all(|keyword| keyword.arg.is_some()) {
-                    if let Some(Expr::Constant(ast::ExprConstant { value: ast::Constant::Str(url), .. })) = &call.arguments.find_argument("url", 0) {
-                            let url = url.trim_start();
-                            if url.starts_with("http://") || url.starts_with("https://") {
-                                return None;
-                            }
-                    }
-                }
-                Some(SuspiciousURLOpenUsage.into())
-            },
-            // URLOpen (`URLopener`, `FancyURLopener`)
-            ["urllib", "request", "URLopener" | "FancyURLopener"] |
-            ["six", "moves", "urllib", "request", "URLopener" | "FancyURLopener"] => Some(SuspiciousURLOpenUsage.into()),
+            // URLOpen
+            ["urllib", "urlopen" | "urlretrieve" | "URLopener" | "FancyURLopener" | "Request"] |
+            ["urllib", "request", "urlopen" | "urlretrieve" | "URLopener" | "FancyURLopener"] |
+            ["six", "moves", "urllib", "request", "urlopen" | "urlretrieve" | "URLopener" | "FancyURLopener"] => Some(SuspiciousURLOpenUsage.into()),
            // NonCryptographicRandom
            ["random", "random" | "randrange" | "randint" | "choice" | "choices" | "uniform" | "triangular"] => Some(SuspiciousNonCryptographicRandomUsage.into()),
            // UnverifiedContext
--- a/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS310_S310.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linterrulesflake8_bandittestsS310_S310.py.snap
@@ -1,107 +0,0 @@
---
-source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
---
-S310.py:4:1: S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  |
-3 | urllib.request.urlopen(url='http://www.google.com')
-4 | urllib.request.urlopen(url='http://www.google.com', **kwargs)
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ S310
-5 | urllib.request.urlopen('http://www.google.com')
-6 | urllib.request.urlopen('file:///foo/bar/baz')
-  |
-
-S310.py:6:1: S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  |
-4 | urllib.request.urlopen(url='http://www.google.com', **kwargs)
-5 | urllib.request.urlopen('http://www.google.com')
-6 | urllib.request.urlopen('file:///foo/bar/baz')
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ S310
-7 | urllib.request.urlopen(url)
-  |
-
-S310.py:7:1: S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-  |
-5 | urllib.request.urlopen('http://www.google.com')
-6 | urllib.request.urlopen('file:///foo/bar/baz')
-7 | urllib.request.urlopen(url)
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ S310
-8 | 
-9 | urllib.request.Request(url='http://www.google.com', **kwargs)
-  |
-
-S310.py:9:1: S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-   |
- 7 | urllib.request.urlopen(url)
- 8 | 
- 9 | urllib.request.Request(url='http://www.google.com', **kwargs)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ S310
-10 | urllib.request.Request(url='http://www.google.com')
-11 | urllib.request.Request('http://www.google.com')
-   |
-
-S310.py:12:1: S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-   |
-10 | urllib.request.Request(url='http://www.google.com')
-11 | urllib.request.Request('http://www.google.com')
-12 | urllib.request.Request('file:///foo/bar/baz')
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ S310
-13 | urllib.request.Request(url)
-   |
-
-S310.py:13:1: S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-   |
-11 | urllib.request.Request('http://www.google.com')
-12 | urllib.request.Request('file:///foo/bar/baz')
-13 | urllib.request.Request(url)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ S310
-14 | 
-15 | urllib.request.URLopener().open(fullurl='http://www.google.com', **kwargs)
-   |
-
-S310.py:15:1: S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-   |
-13 | urllib.request.Request(url)
-14 | 
-15 | urllib.request.URLopener().open(fullurl='http://www.google.com', **kwargs)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^ S310
-16 | urllib.request.URLopener().open(fullurl='http://www.google.com')
-17 | urllib.request.URLopener().open('http://www.google.com')
-   |
-
-S310.py:16:1: S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-   |
-15 | urllib.request.URLopener().open(fullurl='http://www.google.com', **kwargs)
-16 | urllib.request.URLopener().open(fullurl='http://www.google.com')
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^ S310
-17 | urllib.request.URLopener().open('http://www.google.com')
-18 | urllib.request.URLopener().open('file:///foo/bar/baz')
-   |
-
-S310.py:17:1: S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-   |
-15 | urllib.request.URLopener().open(fullurl='http://www.google.com', **kwargs)
-16 | urllib.request.URLopener().open(fullurl='http://www.google.com')
-17 | urllib.request.URLopener().open('http://www.google.com')
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^ S310
-18 | urllib.request.URLopener().open('file:///foo/bar/baz')
-19 | urllib.request.URLopener().open(url)
-   |
-
-S310.py:18:1: S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-   |
-16 | urllib.request.URLopener().open(fullurl='http://www.google.com')
-17 | urllib.request.URLopener().open('http://www.google.com')
-18 | urllib.request.URLopener().open('file:///foo/bar/baz')
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^ S310
-19 | urllib.request.URLopener().open(url)
-   |
-
-S310.py:19:1: S310 Audit URL open for permitted schemes. Allowing use of `file:` or custom schemes is often unexpected.
-   |
-17 | urllib.request.URLopener().open('http://www.google.com')
-18 | urllib.request.URLopener().open('file:///foo/bar/baz')
-19 | urllib.request.URLopener().open(url)
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^ S310
-   |
-
-
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_argument_default.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/mutable_argument_default.rs
@@ -30,12 +30,6 @@ use crate::checkers::ast::Checker;
 /// Types outside of the standard library can be marked as immutable with the
 /// [`flake8-bugbear.extend-immutable-calls`] configuration option.
 ///
-/// ## Known problems
-/// Mutable argument defaults can be used intentionally to cache computation
-/// results. Replacing the default with `None` or an immutable data structure
-/// does not work for such usages. Instead, prefer the `@functools.lru_cache`
-/// decorator from the standard library.
-///
 /// ## Example
 /// ```python
 /// def add_to_list(item, some_list=[]):
@@ -203,5 +197,5 @@ fn move_initialization(
    }

    let initialization_edit = Edit::insertion(content, pos);
-    Some(Fix::unsafe_edits(default_edit, [initialization_edit]))
+    Some(Fix::display_edits(default_edit, [initialization_edit]))
 }
--- a/crates/ruff_linter/src/rules/flake8_bugbear/rules/strip_with_multi_characters.rs
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/rules/strip_with_multi_characters.rs
@@ -34,7 +34,7 @@ use crate::checkers::ast::Checker;
 ///
 /// ## Example
 /// ```python
-/// "text.txt".strip(".txt")  # "e"
+/// "text.txt".strip(".txt")  # "ex"
 /// ```
 ///
 /// Use instead:
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB006_B006_1.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB006_B006_1.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
 ---
-B006_1.py:3:22: B006 [*] Do not use mutable data structures for argument defaults
+B006_1.py:3:22: B006 Do not use mutable data structures for argument defaults
  |
 1 | # Docstring followed by a newline
 2 | 
@@ -12,7 +12,7 @@ B006_1.py:3:22: B006 [*] Do not use mutable data structures for argument default
  |
  = help: Replace with `None`; initialize within function

-ℹ Suggested fix
+ℹ Possible fix
 1 1 | # Docstring followed by a newline
 2 2 | 
 3   |-def foobar(foor, bar={}):    
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB006_B006_2.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB006_B006_2.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
 ---
-B006_2.py:4:22: B006 [*] Do not use mutable data structures for argument defaults
+B006_2.py:4:22: B006 Do not use mutable data structures for argument defaults
  |
 2 | # Regression test for https://github.com/astral-sh/ruff/issues/7155
 3 | 
@@ -12,7 +12,7 @@ B006_2.py:4:22: B006 [*] Do not use mutable data structures for argument default
  |
  = help: Replace with `None`; initialize within function

-ℹ Suggested fix
+ℹ Possible fix
 1 1 | # Docstring followed by whitespace with no newline
 2 2 | # Regression test for https://github.com/astral-sh/ruff/issues/7155
 3 3 | 
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB006_B006_3.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB006_B006_3.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
 ---
-B006_3.py:4:22: B006 [*] Do not use mutable data structures for argument defaults
+B006_3.py:4:22: B006 Do not use mutable data structures for argument defaults
  |
 4 | def foobar(foor, bar={}):    
  |                      ^^ B006
@@ -10,7 +10,7 @@ B006_3.py:4:22: B006 [*] Do not use mutable data structures for argument default
  |
  = help: Replace with `None`; initialize within function

-ℹ Suggested fix
+ℹ Possible fix
 1 1 | # Docstring with no newline
 2 2 | 
 3 3 | 
--- a/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB006_B006_4.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linterrulesflake8_bugbeartestsB006_B006_4.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
 ---
-B006_4.py:7:26: B006 [*] Do not use mutable data structures for argument defaults
+B006_4.py:7:26: B006 Do not use mutable data structures for argument defaults
  |
 6 | class FormFeedIndent:
 7 |    def __init__(self, a=[]):
@@ -10,7 +10,7 @@ B006_4.py:7:26: B006 [*] Do not use mutable data structures for argument default
  |
  = help: Replace with `None`; initialize within function

-ℹ Suggested fix
+ℹ Possible fix
 4  4  | 
 5  5  | 
 6  6  | class FormFeedIndent:
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
konstin	63ef7652ed	Fix test	2023-10-13 17:14:17 +02:00
konstin	1743ef8398	Remove empty line before raw dostrings Summary This fixes a deviation with black where black would remove empty lines before raw docstrings for some reason.	2023-10-13 16:04:01 +02:00