Discard changes to crates/ruff_python_formatter/src/lib.rs

Split tuples in return positions by comma first
Lint
2023-10-27 17:09:07 -05:00 · 2023-10-27 17:09:07 -05:00 · 2023-10-27 15:48:21 -05:00 · 2023-10-27 15:46:33 -05:00 · 2023-10-27 15:39:49 -05:00 · 2023-10-27 15:16:20 -05:00
1324 changed files with 15194 additions and 35056 deletions
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -0,0 +1,29 @@
+# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuring-automatically-generated-release-notes
+changelog:
+  exclude:
+    labels:
+      - internal
+      - documentation
+  categories:
+    - title: Breaking Changes
+      labels:
+        - breaking
+    - title: Rules
+      labels:
+        - rule
+    - title: Settings
+      labels:
+        - configuration
+        - cli
+    - title: Bug Fixes
+      labels:
+        - bug
+    - title: Formatter
+      labels:
+        - formatter
+    - title: Preview
+      labels:
+        - preview
+    - title: Other Changes
+      labels:
+        - "*"
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -30,7 +30,7 @@ jobs:
        with:
          fetch-depth: 0

-      - uses: tj-actions/changed-files@v40
+      - uses: tj-actions/changed-files@v39
        id: changed
        with:
          files_yaml: |
@@ -132,7 +132,7 @@ jobs:
      - uses: actions/checkout@v4
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
        with:
          node-version: 18
          cache: "npm"
@@ -184,11 +184,7 @@ jobs:
      - cargo-test-linux
      - determine_changes
    # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
-    # Ecosystem check needs linter and/or formatter changes.
-    if: github.event_name == 'pull_request' && ${{
-      needs.determine_changes.outputs.linter == 'true' ||
-      needs.determine_changes.outputs.formatter == 'true'
-      }}
+    if: github.event_name == 'pull_request'
    steps:
      - uses: actions/checkout@v4
      - uses: actions/setup-python@v4
@@ -213,69 +209,28 @@ jobs:
        run: |
          pip install ./python/ruff-ecosystem

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

-          # Set pipefail to avoid hiding errors with tee
-          set -eo pipefail
+          ruff-ecosystem check ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff --cache ./checkouts --output-format markdown | tee ecosystem-result-check

-          ruff-ecosystem check ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff --cache ./checkouts --output-format markdown | tee ecosystem-result-check-stable
-
-          cat ecosystem-result-check-stable > $GITHUB_STEP_SUMMARY
-          echo "### Linter (stable)"  > ecosystem-result
-          cat ecosystem-result-check-stable >> ecosystem-result
+          cat ecosystem-result-check > $GITHUB_STEP_SUMMARY
+          cat ecosystem-result-check > ecosystem-result
          echo "" >> ecosystem-result

-      - name: Run `ruff check` preview ecosystem check
-        if: ${{ needs.determine_changes.outputs.linter == 'true' }}
-        run: |
-          # Make executable, since artifact download doesn't preserve this
-          chmod +x ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff
-
-          # Set pipefail to avoid hiding errors with tee
-          set -eo pipefail
-
-          ruff-ecosystem check ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff --cache ./checkouts --output-format markdown --force-preview | tee ecosystem-result-check-preview
-
-          cat ecosystem-result-check-preview > $GITHUB_STEP_SUMMARY
-          echo "### Linter (preview)" >> ecosystem-result
-          cat ecosystem-result-check-preview >> ecosystem-result
-          echo "" >> ecosystem-result
-
-      - name: Run `ruff format` stable ecosystem check
+      - name: Run `ruff format` ecosystem check
        if: ${{ needs.determine_changes.outputs.formatter == 'true' }}
        run: |
          # Make executable, since artifact download doesn't preserve this
          chmod +x ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff

-          # Set pipefail to avoid hiding errors with tee
-          set -eo pipefail
+          ruff-ecosystem format ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff --cache ./checkouts --output-format markdown | tee ecosystem-result-format

-          ruff-ecosystem format ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff --cache ./checkouts --output-format markdown | tee ecosystem-result-format-stable
-
-          cat ecosystem-result-format-stable > $GITHUB_STEP_SUMMARY
-          echo "### Formatter (stable)" >> ecosystem-result
-          cat ecosystem-result-format-stable >> ecosystem-result
-          echo "" >> ecosystem-result
-
-      - name: Run `ruff format` preview ecosystem check
-        if: ${{ needs.determine_changes.outputs.formatter == 'true' }}
-        run: |
-          # Make executable, since artifact download doesn't preserve this
-          chmod +x ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff
-
-          # Set pipefail to avoid hiding errors with tee
-          set -eo pipefail
-
-          ruff-ecosystem format ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff --cache ./checkouts --output-format markdown --force-preview | tee ecosystem-result-format-preview
-
-          cat ecosystem-result-format-preview > $GITHUB_STEP_SUMMARY
-          echo "### Formatter (preview)" >> ecosystem-result
-          cat ecosystem-result-format-preview >> ecosystem-result
-          echo "" >> ecosystem-result
+          cat ecosystem-result-format > $GITHUB_STEP_SUMMARY
+          cat ecosystem-result-format >> ecosystem-result

      - name: Export pull request number
        run: |
@@ -392,10 +347,10 @@ jobs:
        run: mkdocs build --strict -f mkdocs.insiders.yml
      - name: "Build docs"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
-        run: mkdocs build --strict -f mkdocs.public.yml
+        run: mkdocs build --strict -f mkdocs.generated.yml

-  check-formatter-instability-and-black-similarity:
-    name: "formatter instabilities and black similarity"
+  check-formatter-ecosystem:
+    name: "Formatter ecosystem and progress checks"
    runs-on: ubuntu-latest
    needs: determine_changes
    if: needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main'
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -44,10 +44,10 @@ jobs:
        run: mkdocs build --strict -f mkdocs.insiders.yml
      - name: "Build docs"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
-        run: mkdocs build --strict -f mkdocs.public.yml
+        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.2
+        uses: cloudflare/wrangler-action@v3.3.1
        with:
          apiToken: ${{ secrets.CF_API_TOKEN }}
          accountId: ${{ secrets.CF_ACCOUNT_ID }}
--- a/.github/workflows/playground.yaml
+++ b/.github/workflows/playground.yaml
@@ -20,7 +20,7 @@ jobs:
      - uses: actions/checkout@v4
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
        with:
          node-version: 18
          cache: "npm"
@@ -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.2
+        uses: cloudflare/wrangler-action@v3.3.1
        with:
          apiToken: ${{ secrets.CF_API_TOKEN }}
          accountId: ${{ secrets.CF_ACCOUNT_ID }}
--- a/.github/workflows/pr-comment.yaml
+++ b/.github/workflows/pr-comment.yaml
@@ -1,4 +1,4 @@
-name: Ecosystem check comment
+name: PR Check Comment

 on:
  workflow_run:
@@ -18,13 +18,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: dawidd6/action-download-artifact@v2
-        name: Download pull request number
+        name: Download PR Number
        with:
          name: pr-number
          run_id: ${{ github.event.workflow_run.id ||  github.event.inputs.workflow_run_id }}
          if_no_artifact_found: ignore

-      - name: Parse pull request number
+      - name: Extract PR Number
        id: pr-number
        run: |
          if [[ -f pr-number ]]
@@ -33,7 +33,7 @@ jobs:
          fi

      - uses: dawidd6/action-download-artifact@v2
-        name: "Download ecosystem results"
+        name: "Download Ecosystem Result"
        id: download-ecosystem-result
        if: steps.pr-number.outputs.pr-number
        with:
@@ -41,18 +41,15 @@ jobs:
          workflow: ci.yaml
          pr: ${{ steps.pr-number.outputs.pr-number }}
          path: pr/ecosystem
-          workflow_conclusion: completed
          if_no_artifact_found: ignore

-      - name: Generate comment content
+      - name: Generate Comment
        id: generate-comment
        if: steps.download-ecosystem-result.outputs.found_artifact == 'true'
        run: |
-          # Note this identifier is used to find the comment to update on
-          # subsequent runs
-          echo '<!-- generated-comment ecosystem -->' >> comment.txt
+          echo '## PR Check Results' >> comment.txt

-          echo '## `ruff-ecosystem` results' >> comment.txt
+          echo "### Ecosystem" >> comment.txt
          cat pr/ecosystem/ecosystem-result >> comment.txt
          echo "" >> comment.txt

@@ -60,14 +57,14 @@ jobs:
          cat comment.txt >> $GITHUB_OUTPUT
          echo 'EOF' >> $GITHUB_OUTPUT

-      - name: Find existing comment
+      - name: Find Comment
        uses: peter-evans/find-comment@v2
        if: steps.generate-comment.outcome == 'success'
        id: find-comment
        with:
          issue-number: ${{ steps.pr-number.outputs.pr-number }}
          comment-author: "github-actions[bot]"
-          body-includes: "<!-- generated-comment ecosystem -->"
+          body-includes: PR Check Results

      - name: Create or update comment
        if: steps.find-comment.outcome == 'success'
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -48,6 +48,7 @@ jobs:
          args: --out dist
      - name: "Test sdist"
        run: |
+          rustup default $(cat rust-toolchain)
          pip install dist/${{ env.PACKAGE_NAME }}-*.tar.gz --force-reinstall
          ruff --help
          python -m ruff --help
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -13,12 +13,12 @@ exclude: |

 repos:
  - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.15
+    rev: v0.12.1
    hooks:
      - id: validate-pyproject

  - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.17
+    rev: 0.7.16
    hooks:
      - id: mdformat
        additional_dependencies:
@@ -26,22 +26,16 @@ repos:
          - mdformat-admon
        exclude: |
          (?x)^(
-            docs/formatter/black\.md
-            | docs/\w+\.md
+            docs/formatter/black.md
          )$

  - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.37.0
+    rev: v0.33.0
    hooks:
      - id: markdownlint-fix
-        exclude: |
-          (?x)^(
-            docs/formatter/black\.md
-            | docs/\w+\.md
-          )$

  - repo: https://github.com/crate-ci/typos
-    rev: v1.16.22
+    rev: v1.14.12
    hooks:
      - id: typos

@@ -53,13 +47,10 @@ repos:
        language: system
        types: [rust]
        pass_filenames: false # This makes it a lot faster
-
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.4
-    hooks:
-      - id: ruff-format
      - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+        name: ruff
+        entry: cargo run --bin ruff -- check --no-cache --force-exclude --fix --exit-non-zero-on-fix
+        language: system
        types_or: [python, pyi]
        require_serial: true
        exclude: |
@@ -68,9 +59,15 @@ repos:
            crates/ruff_python_formatter/resources/.*
          )$

+  # Black
+  - repo: https://github.com/psf/black
+    rev: 23.1.0
+    hooks:
+      - id: black
+
  # Prettier
  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.3
+    rev: v3.0.0
    hooks:
      - id: prettier
        types: [yaml]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,115 +1,5 @@
 # Changelog

-## 0.1.5
-
-### Preview features
-
- \[`flake8-bandit`\] Implement `mako-templates` (`S702`) ([#8533](https://github.com/astral-sh/ruff/pull/8533))
- \[`flake8-trio`\] Implement `TRIO105` ([#8490](https://github.com/astral-sh/ruff/pull/8490))
- \[`flake8-trio`\] Implement `TRIO109` ([#8534](https://github.com/astral-sh/ruff/pull/8534))
- \[`flake8-trio`\] Implement `TRIO110` ([#8537](https://github.com/astral-sh/ruff/pull/8537))
- \[`flake8-trio`\] Implement `TRIO115` ([#8486](https://github.com/astral-sh/ruff/pull/8486))
- \[`refurb`\] Implement `type-none-comparison` (`FURB169`) ([#8487](https://github.com/astral-sh/ruff/pull/8487))
- Flag all comparisons against builtin types in `E721` ([#8491](https://github.com/astral-sh/ruff/pull/8491))
- Make `SIM118` fix as safe when the expression is a known dictionary  ([#8525](https://github.com/astral-sh/ruff/pull/8525))
-
-### Formatter
-
- Fix multiline lambda expression statement formatting ([#8466](https://github.com/astral-sh/ruff/pull/8466))
-
-### CLI
-
- Add hidden `--extension` to override inference of source type from file extension ([#8373](https://github.com/astral-sh/ruff/pull/8373))
-
-### Configuration
-
- Account for selector specificity when merging `extend_unsafe_fixes` and `override extend_safe_fixes` ([#8444](https://github.com/astral-sh/ruff/pull/8444))
- Add support for disabling cache with `RUFF_NO_CACHE` environment variable ([#8538](https://github.com/astral-sh/ruff/pull/8538))
-
-### Bug fixes
-
- \[`E721`\] Flag comparisons to `memoryview` ([#8485](https://github.com/astral-sh/ruff/pull/8485))
- Allow collapsed-ellipsis bodies in other statements ([#8499](https://github.com/astral-sh/ruff/pull/8499))
- Avoid `D301` autofix for `u` prefixed strings ([#8495](https://github.com/astral-sh/ruff/pull/8495))
- Only flag `flake8-trio` rules when `trio` import is present ([#8550](https://github.com/astral-sh/ruff/pull/8550))
- Reject more syntactically invalid Python programs ([#8524](https://github.com/astral-sh/ruff/pull/8524))
- Avoid raising `TRIO115` violations for `trio.sleep(...)` calls with non-number values ([#8532](https://github.com/astral-sh/ruff/pull/8532))
- Fix `F841` false negative on assignment to multiple variables ([#8489](https://github.com/astral-sh/ruff/pull/8489))
-
-### Documentation
-
- Fix link to isort `known-first-party` ([#8562](https://github.com/astral-sh/ruff/pull/8562))
- Add notes on fix safety to a few rules ([#8500](https://github.com/astral-sh/ruff/pull/8500))
- Add missing toml config tabs ([#8512](https://github.com/astral-sh/ruff/pull/8512))
- Add instructions for configuration of Emacs ([#8488](https://github.com/astral-sh/ruff/pull/8488))
- Improve detail link contrast in dark mode ([#8548](https://github.com/astral-sh/ruff/pull/8548))
- Fix typo in example ([#8506](https://github.com/astral-sh/ruff/pull/8506))
- Added tabs for configuration files in the documentation ([#8480](https://github.com/astral-sh/ruff/pull/8480))
- Recommend `project.requires-python` over `target-version` ([#8513](https://github.com/astral-sh/ruff/pull/8513))
- Add singleton escape hatch to `B008` documentation ([#8501](https://github.com/astral-sh/ruff/pull/8501))
- Fix tab configuration docs ([#8502](https://github.com/astral-sh/ruff/pull/8502))
-
-## 0.1.4
-
-### Preview features
-
- \[`flake8-trio`\] Implement `timeout-without-await` (`TRIO001`) ([#8439](https://github.com/astral-sh/ruff/pull/8439))
- \[`numpy`\] Implement NumPy 2.0 migration rule (`NPY200`) ([#7702](https://github.com/astral-sh/ruff/pull/7702))
- \[`pylint`\] Implement `bad-open-mode` (`W1501`) ([#8294](https://github.com/astral-sh/ruff/pull/8294))
- \[`pylint`\] Implement `import-outside-toplevel` (`C0415`) rule ([#5180](https://github.com/astral-sh/ruff/pull/5180))
- \[`pylint`\] Implement `useless-with-lock` (`W2101`) ([#8321](https://github.com/astral-sh/ruff/pull/8321))
- \[`pyupgrade`\] Implement `timeout-error-alias` (`UP041`) ([#8476](https://github.com/astral-sh/ruff/pull/8476))
- \[`refurb`\] Implement `isinstance-type-none` (`FURB168`) ([#8308](https://github.com/astral-sh/ruff/pull/8308))
- Detect confusable Unicode-to-Unicode units in `RUF001`, `RUF002`, and `RUF003` ([#4430](https://github.com/astral-sh/ruff/pull/4430))
- Add newline after module docstrings in preview style ([#8283](https://github.com/astral-sh/ruff/pull/8283))
-
-### Formatter
-
- Add a note on line-too-long to the formatter docs ([#8314](https://github.com/astral-sh/ruff/pull/8314))
- Preserve trailing statement semicolons when using `fmt: skip` ([#8273](https://github.com/astral-sh/ruff/pull/8273))
- Preserve trailing semicolons when using `fmt: off` ([#8275](https://github.com/astral-sh/ruff/pull/8275))
- Avoid duplicating linter-formatter compatibility warnings ([#8292](https://github.com/astral-sh/ruff/pull/8292))
- Avoid inserting a newline after function docstrings ([#8375](https://github.com/astral-sh/ruff/pull/8375))
- Insert newline between docstring and following own line comment ([#8216](https://github.com/astral-sh/ruff/pull/8216))
- Split tuples in return positions by comma first ([#8280](https://github.com/astral-sh/ruff/pull/8280))
- Avoid treating byte strings as docstrings ([#8350](https://github.com/astral-sh/ruff/pull/8350))
- Add `--line-length` option to `format` command ([#8363](https://github.com/astral-sh/ruff/pull/8363))
- Avoid parenthesizing unsplittable because of comments ([#8431](https://github.com/astral-sh/ruff/pull/8431))
-
-### CLI
-
- Add `--output-format` to `ruff rule` and `ruff linter` ([#8203](https://github.com/astral-sh/ruff/pull/8203))
-
-### Bug fixes
-
- Respect `--force-exclude` in `lint.exclude` and `format.exclude` ([#8393](https://github.com/astral-sh/ruff/pull/8393))
- Respect `--extend-per-file-ignores` on the CLI ([#8329](https://github.com/astral-sh/ruff/pull/8329))
- Extend `bad-dunder-method-name` to permit `__index__` ([#8300](https://github.com/astral-sh/ruff/pull/8300))
- Fix panic with 8 in octal escape ([#8356](https://github.com/astral-sh/ruff/pull/8356))
- Avoid raising `D300` when both triple quote styles are present ([#8462](https://github.com/astral-sh/ruff/pull/8462))
- Consider unterminated f-strings in `FStringRanges` ([#8154](https://github.com/astral-sh/ruff/pull/8154))
- Avoid including literal `shell=True` for truthy, non-`True` diagnostics ([#8359](https://github.com/astral-sh/ruff/pull/8359))
- Avoid triggering single-element test for starred expressions ([#8433](https://github.com/astral-sh/ruff/pull/8433))
- Detect and ignore Jupyter automagics ([#8398](https://github.com/astral-sh/ruff/pull/8398))
- Fix invalid E231 error with f-strings ([#8369](https://github.com/astral-sh/ruff/pull/8369))
- Avoid triggering `NamedTuple` rewrite with starred annotation ([#8434](https://github.com/astral-sh/ruff/pull/8434))
- Avoid un-setting bracket flag in logical lines ([#8380](https://github.com/astral-sh/ruff/pull/8380))
- Place 'r' prefix before 'f' for raw format strings ([#8464](https://github.com/astral-sh/ruff/pull/8464))
- Remove trailing periods from NumPy 2.0 code actions ([#8475](https://github.com/astral-sh/ruff/pull/8475))
- Fix bug where `PLE1307` was raised when formatting `%c` with characters ([#8407](https://github.com/astral-sh/ruff/pull/8407))
- Remove unicode flag from comparable ([#8440](https://github.com/astral-sh/ruff/pull/8440))
- Improve B015 message ([#8295](https://github.com/astral-sh/ruff/pull/8295))
- Use `fixedOverflowWidgets` for playground popover ([#8458](https://github.com/astral-sh/ruff/pull/8458))
- Mark `byte_bounds` as a non-backwards-compatible NumPy 2.0 change ([#8474](https://github.com/astral-sh/ruff/pull/8474))
-
-### Internals
-
- Add a dedicated cache directory per Ruff version ([#8333](https://github.com/astral-sh/ruff/pull/8333))
- Allow selective caching for `--fix` and `--diff` ([#8316](https://github.com/astral-sh/ruff/pull/8316))
- Improve performance of comment parsing ([#8193](https://github.com/astral-sh/ruff/pull/8193))
- Improve performance of string parsing ([#8227](https://github.com/astral-sh/ruff/pull/8227))
- Use a dedicated sort key for isort import sorting ([#7963](https://github.com/astral-sh/ruff/pull/7963))
-
 ## 0.1.3

 This release includes a variety of improvements to the Ruff formatter, removing several known and
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -72,7 +72,7 @@ representative at an online or offline event.

 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-<charlie.r.marsh@gmail.com>.
+charlie.r.marsh@gmail.com.
 All complaints will be reviewed and investigated promptly and fairly.

 All community leaders are obligated to respect the privacy and security of the
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -114,7 +114,7 @@ such that all crates are contained in a flat `crates` directory.
 The vast majority of the code, including all lint rules, lives in the `ruff` crate (located at
 `crates/ruff_linter`). As a contributor, that's the crate that'll be most relevant to you.

-At the time of writing, the repository includes the following crates:
+At time of writing, the repository includes the following crates:

 - `crates/ruff_linter`: library crate containing all lint rules and the core logic for running them.
    If you're working on a rule, this is the crate for you.
@@ -315,18 +315,9 @@ even patch releases may contain [non-backwards-compatible changes](https://semve

 ### Creating a new release

-We use an experimental in-house tool for managing releases.
-
-1. Install `rooster`: `pip install git+https://github.com/zanieb/rooster@main`
-1. Run `rooster release`; this command will:
-    - Generate a changelog entry in `CHANGELOG.md`
-    - Update versions in `pyproject.toml` and `Cargo.toml`
-    - Update references to versions in the `README.md` and documentation
-1. The changelog should then be editorialized for consistency
-    - Often labels will be missing from pull requests they will need to be manually organized into the proper section
-    - Changes should be edited to be user-facing descriptions, avoiding internal details
-1. Highlight any breaking changes in `BREAKING_CHANGES.md`
-1. Create a pull request with the changelog and version updates
+1. Update the version with `rg 0.0.269 --files-with-matches | xargs sed -i 's/0.0.269/0.0.270/g'`
+1. Update `BREAKING_CHANGES.md`
+1. Create a PR with the version and `BREAKING_CHANGES.md` updated
 1. Merge the PR
 1. Run the release workflow with the version number (without starting `v`) as input. Make sure
    main has your merged PR as last commit
@@ -339,26 +330,23 @@ We use an experimental in-house tool for managing releases.
    1. Attach artifacts to draft GitHub release
    1. Trigger downstream repositories. This can fail non-catastrophically, as we can run any
        downstream jobs manually if needed.
-1. Publish the GitHub release
-    1. Open the draft release in the GitHub release section
-    1. Copy the changelog for the release into the GitHub release
-        - See previous releases for formatting of section headers
-    1. Generate the contributor list with `rooster contributors` and add to the release notes
+1. Create release notes in GitHub UI and promote from draft.
 1. If needed, [update the schemastore](https://github.com/charliermarsh/ruff/blob/main/scripts/update_schemastore.py)
 1. If needed, update the `ruff-lsp` and `ruff-vscode` repositories.

 ## Ecosystem CI

 GitHub Actions will run your changes against a number of real-world projects from GitHub and
-report on any linter or formatter differences. You can also run those checks locally via:
+report on any diagnostic differences. You can also run those checks locally via:

 ```shell
-pip install -e ./python/ruff-ecosystem
-ruff-ecosystem check ruff "./target/debug/ruff"
-ruff-ecosystem format ruff "./target/debug/ruff"
+python scripts/check_ecosystem.py path/to/your/ruff path/to/older/ruff
 ```

-See the [ruff-ecosystem package](https://github.com/astral-sh/ruff/tree/main/python/ruff-ecosystem) for more details.
+You can also run the Ecosystem CI check in a Docker container across a larger set of projects by
+downloading the [`known-github-tomls.json`](https://github.com/akx/ruff-usage-aggregate/blob/master/data/known-github-tomls.jsonl)
+as `github_search.jsonl` and following the instructions in [scripts/Dockerfile.ecosystem](https://github.com/astral-sh/ruff/blob/main/scripts/Dockerfile.ecosystem).
+Note that this check will take a while to run.

 ## Benchmarking and Profiling

@@ -889,5 +877,5 @@ By default, `src` is set to the project root. In the above example, we'd want to
 `src = ["./src"]` to ensure that we locate `./my_project/src/foo` and thus categorize `import foo`
 as first-party in `baz.py`. In practice, for this limited example, setting `src = ["./src"]` is
 unnecessary, as all imports within `./my_project/src/foo` would be categorized as first-party via
-the same-package heuristic; but if your project contains multiple packages, you'll want to set `src`
+the same-package heuristic; but your project contains multiple packages, you'll want to set `src`
 explicitly.
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -64,9 +64,9 @@ checksum = "c7021ce4924a3f25f802b2cccd1af585e39ea1a363a1aa2e72afe54b67a3a7a7"

 [[package]]
 name = "annotate-snippets"
-version = "0.9.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
+checksum = "c3b9d411ecbaf79885c6df4d75fff75858d5995ff25385657a28af47e82f9c36"
 dependencies = [
 "unicode-width",
 "yansi-term",
@@ -210,9 +210,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"

 [[package]]
 name = "bstr"
@@ -278,7 +278,9 @@ checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
+ "js-sys",
 "num-traits",
+ "wasm-bindgen",
 "windows-targets 0.48.5",
 ]

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

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

 [[package]]
 name = "clap_builder"
-version = "4.4.7"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
+checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
 dependencies = [
 "anstream",
 "anstyle",
@@ -374,21 +376,21 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.4.7"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
 dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]

 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"

 [[package]]
 name = "clearscreen"
@@ -405,9 +407,9 @@ dependencies = [

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

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

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

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

 [[package]]
 name = "flake8-to-ruff"
-version = "0.1.5"
+version = "0.1.3"
 dependencies = [
 "anyhow",
 "clap",
@@ -827,7 +829,7 @@ dependencies = [
 "serde_json",
 "strum",
 "strum_macros",
- "toml 0.7.8",
+ "toml",
 ]

 [[package]]
@@ -857,12 +859,9 @@ dependencies = [

 [[package]]
 name = "fs-err"
-version = "2.10.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5fd9bcbe8b1087cbd395b51498c01bc997cef73e778a80b77a811af5e2d29f"
-dependencies = [
- "autocfg",
-]
+checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541"

 [[package]]
 name = "fsevent-sys"
@@ -928,9 +927,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"

 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"

 [[package]]
 name = "heck"
@@ -1034,12 +1033,12 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
 dependencies = [
 "equivalent",
- "hashbrown 0.14.2",
+ "hashbrown 0.14.0",
 "serde",
 ]

@@ -1130,7 +1129,7 @@ dependencies = [
 "pmutil 0.6.1",
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -1263,9 +1262,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.149"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"

 [[package]]
 name = "libcst"
@@ -1310,9 +1309,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"

 [[package]]
 name = "linux-raw-sys"
-version = "0.4.10"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
+checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"

 [[package]]
 name = "lock_api"
@@ -1441,7 +1440,7 @@ version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.0",
 "crossbeam-channel",
 "filetime",
 "fsevent-sys",
@@ -1708,7 +1707,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -1802,37 +1801,36 @@ dependencies = [

 [[package]]
 name = "pyproject-toml"
-version = "0.8.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46d4a5e69187f23a29f8aa0ea57491d104ba541bc55f76552c2a74962aa20e04"
+checksum = "569e259cd132eb8cec5df8b672d187c5260f82ad352156b5da9549d4472e64b0"
 dependencies = [
 "indexmap",
 "pep440_rs",
 "pep508_rs",
 "serde",
- "toml 0.8.2",
+ "toml",
 ]

 [[package]]
 name = "quick-junit"
-version = "0.3.5"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9599bffc2cd7511355996e0cfd979266b2cfa3f3ff5247d07a3a6e1ded6158"
+checksum = "6bf780b59d590c25f8c59b44c124166a2a93587868b619fb8f5b47fb15e9ed6d"
 dependencies = [
 "chrono",
 "indexmap",
 "nextest-workspace-hack",
 "quick-xml",
- "strip-ansi-escapes",
 "thiserror",
 "uuid",
 ]

 [[package]]
 name = "quick-xml"
-version = "0.31.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51"
 dependencies = [
 "memchr",
 ]
@@ -1914,15 +1912,6 @@ dependencies = [
 "bitflags 1.3.2",
 ]

-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_users"
 version = "0.4.3"
@@ -2062,14 +2051,14 @@ dependencies = [

 [[package]]
 name = "ruff_cli"
-version = "0.1.5"
+version = "0.1.3"
 dependencies = [
- "annotate-snippets 0.9.2",
+ "annotate-snippets 0.9.1",
 "anyhow",
 "argfile",
 "assert_cmd",
 "bincode",
- "bitflags 2.4.1",
+ "bitflags 2.4.0",
 "cachedir",
 "chrono",
 "clap",
@@ -2083,6 +2072,7 @@ dependencies = [
 "insta-cmd",
 "is-macro",
 "itertools 0.11.0",
+ "itoa",
 "log",
 "mimalloc",
 "notify",
@@ -2154,7 +2144,7 @@ dependencies = [
 "strum",
 "strum_macros",
 "tempfile",
- "toml 0.7.8",
+ "toml",
 "tracing",
 "tracing-indicatif",
 "tracing-subscriber",
@@ -2198,12 +2188,12 @@ dependencies = [

 [[package]]
 name = "ruff_linter"
-version = "0.1.5"
+version = "0.1.3"
 dependencies = [
 "aho-corasick",
- "annotate-snippets 0.9.2",
+ "annotate-snippets 0.9.1",
 "anyhow",
- "bitflags 2.4.1",
+ "bitflags 2.4.0",
 "chrono",
 "clap",
 "colored",
@@ -2254,7 +2244,7 @@ dependencies = [
 "tempfile",
 "test-case",
 "thiserror",
- "toml 0.7.8",
+ "toml",
 "typed-arena",
 "unicode-width",
 "unicode_names2",
@@ -2269,7 +2259,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "ruff_python_trivia",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -2295,7 +2285,7 @@ dependencies = [
 name = "ruff_python_ast"
 version = "0.0.0"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.0",
 "insta",
 "is-macro",
 "itertools 0.11.0",
@@ -2327,7 +2317,7 @@ name = "ruff_python_formatter"
 version = "0.0.0"
 dependencies = [
 "anyhow",
- "bitflags 2.4.1",
+ "bitflags 2.4.0",
 "clap",
 "countme",
 "insta",
@@ -2371,7 +2361,7 @@ dependencies = [
 name = "ruff_python_literal"
 version = "0.0.0"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.0",
 "hexf-parse",
 "is-macro",
 "itertools 0.11.0",
@@ -2385,7 +2375,7 @@ name = "ruff_python_parser"
 version = "0.0.0"
 dependencies = [
 "anyhow",
- "bitflags 2.4.1",
+ "bitflags 2.4.0",
 "insta",
 "is-macro",
 "itertools 0.11.0",
@@ -2415,7 +2405,7 @@ dependencies = [
 name = "ruff_python_semantic"
 version = "0.0.0"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.0",
 "is-macro",
 "ruff_index",
 "ruff_python_ast",
@@ -2449,7 +2439,7 @@ dependencies = [

 [[package]]
 name = "ruff_shrinking"
-version = "0.1.5"
+version = "0.1.3"
 dependencies = [
 "anyhow",
 "clap",
@@ -2540,7 +2530,7 @@ dependencies = [
 "shellexpand",
 "strum",
 "tempfile",
- "toml 0.7.8",
+ "toml",
 ]

 [[package]]
@@ -2561,11 +2551,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"

 [[package]]
 name = "rustix"
-version = "0.38.21"
+version = "0.38.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
+checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.0",
 "errno",
 "libc",
 "linux-raw-sys",
@@ -2675,18 +2665,18 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"

 [[package]]
 name = "serde"
-version = "1.0.190"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde-wasm-bindgen"
-version = "0.6.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d"
+checksum = "30c9933e5689bd420dc6c87b7a1835701810cbc10cd86a26e4da45b73e6b1d78"
 dependencies = [
 "js-sys",
 "serde",
@@ -2695,13 +2685,13 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.190"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -2717,9 +2707,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
 "itoa",
 "ryu",
@@ -2763,7 +2753,7 @@ dependencies = [
 "darling",
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -2804,9 +2794,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"

 [[package]]
 name = "smallvec"
-version = "1.11.2"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"

 [[package]]
 name = "spin"
@@ -2833,15 +2823,6 @@ dependencies = [
 "precomputed-hash",
 ]

-[[package]]
-name = "strip-ansi-escapes"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa"
-dependencies = [
- "vte",
-]
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -2867,7 +2848,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustversion",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]

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

 [[package]]
 name = "syn"
-version = "2.0.39"
+version = "2.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2903,13 +2884,13 @@ dependencies = [

 [[package]]
 name = "tempfile"
-version = "3.8.1"
+version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
 dependencies = [
 "cfg-if",
 "fastrand",
- "redox_syscall 0.4.1",
+ "redox_syscall 0.3.5",
 "rustix",
 "windows-sys 0.48.0",
 ]
@@ -2972,7 +2953,7 @@ dependencies = [
 "proc-macro-error",
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -2984,7 +2965,7 @@ dependencies = [
 "proc-macro-error",
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 "test-case-core",
 ]

@@ -3005,7 +2986,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -3097,19 +3078,7 @@ dependencies = [
 "serde",
 "serde_spanned",
 "toml_datetime",
- "toml_edit 0.19.15",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.20.2",
+ "toml_edit",
 ]

 [[package]]
@@ -3134,19 +3103,6 @@ dependencies = [
 "winnow",
 ]

-[[package]]
-name = "toml_edit"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
 [[package]]
 name = "tracing"
 version = "0.1.40"
@@ -3167,7 +3123,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]

 [[package]]
@@ -3367,9 +3323,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"

 [[package]]
 name = "uuid"
-version = "1.5.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
 dependencies = [
 "getrandom",
 "rand",
@@ -3379,13 +3335,13 @@ dependencies = [

 [[package]]
 name = "uuid-macro-internal"
-version = "1.5.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d8c6bba9b149ee82950daefc9623b32bb1dacbfb1890e352f6b887bd582adaf"
+checksum = "f7e1ba1f333bd65ce3c9f27de592fcbc256dafe3af2717f56d7c87761fbaccf4"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]

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

@@ -3513,7 +3469,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,9 +13,9 @@ license = "MIT"

 [workspace.dependencies]
 anyhow = { version = "1.0.69" }
-bitflags = { version = "2.4.1" }
+bitflags = { version = "2.3.1" }
 chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
-clap = { version = "4.4.7", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 colored = { version = "2.0.0" }
 filetime = { version = "0.2.20" }
 glob = { version = "0.3.1" }
@@ -34,15 +34,15 @@ quote = { version = "1.0.23" }
 regex = { version = "1.10.2" }
 rustc-hash = { version = "1.1.0" }
 schemars = { version = "0.8.15" }
-serde = { version = "1.0.190", features = ["derive"] }
-serde_json = { version = "1.0.108" }
+serde = { version = "1.0.152", features = ["derive"] }
+serde_json = { version = "1.0.107" }
 shellexpand = { version = "3.0.0" }
 similar = { version = "2.3.0", features = ["inline"] }
-smallvec = { version = "1.11.2" }
+smallvec = { version = "1.11.1" }
 static_assertions = "1.1.0"
 strum = { version = "0.25.0", features = ["strum_macros"] }
 strum_macros = { version = "0.25.3" }
-syn = { version = "2.0.39" }
+syn = { version = "2.0.38" }
 test-case = { version = "3.2.1" }
 thiserror = { version = "1.0.50" }
 toml = { version = "0.7.8" }
@@ -52,7 +52,7 @@ tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 unicode-ident = { version = "1.0.12" }
 unicode_names2 = { version = "1.2.0" }
 unicode-width = { version = "0.1.11" }
-uuid = { version = "1.5.0", features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
+uuid = { version = "1.4.1", features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
 wsl = { version = "0.1.0" }

 [profile.release]
--- a/25
+++ b/25
@@ -1269,31 +1269,6 @@ are:
    SOFTWARE.
  """

- flake8-trio, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2022 Zac Hatfield-Dodds
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
-  """
-
 - Pyright, licensed as follows:
  """
    MIT License
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ An extremely fast Python linter and code formatter, written in Rust.
 - 🔧 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
- ⌨️ First-party [editor integrations](https://docs.astral.sh/ruff/integrations/) for
+- ⌨️ 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)

@@ -54,7 +54,7 @@ Ruff is extremely actively developed and used in major open-source projects like
 - [Pandas](https://github.com/pandas-dev/pandas)
 - [SciPy](https://github.com/scipy/scipy)

-...and [many more](#whos-using-ruff).
+...and many more.

 Ruff is backed by [Astral](https://astral.sh). Read the [launch post](https://astral.sh/blog/announcing-astral-the-company-behind-ruff),
 or the original [project announcement](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).
@@ -148,14 +148,14 @@ ruff format @arguments.txt           # Format using an input file, treating its
 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):

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

@@ -314,7 +314,6 @@ quality tools, including:
 - [flake8-super](https://pypi.org/project/flake8-super/)
 - [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports/)
 - [flake8-todos](https://pypi.org/project/flake8-todos/)
- [flake8-trio](https://pypi.org/project/flake8-trio/)
 - [flake8-type-checking](https://pypi.org/project/flake8-type-checking/)
 - [flake8-use-pathlib](https://pypi.org/project/flake8-use-pathlib/)
 - [flynt](https://pypi.org/project/flynt/) ([#2102](https://github.com/astral-sh/ruff/issues/2102))
@@ -377,8 +376,8 @@ Ruff is used by a number of major open-source projects and companies, including:
 - Anthropic ([Python SDK](https://github.com/anthropics/anthropic-sdk-python))
 - [Apache Airflow](https://github.com/apache/airflow)
 - AstraZeneca ([Magnus](https://github.com/AstraZeneca/magnus-core))
- [Babel](https://github.com/python-babel/babel)
 - Benchling ([Refac](https://github.com/benchling/refac))
+- [Babel](https://github.com/python-babel/babel)
 - [Bokeh](https://github.com/bokeh/bokeh)
 - [Cryptography (PyCA)](https://github.com/pyca/cryptography)
 - [DVC](https://github.com/iterative/dvc)
@@ -389,16 +388,15 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [Gradio](https://github.com/gradio-app/gradio)
 - [Great Expectations](https://github.com/great-expectations/great_expectations)
 - [HTTPX](https://github.com/encode/httpx)
- [Hatch](https://github.com/pypa/hatch)
- [Home Assistant](https://github.com/home-assistant/core)
 - Hugging Face ([Transformers](https://github.com/huggingface/transformers),
    [Datasets](https://github.com/huggingface/datasets),
    [Diffusers](https://github.com/huggingface/diffusers))
+- [Hatch](https://github.com/pypa/hatch)
+- [Home Assistant](https://github.com/home-assistant/core)
 - ING Bank ([popmon](https://github.com/ing-bank/popmon), [probatus](https://github.com/ing-bank/probatus))
 - [Ibis](https://github.com/ibis-project/ibis)
 - [Jupyter](https://github.com/jupyter-server/jupyter_server)
 - [LangChain](https://github.com/hwchase17/langchain)
- [Litestar](https://litestar.dev/)
 - [LlamaIndex](https://github.com/jerryjliu/llama_index)
 - Matrix ([Synapse](https://github.com/matrix-org/synapse))
 - [MegaLinter](https://github.com/oxsecurity/megalinter)
@@ -417,26 +415,24 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [PDM](https://github.com/pdm-project/pdm)
 - [PaddlePaddle](https://github.com/PaddlePaddle/Paddle)
 - [Pandas](https://github.com/pandas-dev/pandas)
- [Pillow](https://github.com/python-pillow/Pillow)
 - [Poetry](https://github.com/python-poetry/poetry)
 - [Polars](https://github.com/pola-rs/polars)
 - [PostHog](https://github.com/PostHog/posthog)
 - Prefect ([Python SDK](https://github.com/PrefectHQ/prefect), [Marvin](https://github.com/PrefectHQ/marvin))
 - [PyInstaller](https://github.com/pyinstaller/pyinstaller)
- [PyMC-Marketing](https://github.com/pymc-labs/pymc-marketing)
 - [PyTorch](https://github.com/pytorch/pytorch)
 - [Pydantic](https://github.com/pydantic/pydantic)
 - [Pylint](https://github.com/PyCQA/pylint)
 - [Reflex](https://github.com/reflex-dev/reflex)
 - [Rippling](https://rippling.com)
 - [Robyn](https://github.com/sansyrox/robyn)
- [Saleor](https://github.com/saleor/saleor)
 - Scale AI ([Launch SDK](https://github.com/scaleapi/launch-python-client))
- [SciPy](https://github.com/scipy/scipy)
 - Snowflake ([SnowCLI](https://github.com/Snowflake-Labs/snowcli))
+- [Saleor](https://github.com/saleor/saleor)
+- [SciPy](https://github.com/scipy/scipy)
 - [Sphinx](https://github.com/sphinx-doc/sphinx)
 - [Stable Baselines3](https://github.com/DLR-RM/stable-baselines3)
- [Starlette](https://github.com/encode/starlette)
+- [Litestar](https://litestar.dev/)
 - [The Algorithms](https://github.com/TheAlgorithms/Python)
 - [Vega-Altair](https://github.com/altair-viz/altair)
 - WordPress ([Openverse](https://github.com/WordPress/openverse))
--- a/_typos.toml
+++ b/_typos.toml
@@ -1,6 +1,5 @@
 [files]
-# https://github.com/crate-ci/typos/issues/868
-extend-exclude = ["**/resources/**/*", "**/snapshots/**/*"]
+extend-exclude = ["resources", "snapshots"]

 [default.extend-words]
 hel = "hel"
--- 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.5"
+version = "0.1.3"
 description = """
 Convert Flake8 configuration files to Ruff configuration files.
 """
--- 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.1", default-features = false, optional = true}
+codspeed-criterion-compat = { version="2.3.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.5"
+version = "0.1.3"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -28,7 +28,7 @@ ruff_python_trivia = { path = "../ruff_python_trivia" }
 ruff_workspace = { path = "../ruff_workspace" }
 ruff_text_size = { path = "../ruff_text_size" }

-annotate-snippets = { version = "0.9.2", features = ["color"] }
+annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { workspace = true }
 argfile = { version = "0.1.6" }
 bincode = { version = "1.3.3" }
@@ -44,6 +44,7 @@ glob = { workspace = true }
 ignore = { workspace = true }
 is-macro = { workspace = true }
 itertools = { workspace = true }
+itoa = { version = "1.0.6" }
 log = { workspace = true }
 notify = { version = "6.1.1" }
 path-absolutize = { workspace = true, features = ["once_cell_cache"] }
@@ -67,7 +68,7 @@ assert_cmd = { version = "2.0.8" }
 colored = { workspace = true, features = ["no-color"]}
 insta = { workspace = true, features = ["filters", "json"] }
 insta-cmd = { version = "0.4.0" }
-tempfile = "3.8.1"
+tempfile = "3.6.0"
 test-case = { workspace = true }
 ureq = { version = "2.8.0", features = [] }

--- a/crates/ruff_cli/resources/test/fixtures/trailing_semicolon.ipynb
+++ b/crates/ruff_cli/resources/test/fixtures/trailing_semicolon.ipynb
@@ -1,413 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "id": "4f8ce941-1492-4d4e-8ab5-70d733fe891a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "%config ZMQInteractiveShell.ast_node_interactivity=\"last_expr_or_assign\""
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 2,
-   "id": "721ec705-0c65-4bfb-9809-7ed8bc534186",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "1"
-      ]
-     },
-     "execution_count": 2,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# Assignment statement without a semicolon\n",
-    "x = 1"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 3,
-   "id": "de50e495-17e5-41cc-94bd-565757555d7e",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Assignment statement with a semicolon\n",
-    "x = 1;\n",
-    "x = 1;"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 4,
-   "id": "39e31201-23da-44eb-8684-41bba3663991",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "2"
-      ]
-     },
-     "execution_count": 4,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# Augmented assignment without a semicolon\n",
-    "x += 1"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 5,
-   "id": "6b73d3dd-c73a-4697-9e97-e109a6c1fbab",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Augmented assignment without a semicolon\n",
-    "x += 1;\n",
-    "x += 1;  # comment\n",
-    "# comment"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 6,
-   "id": "2a3e5b86-aa5b-46ba-b9c6-0386d876f58c",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Multiple assignment without a semicolon\n",
-    "x = y = 1"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 7,
-   "id": "07f89e51-9357-4cfb-8fc5-76fb75e35949",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Multiple assignment with a semicolon\n",
-    "x = y = 1;\n",
-    "x = y = 1;"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 8,
-   "id": "c22b539d-473e-48f8-a236-625e58c47a00",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Tuple unpacking without a semicolon\n",
-    "x, y = 1, 2"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 9,
-   "id": "12c87940-a0d5-403b-a81c-7507eb06dc7e",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Tuple unpacking with a semicolon (irrelevant)\n",
-    "x, y = 1, 2;\n",
-    "x, y = 1, 2;  # comment\n",
-    "# comment"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 10,
-   "id": "5a768c76-6bc4-470c-b37e-8cc14bc6caf4",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "1"
-      ]
-     },
-     "execution_count": 10,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# Annotated assignment statement without a semicolon\n",
-    "x: int = 1"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 11,
-   "id": "21bfda82-1a9a-4ba1-9078-74ac480804b5",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Annotated assignment statement without a semicolon\n",
-    "x: int = 1;\n",
-    "x: int = 1;  # comment\n",
-    "# comment"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 12,
-   "id": "09929999-ff29-4d10-ad2b-e665af15812d",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "1"
-      ]
-     },
-     "execution_count": 12,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# Assignment expression without a semicolon\n",
-    "(x := 1)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 13,
-   "id": "32a83217-1bad-4f61-855e-ffcdb119c763",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Assignment expression with a semicolon\n",
-    "(x := 1);\n",
-    "(x := 1);  # comment\n",
-    "# comment"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 14,
-   "id": "61b81865-277e-4964-b03e-eb78f1f318eb",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "1"
-      ]
-     },
-     "execution_count": 14,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "x = 1\n",
-    "# Expression without a semicolon\n",
-    "x"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 15,
-   "id": "974c29be-67e1-4000-95fa-6ca118a63bad",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "x = 1\n",
-    "# Expression with a semicolon\n",
-    "x;"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 16,
-   "id": "cfeb1757-46d6-4f13-969f-a283b6d0304f",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "class Point:\n",
-    "    def __init__(self, x, y):\n",
-    "        self.x = x\n",
-    "        self.y = y\n",
-    "\n",
-    "\n",
-    "p = Point(0, 0);"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 17,
-   "id": "2ee7f1a5-ccfe-4004-bfa4-ef834a58da97",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Assignment statement where the left is an attribute access doesn't\n",
-    "# print the value.\n",
-    "p.x = 1;"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 18,
-   "id": "3e49370a-048b-474d-aa0a-3d1d4a73ad37",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "data = {}\n",
-    "\n",
-    "# Neither does the subscript node\n",
-    "data[\"foo\"] = 1;"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 19,
-   "id": "d594bdd3-eaa9-41ef-8cda-cf01bc273b2d",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "if (x := 1):\n",
-    "    # It should be the top level statement\n",
-    "    x"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 20,
-   "id": "e532f0cf-80c7-42b7-8226-6002fcf74fb6",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "1"
-      ]
-     },
-     "execution_count": 20,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# Parentheses with comments\n",
-    "(\n",
-    "    x := 1  # comment\n",
-    ")  # comment"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 21,
-   "id": "473c5d62-871b-46ed-8a34-27095243f462",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Parentheses with comments\n",
-    "(\n",
-    "    x := 1  # comment\n",
-    ");  # comment"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 22,
-   "id": "8c3c2361-f49f-45fe-bbe3-7e27410a8a86",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "'Hello world!'"
-      ]
-     },
-     "execution_count": 22,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "\"\"\"Hello world!\"\"\""
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 23,
-   "id": "23dbe9b5-3f68-4890-ab2d-ab0dbfd0712a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "\"\"\"Hello world!\"\"\";  # comment\n",
-    "# comment"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 24,
-   "id": "3ce33108-d95d-4c70-83d1-0d4fd36a2951",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "'x = 1'"
-      ]
-     },
-     "execution_count": 24,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "x = 1\n",
-    "f\"x = {x}\""
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 25,
-   "id": "654a4a67-de43-4684-824a-9451c67db48f",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "x = 1\n",
-    "f\"x = {x}\";\n",
-    "f\"x = {x}\";  # comment\n",
-    "# comment"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python (ruff-playground)",
-   "language": "python",
-   "name": "ruff-playground"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.11.3"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
--- a/crates/ruff_cli/src/args.rs
+++ b/crates/ruff_cli/src/args.rs
@@ -8,8 +8,8 @@ use ruff_linter::line_width::LineLength;
 use ruff_linter::logging::LogLevel;
 use ruff_linter::registry::Rule;
 use ruff_linter::settings::types::{
-    ExtensionPair, FilePattern, PatternPrefixPair, PerFileIgnore, PreviewMode, PythonVersion,
-    SerializationFormat, UnsafeFixes,
+    FilePattern, PatternPrefixPair, PerFileIgnore, PreviewMode, PythonVersion, SerializationFormat,
+    UnsafeFixes,
 };
 use ruff_linter::{RuleParser, RuleSelector, RuleSelectorParser};
 use ruff_workspace::configuration::{Configuration, RuleSelection};
@@ -50,11 +50,7 @@ pub enum Command {

        /// Output format
        #[arg(long, value_enum, default_value = "text")]
-        output_format: HelpFormat,
-
-        /// Output format (Deprecated: Use `--output-format` instead).
-        #[arg(long, value_enum, conflicts_with = "output_format", hide = true)]
-        format: Option<HelpFormat>,
+        format: HelpFormat,
    },
    /// List or describe the available configuration options.
    Config { option: Option<String> },
@@ -62,11 +58,7 @@ pub enum Command {
    Linter {
        /// Output format
        #[arg(long, value_enum, default_value = "text")]
-        output_format: HelpFormat,
-
-        /// Output format (Deprecated: Use `--output-format` instead).
-        #[arg(long, value_enum, conflicts_with = "output_format", hide = true)]
-        format: Option<HelpFormat>,
+        format: HelpFormat,
    },
    /// Clear any caches in the current directory and any subdirectories.
    #[clap(alias = "--clean")]
@@ -278,7 +270,7 @@ pub struct CheckCommand {
    #[arg(long, help_heading = "Rule configuration", hide = true)]
    pub dummy_variable_rgx: Option<Regex>,
    /// Disable cache reads.
-    #[arg(short, long, env = "RUFF_NO_CACHE", help_heading = "Miscellaneous")]
+    #[arg(short, long, help_heading = "Miscellaneous")]
    pub no_cache: bool,
    /// Ignore all configuration files.
    #[arg(long, conflicts_with = "config", help_heading = "Miscellaneous")]
@@ -351,9 +343,6 @@ pub struct CheckCommand {
        conflicts_with = "watch",
    )]
    pub show_settings: bool,
-    /// List of mappings from file extension to language (one of ["python", "ipynb", "pyi"]).
-    #[arg(long, value_delimiter = ',', hide = true)]
-    pub extension: Option<Vec<ExtensionPair>>,
    /// Dev-only argument to show fixes
    #[arg(long, hide = true)]
    pub ecosystem_ci: bool,
@@ -377,7 +366,7 @@ pub struct FormatCommand {
    pub config: Option<PathBuf>,

    /// Disable cache reads.
-    #[arg(short, long, env = "RUFF_NO_CACHE", help_heading = "Miscellaneous")]
+    #[arg(short, long, help_heading = "Miscellaneous")]
    pub no_cache: bool,
    /// Path to the cache directory.
    #[arg(long, env = "RUFF_CACHE_DIR", help_heading = "Miscellaneous")]
@@ -412,9 +401,6 @@ 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 = "Format configuration")]
-    pub line_length: Option<LineLength>,
    /// Ignore all configuration files.
    #[arg(long, conflicts_with = "config", help_heading = "Miscellaneous")]
    pub isolated: bool,
@@ -513,7 +499,6 @@ impl CheckCommand {
                extend_exclude: self.extend_exclude,
                extend_fixable: self.extend_fixable,
                extend_ignore: self.extend_ignore,
-                extend_per_file_ignores: self.extend_per_file_ignores,
                extend_select: self.extend_select,
                extend_unfixable: self.extend_unfixable,
                fixable: self.fixable,
@@ -538,7 +523,6 @@ impl CheckCommand {
                force_exclude: resolve_bool_arg(self.force_exclude, self.no_force_exclude),
                output_format: self.output_format,
                show_fixes: resolve_bool_arg(self.show_fixes, self.no_show_fixes),
-                extension: self.extension,
            },
        )
    }
@@ -559,7 +543,6 @@ impl FormatCommand {
                stdin_filename: self.stdin_filename,
            },
            CliOverrides {
-                line_length: self.line_length,
                respect_gitignore: resolve_bool_arg(
                    self.respect_gitignore,
                    self.no_respect_gitignore,
@@ -636,7 +619,6 @@ pub struct CliOverrides {
    pub ignore: Option<Vec<RuleSelector>>,
    pub line_length: Option<LineLength>,
    pub per_file_ignores: Option<Vec<PatternPrefixPair>>,
-    pub extend_per_file_ignores: Option<Vec<PatternPrefixPair>>,
    pub preview: Option<PreviewMode>,
    pub respect_gitignore: Option<bool>,
    pub select: Option<Vec<RuleSelector>>,
@@ -651,7 +633,6 @@ pub struct CliOverrides {
    pub force_exclude: Option<bool>,
    pub output_format: Option<SerializationFormat>,
    pub show_fixes: Option<bool>,
-    pub extension: Option<Vec<ExtensionPair>>,
 }

 impl ConfigurationTransformer for CliOverrides {
@@ -668,12 +649,6 @@ impl ConfigurationTransformer for CliOverrides {
        if let Some(extend_exclude) = &self.extend_exclude {
            config.extend_exclude.extend(extend_exclude.clone());
        }
-        if let Some(extend_per_file_ignores) = &self.extend_per_file_ignores {
-            config
-                .lint
-                .extend_per_file_ignores
-                .extend(collect_per_file_ignores(extend_per_file_ignores.clone()));
-        }
        if let Some(fix) = &self.fix {
            config.fix = Some(*fix);
        }
@@ -736,9 +711,6 @@ impl ConfigurationTransformer for CliOverrides {
        if let Some(target_version) = &self.target_version {
            config.target_version = Some(*target_version);
        }
-        if let Some(extension) = &self.extension {
-            config.lint.extension = Some(extension.clone().into_iter().collect());
-        }

        config
    }
--- a/crates/ruff_cli/src/cache.rs
+++ b/crates/ruff_cli/src/cache.rs
@@ -1,3 +1,4 @@
+use std::collections::HashMap;
 use std::fmt::Debug;
 use std::fs::{self, File};
 use std::hash::Hasher;
@@ -19,7 +20,7 @@ use serde::{Deserialize, Serialize};
 use ruff_cache::{CacheKey, CacheKeyHasher};
 use ruff_diagnostics::{DiagnosticKind, Fix};
 use ruff_linter::message::Message;
-use ruff_linter::{warn_user, VERSION};
+use ruff_linter::warn_user;
 use ruff_macros::CacheKey;
 use ruff_notebook::NotebookIndex;
 use ruff_python_ast::imports::ImportMap;
@@ -101,8 +102,9 @@ impl Cache {
    pub(crate) fn open(package_root: PathBuf, settings: &Settings) -> Self {
        debug_assert!(package_root.is_absolute(), "package root not canonicalized");

-        let key = format!("{}", cache_key(&package_root, settings));
-        let path = PathBuf::from_iter([&settings.cache_dir, Path::new(VERSION), Path::new(&key)]);
+        let mut buf = itoa::Buffer::new();
+        let key = Path::new(buf.format(cache_key(&package_root, settings)));
+        let path = PathBuf::from_iter([&settings.cache_dir, Path::new("content"), key]);

        let file = match File::open(&path) {
            Ok(file) => file,
@@ -140,7 +142,7 @@ impl Cache {
    fn empty(path: PathBuf, package_root: PathBuf) -> Self {
        let package = PackageCache {
            package_root,
-            files: FxHashMap::default(),
+            files: HashMap::new(),
        };
        Cache::new(path, package)
    }
@@ -292,7 +294,7 @@ struct PackageCache {
    /// single file "packages", e.g. scripts.
    package_root: PathBuf,
    /// Mapping of source file path to it's cached data.
-    files: FxHashMap<RelativePathBuf, FileCache>,
+    files: HashMap<RelativePathBuf, FileCache>,
 }

 /// On disk representation of the cache per source file.
@@ -348,16 +350,16 @@ struct FileCacheData {
 /// version.
 fn cache_key(package_root: &Path, settings: &Settings) -> u64 {
    let mut hasher = CacheKeyHasher::new();
+    env!("CARGO_PKG_VERSION").cache_key(&mut hasher);
    package_root.cache_key(&mut hasher);
    settings.cache_key(&mut hasher);
-
    hasher.finish()
 }

 /// Initialize the cache at the specified `Path`.
 pub(crate) fn init(path: &Path) -> Result<()> {
    // Create the cache directories.
-    fs::create_dir_all(path.join(VERSION))?;
+    fs::create_dir_all(path.join("content"))?;

    // Add the CACHEDIR.TAG.
    if !cachedir::is_tagged(path)? {
--- a/crates/ruff_cli/src/commands/check.rs
+++ b/crates/ruff_cli/src/commands/check.rs
@@ -30,7 +30,6 @@ use crate::diagnostics::Diagnostics;
 use crate::panic::catch_unwind;

 /// Run the linter over a collection of files.
-#[allow(clippy::too_many_arguments)]
 pub(crate) fn check(
    files: &[PathBuf],
    pyproject_config: &PyprojectConfig,
@@ -83,7 +82,7 @@ pub(crate) fn check(

                let settings = resolver.resolve(path, pyproject_config);

-                if (settings.file_resolver.force_exclude || !resolved_file.is_root())
+                if !resolved_file.is_root()
                    && match_exclusion(
                        resolved_file.path(),
                        resolved_file.file_name(),
@@ -185,7 +184,6 @@ pub(crate) fn check(

 /// Wraps [`lint_path`](crate::diagnostics::lint_path) in a [`catch_unwind`](std::panic::catch_unwind) and emits
 /// a diagnostic if the linting the file panics.
-#[allow(clippy::too_many_arguments)]
 fn lint_path(
    path: &Path,
    package: Option<&Path>,
--- a/crates/ruff_cli/src/commands/check_stdin.rs
+++ b/crates/ruff_cli/src/commands/check_stdin.rs
@@ -8,7 +8,7 @@ use ruff_workspace::resolver::{match_exclusion, python_file_at_path, PyprojectCo

 use crate::args::CliOverrides;
 use crate::diagnostics::{lint_stdin, Diagnostics};
-use crate::stdin::{parrot_stdin, read_from_stdin};
+use crate::stdin::read_from_stdin;

 /// Run the linter over a single file, read from `stdin`.
 pub(crate) fn check_stdin(
@@ -18,31 +18,23 @@ pub(crate) fn check_stdin(
    noqa: flags::Noqa,
    fix_mode: flags::FixMode,
 ) -> Result<Diagnostics> {
-    if pyproject_config.settings.file_resolver.force_exclude {
-        if let Some(filename) = filename {
-            if !python_file_at_path(filename, pyproject_config, overrides)? {
-                if fix_mode.is_apply() {
-                    parrot_stdin()?;
-                }
-                return Ok(Diagnostics::default());
-            }
+    if let Some(filename) = filename {
+        if !python_file_at_path(filename, pyproject_config, overrides)? {
+            return Ok(Diagnostics::default());
+        }

-            let lint_settings = &pyproject_config.settings.linter;
-            if filename
-                .file_name()
-                .is_some_and(|name| match_exclusion(filename, name, &lint_settings.exclude))
-            {
-                if fix_mode.is_apply() {
-                    parrot_stdin()?;
-                }
-                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 stdin = read_from_stdin()?;
    let package_root = filename.and_then(Path::parent).and_then(|path| {
        packaging::detect_package_root(path, &pyproject_config.settings.linter.namespace_packages)
    });
+    let stdin = read_from_stdin()?;
    let mut diagnostics = lint_stdin(
        filename,
        package_root,
--- a/crates/ruff_cli/src/commands/format.rs
+++ b/crates/ruff_cli/src/commands/format.rs
@@ -11,7 +11,6 @@ use itertools::Itertools;
 use log::{error, warn};
 use rayon::iter::Either::{Left, Right};
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
-use rustc_hash::FxHashSet;
 use thiserror::Error;
 use tracing::debug;

@@ -117,14 +116,14 @@ pub(crate) fn format(
                        return None;
                    };

-                    let settings = resolver.resolve(path, &pyproject_config);
+                    let resolved_settings = resolver.resolve(path, &pyproject_config);

                    // Ignore files that are excluded from formatting
-                    if (settings.file_resolver.force_exclude || !resolved_file.is_root())
+                    if !resolved_file.is_root()
                        && match_exclusion(
                            path,
                            resolved_file.file_name(),
-                            &settings.formatter.exclude,
+                            &resolved_settings.formatter.exclude,
                        )
                    {
                        return None;
@@ -139,7 +138,13 @@ pub(crate) fn format(

                    Some(
                        match catch_unwind(|| {
-                            format_path(path, &settings.formatter, source_type, mode, cache)
+                            format_path(
+                                path,
+                                &resolved_settings.formatter,
+                                source_type,
+                                mode,
+                                cache,
+                            )
                        }) {
                            Ok(inner) => inner.map(|result| FormatPathResult {
                                path: resolved_file.path().to_path_buf(),
@@ -690,11 +695,11 @@ pub(super) fn warn_incompatible_formatter_settings(
    pyproject_config: &PyprojectConfig,
    resolver: Option<&Resolver>,
 ) {
-    // First, collect all rules that are incompatible regardless of the linter-specific settings.
-    let mut incompatible_rules = FxHashSet::default();
    for setting in std::iter::once(&pyproject_config.settings)
        .chain(resolver.iter().flat_map(|resolver| resolver.settings()))
    {
+        let mut incompatible_rules = Vec::new();
+
        for rule in [
            // The formatter might collapse implicit string concatenation on a single line.
            Rule::SingleLineImplicitStringConcatenation,
@@ -708,48 +713,41 @@ pub(super) fn warn_incompatible_formatter_settings(
            Rule::MissingTrailingComma,
        ] {
            if setting.linter.rules.enabled(rule) {
-                incompatible_rules.insert(rule);
+                incompatible_rules.push(rule);
            }
        }
-    }

-    if !incompatible_rules.is_empty() {
-        let mut rule_names: Vec<_> = incompatible_rules
-            .into_iter()
-            .map(|rule| format!("`{}`", rule.noqa_code()))
-            .collect();
-        rule_names.sort();
-        warn_user_once!("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 them to the `ignore` configuration.", rule_names.join(", "));
-    }
-
-    // Next, validate settings-specific incompatibilities.
-    for setting in std::iter::once(&pyproject_config.settings)
-        .chain(resolver.iter().flat_map(|resolver| resolver.settings()))
-    {
-        // Validate all rules that rely on tab styles.
-        if setting.linter.rules.enabled(Rule::TabIndentation)
-            && setting.formatter.indent_style.is_tab()
-        {
-            warn_user_once!("The `format.indent-style=\"tab\"` option is incompatible with `W191`, which lints against all uses of tabs. We recommend disabling these rules when using the formatter, which enforces a consistent indentation style. Alternatively, set the `format.indent-style` option to `\"space\"`.");
+        // Rules asserting for space indentation
+        if setting.formatter.indent_style.is_tab() {
+            for rule in [Rule::TabIndentation, Rule::IndentWithSpaces] {
+                if setting.linter.rules.enabled(rule) {
+                    incompatible_rules.push(rule);
+                }
+            }
        }

-        // Validate all rules that rely on tab styles.
-        if setting.linter.rules.enabled(Rule::IndentWithSpaces)
-            && setting.formatter.indent_style.is_tab()
-        {
-            warn_user_once!("The `format.indent-style=\"tab\"` option is incompatible with `D206`, with requires space-based indentation. We recommend disabling these rules when using the formatter, which enforces a consistent indentation style. Alternatively, set the `format.indent-style` option to `\"space\"`.");
+        // Rules asserting for indent-width=4
+        if setting.formatter.indent_width.value() != 4 {
+            for rule in [
+                Rule::IndentationWithInvalidMultiple,
+                Rule::IndentationWithInvalidMultipleComment,
+            ] {
+                if setting.linter.rules.enabled(rule) {
+                    incompatible_rules.push(rule);
+                }
+            }
        }

-        // Validate all rules that rely on custom indent widths.
-        if setting.linter.rules.any_enabled(&[
-            Rule::IndentationWithInvalidMultiple,
-            Rule::IndentationWithInvalidMultipleComment,
-        ]) && setting.formatter.indent_width.value() != 4
-        {
-            warn_user_once!("The `format.indent-width` option with a value other than 4 is incompatible with `E111` and `E114`. We recommend disabling these rules when using the formatter, which enforces a consistent indentation width. Alternatively, set the `format.indent-width` option to `4`.");
+        if !incompatible_rules.is_empty() {
+            let mut rule_names: Vec<_> = incompatible_rules
+                .into_iter()
+                .map(|rule| format!("`{}`", rule.noqa_code()))
+                .collect();
+            rule_names.sort();
+            warn!("The following rules may cause conflicts when used with the formatter: {}. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding then to the `ignore` configuration.", rule_names.join(", "));
        }

-        // Validate all rules that rely on quote styles.
+        // Rules with different quote styles.
        if setting
            .linter
            .rules
@@ -760,10 +758,10 @@ pub(super) fn warn_incompatible_formatter_settings(
                setting.formatter.quote_style,
            ) {
                (Quote::Double, QuoteStyle::Single) => {
-                    warn_user_once!("The `flake8-quotes.inline-quotes=\"double\"` option is incompatible with the formatter's `format.quote-style=\"single\"`. We recommend disabling `Q000` and `Q003` when using the formatter, which enforces a consistent quote style. Alternatively, set both options to either `\"single\"` or `\"double\"`.");
+                    warn!("The `flake8-quotes.inline-quotes=\"double\"` option is incompatible with the formatter's `format.quote-style=\"single\"`. We recommend disabling `Q000` and `Q003` when using the formatter, which enforces a consistent quote style. Alternatively, set both options to either `\"single\"` or `\"double\"`.");
                }
                (Quote::Single, QuoteStyle::Double) => {
-                    warn_user_once!("The `flake8-quotes.inline-quotes=\"single\"` option is incompatible with the formatter's `format.quote-style=\"double\"`. We recommend disabling `Q000` and `Q003` when using the formatter, which enforces a consistent quote style. Alternatively, set both options to either `\"single\"` or `\"double\"`.");
+                    warn!("The `flake8-quotes.inline-quotes=\"single\"` option is incompatible with the formatter's `format.quote-style=\"double\"`. We recommend disabling `Q000` and `Q003` when using the formatter, which enforces a consistent quote style. Alternatively, set both options to either `\"single\"` or `\"double\"`.");
                }
                _ => {}
            }
@@ -772,26 +770,25 @@ pub(super) fn warn_incompatible_formatter_settings(
        if setting.linter.rules.enabled(Rule::BadQuotesMultilineString)
            && setting.linter.flake8_quotes.multiline_quotes == Quote::Single
        {
-            warn_user_once!("The `flake8-quotes.multiline-quotes=\"single\"` option is incompatible with the formatter. We recommend disabling `Q001` when using the formatter, which enforces double quotes for multiline strings. Alternatively, set the `flake8-quotes.multiline-quotes` option to `\"double\"`.`");
+            warn!("The `flake8-quotes.multiline-quotes=\"single\"` option is incompatible with the formatter. We recommend disabling `Q001` when using the formatter, which enforces double quotes for multiline strings. Alternatively, set the `flake8-quotes.multiline-quotes` option to `\"double\"`.`");
        }

        if setting.linter.rules.enabled(Rule::BadQuotesDocstring)
            && setting.linter.flake8_quotes.docstring_quotes == Quote::Single
        {
-            warn_user_once!("The `flake8-quotes.multiline-quotes=\"single\"` option is incompatible with the formatter. We recommend disabling `Q002` when using the formatter, which enforces double quotes for docstrings. Alternatively, set the `flake8-quotes.docstring-quotes` option to `\"double\"`.`");
+            warn!("The `flake8-quotes.multiline-quotes=\"single\"` option is incompatible with the formatter. We recommend disabling `Q002` when using the formatter, which enforces double quotes for docstrings. Alternatively, set the `flake8-quotes.docstring-quotes` option to `\"double\"`.`");
        }

-        // Validate all isort settings.
        if setting.linter.rules.enabled(Rule::UnsortedImports) {
            // The formatter removes empty lines if the value is larger than 2 but always inserts a empty line after imports.
            // Two empty lines are okay because `isort` only uses this setting for top-level imports (not in nested blocks).
            if !matches!(setting.linter.isort.lines_after_imports, 1 | 2 | -1) {
-                warn_user_once!("The isort option `isort.lines-after-imports` with a value other than `-1`, `1` or `2` is incompatible with the formatter. To avoid unexpected behavior, we recommend setting the option to one of: `2`, `1`, or `-1` (default).");
+                warn!("The isort option `isort.lines-after-imports` with a value other than `-1`, `1` or `2` is incompatible with the formatter. To avoid unexpected behavior, we recommend setting the option to one of: `2`, `1`, or `-1` (default).");
            }

            // Values larger than two get reduced to one line by the formatter if the import is in a nested block.
            if setting.linter.isort.lines_between_types > 1 {
-                warn_user_once!("The isort option `isort.lines-between-types` with a value greater than 1 is incompatible with the formatter. To avoid unexpected behavior, we recommend setting the option to one of: `1` or `0` (default).");
+                warn!("The isort option `isort.lines-between-types` with a value greater than 1 is incompatible with the formatter. To avoid unexpected behavior, we recommend setting the option to one of: `1` or `0` (default).");
            }

            // isort inserts a trailing comma which the formatter preserves, but only if `skip-magic-trailing-comma` isn't false.
@@ -800,11 +797,11 @@ pub(super) fn warn_incompatible_formatter_settings(
                && !setting.linter.isort.force_single_line
            {
                if setting.linter.isort.force_wrap_aliases {
-                    warn_user_once!("The isort option `isort.force-wrap-aliases` is incompatible with the formatter `format.skip-magic-trailing-comma=true` option. To avoid unexpected behavior, we recommend either setting `isort.force-wrap-aliases=false` or `format.skip-magic-trailing-comma=false`.");
+                    warn!("The isort option `isort.force-wrap-aliases` is incompatible with the formatter `format.skip-magic-trailing-comma=true` option. To avoid unexpected behavior, we recommend either setting `isort.force-wrap-aliases=false` or `format.skip-magic-trailing-comma=false`.");
                }

                if setting.linter.isort.split_on_trailing_comma {
-                    warn_user_once!("The isort option `isort.split-on-trailing-comma` is incompatible with the formatter `format.skip-magic-trailing-comma=true` option. To avoid unexpected behavior, we recommend either setting `isort.split-on-trailing-comma=false` or `format.skip-magic-trailing-comma=false`.");
+                    warn!("The isort option `isort.split-on-trailing-comma` is incompatible with the formatter `format.skip-magic-trailing-comma=true` option. To avoid unexpected behavior, we recommend either setting `isort.split-on-trailing-comma=false` or `format.skip-magic-trailing-comma=false`.");
                }
            }
        }
--- a/crates/ruff_cli/src/commands/format_stdin.rs
+++ b/crates/ruff_cli/src/commands/format_stdin.rs
@@ -15,7 +15,7 @@ use crate::commands::format::{
    FormatResult, FormattedSource,
 };
 use crate::resolve::resolve;
-use crate::stdin::{parrot_stdin, read_from_stdin};
+use crate::stdin::read_from_stdin;
 use crate::ExitStatus;

 /// Run the formatter over a single file, read from `stdin`.
@@ -31,34 +31,23 @@ pub(crate) fn format_stdin(cli: &FormatArguments, overrides: &CliOverrides) -> R

    let mode = FormatMode::from_cli(cli);

-    if pyproject_config.settings.file_resolver.force_exclude {
-        if let Some(filename) = cli.stdin_filename.as_deref() {
-            if !python_file_at_path(filename, &pyproject_config, overrides)? {
-                if mode.is_write() {
-                    parrot_stdin()?;
-                }
-                return Ok(ExitStatus::Success);
-            }
+    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))
-            {
-                if mode.is_write() {
-                    parrot_stdin()?;
-                }
-                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();

    let SourceType::Python(source_type) = path.map(SourceType::from).unwrap_or_default() else {
-        if mode.is_write() {
-            parrot_stdin()?;
-        }
        return Ok(ExitStatus::Success);
    };

--- a/crates/ruff_cli/src/diagnostics.rs
+++ b/crates/ruff_cli/src/diagnostics.rs
@@ -17,13 +17,13 @@ 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::{ExtensionMapping, UnsafeFixes};
+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_notebook::{Notebook, NotebookError, NotebookIndex};
 use ruff_python_ast::imports::ImportMap;
-use ruff_python_ast::{PySourceType, SourceType, TomlSourceType};
+use ruff_python_ast::{SourceType, TomlSourceType};
 use ruff_source_file::{LineIndex, SourceCode, SourceFileBuilder};
 use ruff_text_size::{TextRange, TextSize};
 use ruff_workspace::Settings;
@@ -177,11 +177,6 @@ impl AddAssign for FixMap {
    }
 }

-fn override_source_type(path: Option<&Path>, extension: &ExtensionMapping) -> Option<PySourceType> {
-    let ext = path?.extension()?.to_str()?;
-    extension.get(ext).map(PySourceType::from)
-}
-
 /// Lint the source code at the given `Path`.
 pub(crate) fn lint_path(
    path: &Path,
@@ -193,8 +188,13 @@ pub(crate) fn lint_path(
    unsafe_fixes: UnsafeFixes,
 ) -> Result<Diagnostics> {
    // Check the cache.
+    // TODO(charlie): `fixer::Mode::Apply` and `fixer::Mode::Diff` both have
+    // side-effects that aren't captured in the cache. (In practice, it's fine
+    // to cache `fixer::Mode::Apply`, since a file either has no fixes, or we'll
+    // write the fixes to disk, thus invalidating the cache. But it's a bit hard
+    // to reason about. We need to come up with a better solution here.)
    let caching = match cache {
-        Some(cache) if noqa.into() => {
+        Some(cache) if noqa.into() && fix_mode.is_generate() => {
            let relative_path = cache
                .relative_path(path)
                .expect("wrong package cache for file");
@@ -204,17 +204,7 @@ pub(crate) fn lint_path(
                .get(relative_path, &cache_key)
                .and_then(|entry| entry.to_diagnostics(path));
            if let Some(diagnostics) = cached_diagnostics {
-                // `FixMode::Generate` and `FixMode::Diff` rely on side-effects (writing to disk,
-                // and writing the diff to stdout, respectively). If a file has diagnostics, we
-                // need to avoid reading from and writing to the cache in these modes.
-                if match fix_mode {
-                    flags::FixMode::Generate => true,
-                    flags::FixMode::Apply | flags::FixMode::Diff => {
-                        diagnostics.messages.is_empty() && diagnostics.fixed.is_empty()
-                    }
-                } {
-                    return Ok(diagnostics);
-                }
+                return Ok(diagnostics);
            }

            // Stash the file metadata for later so when we update the cache it reflects the prerun
@@ -226,35 +216,31 @@ pub(crate) fn lint_path(

    debug!("Checking: {}", path.display());

-    let source_type = match override_source_type(Some(path), &settings.extension) {
-        Some(source_type) => source_type,
-        None => match SourceType::from(path) {
-            SourceType::Toml(TomlSourceType::Pyproject) => {
-                let messages = if settings
-                    .rules
-                    .iter_enabled()
-                    .any(|rule_code| rule_code.lint_source().is_pyproject_toml())
-                {
-                    let contents = match std::fs::read_to_string(path).map_err(SourceError::from) {
-                        Ok(contents) => contents,
-                        Err(err) => {
-                            return Ok(Diagnostics::from_source_error(&err, Some(path), settings));
-                        }
-                    };
-                    let source_file =
-                        SourceFileBuilder::new(path.to_string_lossy(), contents).finish();
-                    lint_pyproject_toml(source_file, settings)
-                } else {
-                    vec![]
+    let source_type = match SourceType::from(path) {
+        SourceType::Toml(TomlSourceType::Pyproject) => {
+            let messages = if settings
+                .rules
+                .iter_enabled()
+                .any(|rule_code| rule_code.lint_source().is_pyproject_toml())
+            {
+                let contents = match std::fs::read_to_string(path).map_err(SourceError::from) {
+                    Ok(contents) => contents,
+                    Err(err) => {
+                        return Ok(Diagnostics::from_source_error(&err, Some(path), settings));
+                    }
                };
-                return Ok(Diagnostics {
-                    messages,
-                    ..Diagnostics::default()
-                });
-            }
-            SourceType::Toml(_) => return Ok(Diagnostics::default()),
-            SourceType::Python(source_type) => source_type,
-        },
+                let source_file = SourceFileBuilder::new(path.to_string_lossy(), contents).finish();
+                lint_pyproject_toml(source_file, settings)
+            } else {
+                vec![]
+            };
+            return Ok(Diagnostics {
+                messages,
+                ..Diagnostics::default()
+            });
+        }
+        SourceType::Toml(_) => return Ok(Diagnostics::default()),
+        SourceType::Python(source_type) => source_type,
    };

    // Extract the sources from the file.
@@ -318,25 +304,15 @@ pub(crate) fn lint_path(
    if let Some((cache, relative_path, key)) = caching {
        // We don't cache parsing errors.
        if parse_error.is_none() {
-            // `FixMode::Generate` and `FixMode::Diff` rely on side-effects (writing to disk,
-            // and writing the diff to stdout, respectively). If a file has diagnostics, we
-            // need to avoid reading from and writing to the cache in these modes.
-            if match fix_mode {
-                flags::FixMode::Generate => true,
-                flags::FixMode::Apply | flags::FixMode::Diff => {
-                    messages.is_empty() && fixed.is_empty()
-                }
-            } {
-                cache.update_lint(
-                    relative_path.to_owned(),
-                    &key,
-                    LintCacheData::from_messages(
-                        &messages,
-                        imports.clone(),
-                        source_kind.as_ipy_notebook().map(Notebook::index).cloned(),
-                    ),
-                );
-            }
+            cache.update_lint(
+                relative_path.to_owned(),
+                &key,
+                LintCacheData::from_messages(
+                    &messages,
+                    imports.clone(),
+                    source_kind.as_ipy_notebook().map(Notebook::index).cloned(),
+                ),
+            );
        }
    }

@@ -379,15 +355,8 @@ pub(crate) fn lint_stdin(
    fix_mode: flags::FixMode,
 ) -> Result<Diagnostics> {
    // TODO(charlie): Support `pyproject.toml`.
-    let source_type = if let Some(source_type) =
-        override_source_type(path, &settings.linter.extension)
-    {
-        source_type
-    } else {
-        let SourceType::Python(source_type) = path.map(SourceType::from).unwrap_or_default() else {
-            return Ok(Diagnostics::default());
-        };
-        source_type
+    let SourceType::Python(source_type) = path.map(SourceType::from).unwrap_or_default() else {
+        return Ok(Diagnostics::default());
    };

    // Extract the sources from the file.
--- a/crates/ruff_cli/src/lib.rs
+++ b/crates/ruff_cli/src/lib.rs
@@ -18,7 +18,7 @@ use ruff_linter::settings::types::SerializationFormat;
 use ruff_linter::{fs, warn_user, warn_user_once};
 use ruff_workspace::Settings;

-use crate::args::{Args, CheckCommand, Command, FormatCommand, HelpFormat};
+use crate::args::{Args, CheckCommand, Command, FormatCommand};
 use crate::printer::{Flags as PrinterFlags, Printer};

 pub mod args;
@@ -101,15 +101,6 @@ fn is_stdin(files: &[PathBuf], stdin_filename: Option<&Path>) -> bool {
    file == Path::new("-")
 }

-/// Get the actual value of the `format` desired from either `output_format`
-/// or `format`, and warn the user if they're using the deprecated form.
-fn resolve_help_output_format(output_format: HelpFormat, format: Option<HelpFormat>) -> HelpFormat {
-    if format.is_some() {
-        warn_user!("The `--format` argument is deprecated. Use `--output-format` instead.");
-    }
-    format.unwrap_or(output_format)
-}
-
 pub fn run(
    Args {
        command,
@@ -150,18 +141,12 @@ pub fn run(
            commands::version::version(output_format)?;
            Ok(ExitStatus::Success)
        }
-        Command::Rule {
-            rule,
-            all,
-            format,
-            mut output_format,
-        } => {
-            output_format = resolve_help_output_format(output_format, format);
+        Command::Rule { rule, all, format } => {
            if all {
-                commands::rule::rules(output_format)?;
+                commands::rule::rules(format)?;
            }
            if let Some(rule) = rule {
-                commands::rule::rule(rule, output_format)?;
+                commands::rule::rule(rule, format)?;
            }
            Ok(ExitStatus::Success)
        }
@@ -169,12 +154,8 @@ pub fn run(
            commands::config::config(option.as_deref())?;
            Ok(ExitStatus::Success)
        }
-        Command::Linter {
-            format,
-            mut output_format,
-        } => {
-            output_format = resolve_help_output_format(output_format, format);
-            commands::linter::linter(output_format)?;
+        Command::Linter { format } => {
+            commands::linter::linter(format)?;
            Ok(ExitStatus::Success)
        }
        Command::Clean => {
--- a/crates/ruff_cli/src/stdin.rs
+++ b/crates/ruff_cli/src/stdin.rs
@@ -1,5 +1,5 @@
 use std::io;
-use std::io::{Read, Write};
+use std::io::Read;

 /// Read a string from `stdin`.
 pub(crate) fn read_from_stdin() -> Result<String, io::Error> {
@@ -7,11 +7,3 @@ pub(crate) fn read_from_stdin() -> Result<String, io::Error> {
    io::stdin().lock().read_to_string(&mut buffer)?;
    Ok(buffer)
 }
-
-/// Read bytes from `stdin` and write them to `stdout`.
-pub(crate) fn parrot_stdin() -> Result<(), io::Error> {
-    let mut buffer = String::new();
-    io::stdin().lock().read_to_string(&mut buffer)?;
-    io::stdout().write_all(buffer.as_bytes())?;
-    Ok(())
-}
--- a/crates/ruff_cli/tests/format.rs
+++ b/crates/ruff_cli/tests/format.rs
@@ -188,73 +188,6 @@ OTHER = "OTHER"
    Ok(())
 }

-#[test]
-fn force_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", "--force-exclude", "--check", "--config"])
-        .arg(ruff_toml.file_name().unwrap())
-        // Explicitly pass test.py, should be respect the `format.exclude` when `--force-exclude` is present
-        .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
-    1 file would be reformatted
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
 #[test]
 fn exclude_stdin() -> Result<()> {
    let tempdir = TempDir::new()?;
@@ -282,48 +215,6 @@ if __name__ == '__main__':
    success: true
    exit_code: 0
    ----- stdout -----
-    from test import say_hy
-
-    if __name__ == "__main__":
-        say_hy("dear Ruff contributor")
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
-#[test]
-fn force_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", "--force-exclude", "-"])
-        .pass_stdin(r#"
-from test import say_hy
-
-if __name__ == '__main__':
-    say_hy("dear Ruff contributor")
-"#), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    from test import say_hy
-
-    if __name__ == '__main__':
-        say_hy("dear Ruff contributor")

    ----- stderr -----
    "###);
@@ -384,7 +275,7 @@ if condition:
    	print('Should change quotes')

    ----- stderr -----
-    warning: The following rules may cause conflicts when used with the formatter: `COM812`. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding them to the `ignore` configuration.
+    warning: The following rules may cause conflicts when used with the formatter: `COM812`. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding then to the `ignore` configuration.
    "###);
    Ok(())
 }
@@ -512,9 +403,7 @@ def say_hy(name: str):
    1 file reformatted

    ----- stderr -----
-    warning: The following rules may cause conflicts when used with the formatter: `COM812`, `ISC001`. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding them to the `ignore` configuration.
-    warning: The `format.indent-style="tab"` option is incompatible with `W191`, which lints against all uses of tabs. We recommend disabling these rules when using the formatter, which enforces a consistent indentation style. Alternatively, set the `format.indent-style` option to `"space"`.
-    warning: The `format.indent-style="tab"` option is incompatible with `D206`, with requires space-based indentation. We recommend disabling these rules when using the formatter, which enforces a consistent indentation style. Alternatively, set the `format.indent-style` option to `"space"`.
+    warning: The following rules may cause conflicts when used with the formatter: `COM812`, `D206`, `ISC001`, `W191`. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding then to the `ignore` configuration.
    warning: The `flake8-quotes.inline-quotes="single"` option is incompatible with the formatter's `format.quote-style="double"`. We recommend disabling `Q000` and `Q003` when using the formatter, which enforces a consistent quote style. Alternatively, set both options to either `"single"` or `"double"`.
    warning: The `flake8-quotes.multiline-quotes="single"` option is incompatible with the formatter. We recommend disabling `Q001` when using the formatter, which enforces double quotes for multiline strings. Alternatively, set the `flake8-quotes.multiline-quotes` option to `"double"`.`
    warning: The `flake8-quotes.multiline-quotes="single"` option is incompatible with the formatter. We recommend disabling `Q002` when using the formatter, which enforces double quotes for docstrings. Alternatively, set the `flake8-quotes.docstring-quotes` option to `"double"`.`
@@ -571,9 +460,7 @@ def say_hy(name: str):
    	print(f"Hy {name}")

    ----- stderr -----
-    warning: The following rules may cause conflicts when used with the formatter: `COM812`, `ISC001`. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding them to the `ignore` configuration.
-    warning: The `format.indent-style="tab"` option is incompatible with `W191`, which lints against all uses of tabs. We recommend disabling these rules when using the formatter, which enforces a consistent indentation style. Alternatively, set the `format.indent-style` option to `"space"`.
-    warning: The `format.indent-style="tab"` option is incompatible with `D206`, with requires space-based indentation. We recommend disabling these rules when using the formatter, which enforces a consistent indentation style. Alternatively, set the `format.indent-style` option to `"space"`.
+    warning: The following rules may cause conflicts when used with the formatter: `COM812`, `D206`, `ISC001`, `W191`. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding then to the `ignore` configuration.
    warning: The `flake8-quotes.inline-quotes="single"` option is incompatible with the formatter's `format.quote-style="double"`. We recommend disabling `Q000` and `Q003` when using the formatter, which enforces a consistent quote style. Alternatively, set both options to either `"single"` or `"double"`.
    warning: The `flake8-quotes.multiline-quotes="single"` option is incompatible with the formatter. We recommend disabling `Q001` when using the formatter, which enforces double quotes for multiline strings. Alternatively, set the `flake8-quotes.multiline-quotes` option to `"double"`.`
    warning: The `flake8-quotes.multiline-quotes="single"` option is incompatible with the formatter. We recommend disabling `Q002` when using the formatter, which enforces double quotes for docstrings. Alternatively, set the `flake8-quotes.docstring-quotes` option to `"double"`.`
@@ -669,7 +556,7 @@ def say_hy(name: str):
    ----- stderr -----
    warning: `one-blank-line-before-class` (D203) and `no-blank-line-before-class` (D211) are incompatible. Ignoring `one-blank-line-before-class`.
    warning: `multi-line-summary-first-line` (D212) and `multi-line-summary-second-line` (D213) are incompatible. Ignoring `multi-line-summary-second-line`.
-    warning: The following rules may cause conflicts when used with the formatter: `COM812`, `ISC001`. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding them to the `ignore` configuration.
+    warning: The following rules may cause conflicts when used with the formatter: `COM812`, `ISC001`. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding then to the `ignore` configuration.
    "###);
    Ok(())
 }
@@ -818,432 +705,3 @@ fn test_diff_stdin_formatted() {
    ----- stderr -----
    "###);
 }
-
-#[test]
-fn test_notebook_trailing_semicolon() {
-    let fixtures = Path::new("resources").join("test").join("fixtures");
-    let unformatted = fs::read(fixtures.join("trailing_semicolon.ipynb")).unwrap();
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--isolated", "--stdin-filename", "test.ipynb"])
-        .arg("-")
-        .pass_stdin(unformatted), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    {
-     "cells": [
-      {
-       "cell_type": "code",
-       "execution_count": 1,
-       "id": "4f8ce941-1492-4d4e-8ab5-70d733fe891a",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "%config ZMQInteractiveShell.ast_node_interactivity=\"last_expr_or_assign\""
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 2,
-       "id": "721ec705-0c65-4bfb-9809-7ed8bc534186",
-       "metadata": {},
-       "outputs": [
-        {
-         "data": {
-          "text/plain": [
-           "1"
-          ]
-         },
-         "execution_count": 2,
-         "metadata": {},
-         "output_type": "execute_result"
-        }
-       ],
-       "source": [
-        "# Assignment statement without a semicolon\n",
-        "x = 1"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 3,
-       "id": "de50e495-17e5-41cc-94bd-565757555d7e",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "# Assignment statement with a semicolon\n",
-        "x = 1\n",
-        "x = 1;"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 4,
-       "id": "39e31201-23da-44eb-8684-41bba3663991",
-       "metadata": {},
-       "outputs": [
-        {
-         "data": {
-          "text/plain": [
-           "2"
-          ]
-         },
-         "execution_count": 4,
-         "metadata": {},
-         "output_type": "execute_result"
-        }
-       ],
-       "source": [
-        "# Augmented assignment without a semicolon\n",
-        "x += 1"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 5,
-       "id": "6b73d3dd-c73a-4697-9e97-e109a6c1fbab",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "# Augmented assignment without a semicolon\n",
-        "x += 1\n",
-        "x += 1;  # comment\n",
-        "# comment"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 6,
-       "id": "2a3e5b86-aa5b-46ba-b9c6-0386d876f58c",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "# Multiple assignment without a semicolon\n",
-        "x = y = 1"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 7,
-       "id": "07f89e51-9357-4cfb-8fc5-76fb75e35949",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "# Multiple assignment with a semicolon\n",
-        "x = y = 1\n",
-        "x = y = 1"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 8,
-       "id": "c22b539d-473e-48f8-a236-625e58c47a00",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "# Tuple unpacking without a semicolon\n",
-        "x, y = 1, 2"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 9,
-       "id": "12c87940-a0d5-403b-a81c-7507eb06dc7e",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "# Tuple unpacking with a semicolon (irrelevant)\n",
-        "x, y = 1, 2\n",
-        "x, y = 1, 2  # comment\n",
-        "# comment"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 10,
-       "id": "5a768c76-6bc4-470c-b37e-8cc14bc6caf4",
-       "metadata": {},
-       "outputs": [
-        {
-         "data": {
-          "text/plain": [
-           "1"
-          ]
-         },
-         "execution_count": 10,
-         "metadata": {},
-         "output_type": "execute_result"
-        }
-       ],
-       "source": [
-        "# Annotated assignment statement without a semicolon\n",
-        "x: int = 1"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 11,
-       "id": "21bfda82-1a9a-4ba1-9078-74ac480804b5",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "# Annotated assignment statement without a semicolon\n",
-        "x: int = 1\n",
-        "x: int = 1;  # comment\n",
-        "# comment"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 12,
-       "id": "09929999-ff29-4d10-ad2b-e665af15812d",
-       "metadata": {},
-       "outputs": [
-        {
-         "data": {
-          "text/plain": [
-           "1"
-          ]
-         },
-         "execution_count": 12,
-         "metadata": {},
-         "output_type": "execute_result"
-        }
-       ],
-       "source": [
-        "# Assignment expression without a semicolon\n",
-        "(x := 1)"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 13,
-       "id": "32a83217-1bad-4f61-855e-ffcdb119c763",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "# Assignment expression with a semicolon\n",
-        "(x := 1)\n",
-        "(x := 1);  # comment\n",
-        "# comment"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 14,
-       "id": "61b81865-277e-4964-b03e-eb78f1f318eb",
-       "metadata": {},
-       "outputs": [
-        {
-         "data": {
-          "text/plain": [
-           "1"
-          ]
-         },
-         "execution_count": 14,
-         "metadata": {},
-         "output_type": "execute_result"
-        }
-       ],
-       "source": [
-        "x = 1\n",
-        "# Expression without a semicolon\n",
-        "x"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 15,
-       "id": "974c29be-67e1-4000-95fa-6ca118a63bad",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "x = 1\n",
-        "# Expression with a semicolon\n",
-        "x;"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 16,
-       "id": "cfeb1757-46d6-4f13-969f-a283b6d0304f",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "class Point:\n",
-        "    def __init__(self, x, y):\n",
-        "        self.x = x\n",
-        "        self.y = y\n",
-        "\n",
-        "\n",
-        "p = Point(0, 0);"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 17,
-       "id": "2ee7f1a5-ccfe-4004-bfa4-ef834a58da97",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "# Assignment statement where the left is an attribute access doesn't\n",
-        "# print the value.\n",
-        "p.x = 1"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 18,
-       "id": "3e49370a-048b-474d-aa0a-3d1d4a73ad37",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "data = {}\n",
-        "\n",
-        "# Neither does the subscript node\n",
-        "data[\"foo\"] = 1"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 19,
-       "id": "d594bdd3-eaa9-41ef-8cda-cf01bc273b2d",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "if x := 1:\n",
-        "    # It should be the top level statement\n",
-        "    x"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 20,
-       "id": "e532f0cf-80c7-42b7-8226-6002fcf74fb6",
-       "metadata": {},
-       "outputs": [
-        {
-         "data": {
-          "text/plain": [
-           "1"
-          ]
-         },
-         "execution_count": 20,
-         "metadata": {},
-         "output_type": "execute_result"
-        }
-       ],
-       "source": [
-        "# Parentheses with comments\n",
-        "(\n",
-        "    x := 1  # comment\n",
-        ")  # comment"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 21,
-       "id": "473c5d62-871b-46ed-8a34-27095243f462",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "# Parentheses with comments\n",
-        "(\n",
-        "    x := 1  # comment\n",
-        ");  # comment"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 22,
-       "id": "8c3c2361-f49f-45fe-bbe3-7e27410a8a86",
-       "metadata": {},
-       "outputs": [
-        {
-         "data": {
-          "text/plain": [
-           "'Hello world!'"
-          ]
-         },
-         "execution_count": 22,
-         "metadata": {},
-         "output_type": "execute_result"
-        }
-       ],
-       "source": [
-        "\"\"\"Hello world!\"\"\""
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 23,
-       "id": "23dbe9b5-3f68-4890-ab2d-ab0dbfd0712a",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "\"\"\"Hello world!\"\"\";  # comment\n",
-        "# comment"
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 24,
-       "id": "3ce33108-d95d-4c70-83d1-0d4fd36a2951",
-       "metadata": {},
-       "outputs": [
-        {
-         "data": {
-          "text/plain": [
-           "'x = 1'"
-          ]
-         },
-         "execution_count": 24,
-         "metadata": {},
-         "output_type": "execute_result"
-        }
-       ],
-       "source": [
-        "x = 1\n",
-        "f\"x = {x}\""
-       ]
-      },
-      {
-       "cell_type": "code",
-       "execution_count": 25,
-       "id": "654a4a67-de43-4684-824a-9451c67db48f",
-       "metadata": {},
-       "outputs": [],
-       "source": [
-        "x = 1\n",
-        "f\"x = {x}\"\n",
-        "f\"x = {x}\";  # comment\n",
-        "# comment"
-       ]
-      }
-     ],
-     "metadata": {
-      "kernelspec": {
-       "display_name": "Python (ruff-playground)",
-       "language": "python",
-       "name": "ruff-playground"
-      },
-      "language_info": {
-       "codemirror_mode": {
-        "name": "ipython",
-        "version": 3
-       },
-       "file_extension": ".py",
-       "mimetype": "text/x-python",
-       "name": "python",
-       "nbconvert_exporter": "python",
-       "pygments_lexer": "ipython3",
-       "version": "3.11.3"
-      }
-     },
-     "nbformat": 4,
-     "nbformat_minor": 5
-    }
-
-    ----- stderr -----
-    "###);
-}
--- a/crates/ruff_cli/tests/integration_test.rs
+++ b/crates/ruff_cli/tests/integration_test.rs
@@ -320,119 +320,6 @@ fn stdin_fix_jupyter() {
    Found 2 errors (2 fixed, 0 remaining).
    "###);
 }
-#[test]
-fn stdin_override_parser_ipynb() {
-    let args = ["--extension", "py:ipynb", "--stdin-filename", "Jupyter.py"];
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(args)
-        .pass_stdin(r#"{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "id": "dccc687c-96e2-4604-b957-a8a89b5bec06",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import os"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "19e1b029-f516-4662-a9b9-623b93edac1a",
-   "metadata": {},
-   "source": [
-    "Foo"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 2,
-   "id": "cdce7b92-b0fb-4c02-86f6-e233b26fa84f",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import sys"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 3,
-   "id": "e40b33d2-7fe4-46c5-bdf0-8802f3052565",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "1\n"
-     ]
-    }
-   ],
-   "source": [
-    "print(1)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "a1899bc8-d46f-4ec0-b1d1-e1ca0f04bf60",
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.11.2"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}"#), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    Jupyter.py:cell 1:1:8: F401 [*] `os` imported but unused
-    Jupyter.py:cell 3:1:8: F401 [*] `sys` imported but unused
-    Found 2 errors.
-    [*] 2 fixable with the `--fix` option.
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn stdin_override_parser_py() {
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(STDIN_BASE_OPTIONS)
-        .args(["--extension", "ipynb:python", "--stdin-filename", "F401.ipynb"])
-        .pass_stdin("import os\n"), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    F401.ipynb:1:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    "###);
-}

 #[test]
 fn stdin_fix_when_not_fixable_should_still_print_contents() {
@@ -1520,106 +1407,3 @@ extend-safe-fixes = ["UP034"]

    Ok(())
 }
-
-#[test]
-fn check_extend_unsafe_fixes_conflict_with_extend_safe_fixes_by_specificity() -> Result<()> {
-    // Adding a rule to one option with a more specific selector should override the other option
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-target-version = "py310"
-[lint]
-extend-unsafe-fixes = ["UP", "UP034"]
-extend-safe-fixes = ["UP03"]
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "--config"])
-        .arg(&ruff_toml)
-        .arg("-")
-        .args([
-            "--output-format",
-            "text",
-            "--no-cache",
-            "--select",
-            "F601,UP018,UP034,UP038",
-        ])
-        .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\nprint(str('foo'))\nisinstance(x, (int, str))\n"),
-            @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:14: F601 Dictionary key literal `'a'` repeated
-    -:2:7: UP034 Avoid extraneous parentheses
-    -:3:7: UP018 Unnecessary `str` call (rewrite as a literal)
-    -:4:1: UP038 [*] Use `X | Y` in `isinstance` call instead of `(X, Y)`
-    Found 4 errors.
-    [*] 1 fixable with the `--fix` option (3 hidden fixes can be enabled with the `--unsafe-fixes` option).
-
-    ----- stderr -----
-    "###);
-
-    Ok(())
-}
-
-#[test]
-fn check_docstring_conventions_overrides() -> Result<()> {
-    // But if we explicitly select it, we override the convention
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[lint.pydocstyle]
-convention = "numpy"
-"#,
-    )?;
-
-    let stdin = r#"
-def log(x, base) -> float:
-    """Calculate natural log of a value
-
-    Parameters
-    ----------
-    x :
-        Hello
-    """
-    return math.log(x)
-"#;
-
-    // If we only select the prefix, then everything passes
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "-", "--config"])
-        .arg(&ruff_toml)
-        .args(["--output-format", "text", "--no-cache", "--select", "D41"])
-        .pass_stdin(stdin),
-        @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-
-    ----- stderr -----
-    "###
-    );
-
-    // But if we select the exact code, we get an error
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["check", "-", "--config"])
-        .arg(&ruff_toml)
-        .args(["--output-format", "text", "--no-cache", "--select", "D417"])
-        .pass_stdin(stdin),
-        @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:2:5: D417 Missing argument description in the docstring for `log`: `base`
-    Found 1 error.
-
-    ----- stderr -----
-    "###
-    );
-    Ok(())
-}
--- a/crates/ruff_cli/tests/lint.rs
+++ b/crates/ruff_cli/tests/lint.rs
@@ -262,13 +262,9 @@ from test import say_hy
 if __name__ == "__main__":
    say_hy("dear Ruff contributor")
 "#), @r###"
-    success: false
-    exit_code: 1
+    success: true
+    exit_code: 0
    ----- stdout -----
-    generated.py:4:16: Q000 [*] Double quotes found but single quotes preferred
-    generated.py:5:12: Q000 [*] Double quotes found but single quotes preferred
-    Found 2 errors.
-    [*] 2 fixable with the `--fix` option.

    ----- stderr -----
    "###);
@@ -312,87 +308,3 @@ _ = "---------------------------------------------------------------------------
    "###);
    Ok(())
 }
-
-#[test]
-fn per_file_ignores_stdin() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend-select = ["B", "Q"]
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .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"])
-        .args(["--per-file-ignores", "generated.py:Q"])
-        .arg("-")
-        .pass_stdin(r#"
-import os
-
-from test import say_hy
-
-if __name__ == "__main__":
-    say_hy("dear Ruff contributor")
-"#), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    generated.py:2:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
-
-#[test]
-fn extend_per_file_ignores_stdin() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-extend-select = ["B", "Q"]
-
-[lint.flake8-quotes]
-inline-quotes = "single"
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .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"])
-        .args(["--extend-per-file-ignores", "generated.py:Q"])
-        .arg("-")
-        .pass_stdin(r#"
-import os
-
-from test import say_hy
-
-if __name__ == "__main__":
-    say_hy("dear Ruff contributor")
-"#), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    generated.py:2:8: F401 [*] `os` imported but unused
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
-
-    ----- stderr -----
-    "###);
-    Ok(())
-}
--- a/crates/ruff_dev/Cargo.toml
+++ b/crates/ruff_dev/Cargo.toml
@@ -41,7 +41,7 @@ serde_json = { workspace = true }
 similar = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
-tempfile = "3.8.1"
+tempfile = "3.6.0"
 toml = { workspace = true, features = ["parse"] }
 tracing = { workspace = true }
 tracing-indicatif = { workspace = true }
--- a/crates/ruff_dev/src/generate_options.rs
+++ b/crates/ruff_dev/src/generate_options.rs
@@ -3,7 +3,6 @@
 //! Used for <https://docs.astral.sh/ruff/settings/>.
 use std::fmt::Write;

-use ruff_python_trivia::textwrap;
 use ruff_workspace::options::Options;
 use ruff_workspace::options_base::{OptionField, OptionSet, OptionsMetadata, Visit};

@@ -126,87 +125,18 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parent_set:
    output.push('\n');
    output.push_str(&format!("**Type**: `{}`\n", field.value_type));
    output.push('\n');
-    output.push_str("**Example usage**:\n\n");
-    output.push_str(&format_tab(
-        "pyproject.toml",
-        &format_header(field.scope, parent_set, ConfigurationFile::PyprojectToml),
-        field.example,
-    ));
-    output.push_str(&format_tab(
-        "ruff.toml",
-        &format_header(field.scope, parent_set, ConfigurationFile::RuffToml),
-        field.example,
+    output.push_str(&format!(
+        "**Example usage**:\n\n```toml\n[tool.ruff{}]\n{}\n```\n",
+        if let Some(set_name) = parent_set.name() {
+            format!(".{set_name}")
+        } else {
+            String::new()
+        },
+        field.example
    ));
    output.push('\n');
 }

-fn format_tab(tab_name: &str, header: &str, content: &str) -> String {
-    format!(
-        "=== \"{}\"\n\n    ```toml\n    {}\n{}\n    ```\n",
-        tab_name,
-        header,
-        textwrap::indent(content, "    ")
-    )
-}
-
-/// Format the TOML header for the example usage for a given option.
-///
-/// For example: `[tool.ruff.format]` or `[tool.ruff.lint.isort]`.
-fn format_header(
-    scope: Option<&str>,
-    parent_set: &Set,
-    configuration: ConfigurationFile,
-) -> String {
-    match configuration {
-        ConfigurationFile::PyprojectToml => {
-            let mut header = if let Some(set_name) = parent_set.name() {
-                if set_name == "format" {
-                    String::from("tool.ruff.format")
-                } else {
-                    format!("tool.ruff.lint.{set_name}")
-                }
-            } else {
-                "tool.ruff".to_string()
-            };
-            if let Some(scope) = scope {
-                if !header.is_empty() {
-                    header.push('.');
-                }
-                header.push_str(scope);
-            }
-            format!("[{header}]")
-        }
-        ConfigurationFile::RuffToml => {
-            let mut header = if let Some(set_name) = parent_set.name() {
-                if set_name == "format" {
-                    String::from("format")
-                } else {
-                    format!("lint.{set_name}")
-                }
-            } else {
-                String::new()
-            };
-            if let Some(scope) = scope {
-                if !header.is_empty() {
-                    header.push('.');
-                }
-                header.push_str(scope);
-            }
-            if header.is_empty() {
-                String::new()
-            } else {
-                format!("[{header}]")
-            }
-        }
-    }
-}
-
-#[derive(Debug, Copy, Clone)]
-enum ConfigurationFile {
-    PyprojectToml,
-    RuffToml,
-}
-
 #[derive(Default)]
 struct CollectOptionsVisitor {
    groups: Vec<(String, OptionSet)>,
--- a/crates/ruff_dev/src/generate_rules_table.rs
+++ b/crates/ruff_dev/src/generate_rules_table.rs
@@ -64,7 +64,7 @@ pub(crate) fn generate() -> String {
    table_out.push('\n');

    table_out.push_str(&format!(
-        "The {PREVIEW_SYMBOL} emoji indicates that a rule is in [\"preview\"](faq.md#what-is-preview)."
+        "The {PREVIEW_SYMBOL} emoji indicates that a rule in [\"preview\"](faq.md#what-is-preview)."
    ));
    table_out.push('\n');
    table_out.push('\n');
--- a/crates/ruff_diagnostics/src/fix.rs
+++ b/crates/ruff_diagnostics/src/fix.rs
@@ -12,7 +12,7 @@ use crate::edit::Edit;
 pub enum Applicability {
    /// The fix is unsafe and should only be displayed for manual application by the user.
    /// The fix is likely to be incorrect or the resulting code may have invalid syntax.
-    DisplayOnly,
+    Display,

    /// The fix is unsafe and should only be applied with user opt-in.
    /// The fix may be what the user intended, but it is uncertain; the resulting code will have valid syntax.
@@ -87,46 +87,22 @@ impl Fix {
        }
    }

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

-    /// Create a new [`Fix`] that should only [display](Applicability::DisplayOnly) and not apply from multiple [`Edit`] elements.
-    pub fn display_only_edits(edit: Edit, rest: impl IntoIterator<Item = Edit>) -> Self {
+    /// Create a new [`Fix`] that should only [display](Applicability::Display) and not apply from multiple [`Edit`] elements.
+    pub fn display_edits(edit: Edit, rest: impl IntoIterator<Item = Edit>) -> Self {
        let mut edits: Vec<Edit> = std::iter::once(edit).chain(rest).collect();
        edits.sort_by_key(|edit| (edit.start(), edit.end()));
        Self {
            edits,
-            applicability: Applicability::DisplayOnly,
-            isolation_level: IsolationLevel::default(),
-        }
-    }
-
-    /// Create a new [`Fix`] with the specified [`Applicability`] to apply an [`Edit`] element.
-    pub fn applicable_edit(edit: Edit, applicability: Applicability) -> Self {
-        Self {
-            edits: vec![edit],
-            applicability,
-            isolation_level: IsolationLevel::default(),
-        }
-    }
-
-    /// Create a new [`Fix`] with the specified [`Applicability`] to apply multiple [`Edit`] elements.
-    pub fn applicable_edits(
-        edit: Edit,
-        rest: impl IntoIterator<Item = Edit>,
-        applicability: Applicability,
-    ) -> Self {
-        let mut edits: Vec<Edit> = std::iter::once(edit).chain(rest).collect();
-        edits.sort_by_key(|edit| (edit.start(), edit.end()));
-        Self {
-            edits,
-            applicability,
+            applicability: Applicability::Display,
            isolation_level: IsolationLevel::default(),
        }
    }
--- a/crates/ruff_linter/Cargo.toml
+++ b/crates/ruff_linter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.1.5"
+version = "0.1.3"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -30,7 +30,7 @@ ruff_source_file = { path = "../ruff_source_file", features = ["serde"] }
 ruff_text_size = { path = "../ruff_text_size" }

 aho-corasick = { version = "1.1.2" }
-annotate-snippets = { version = "0.9.2", features = ["color"] }
+annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { workspace = true }
 bitflags = { workspace = true }
 chrono = { workspace = true }
@@ -53,8 +53,8 @@ path-absolutize = { workspace = true, features = [
 ] }
 pathdiff = { version = "0.2.1" }
 pep440_rs = { version = "0.3.12", features = ["serde"] }
-pyproject-toml = { version = "0.8.1" }
-quick-junit = { version = "0.3.5" }
+pyproject-toml = { version = "0.7.0" }
+quick-junit = { version = "0.3.2" }
 regex = { workspace = true }
 result-like = { version = "0.4.6" }
 rustc-hash = { workspace = true }
@@ -79,7 +79,7 @@ pretty_assertions = "1.3.0"
 test-case = { workspace = true }
 # Disable colored output in tests
 colored = { workspace = true, features = ["no-color"] }
-tempfile = "3.8.1"
+tempfile = "3.6.0"

 [features]
 default = []
--- a/crates/ruff_linter/resources/test/fixtures/flake8_annotations/auto_return_type.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_annotations/auto_return_type.py
@@ -1,32 +0,0 @@
-def func():
-    return 1
-
-
-def func():
-    return 1.5
-
-
-def func(x: int):
-    if x > 0:
-        return 1
-    else:
-        return 1.5
-
-
-def func():
-    return True
-
-
-def func(x: int):
-    if x > 0:
-        return None
-    else:
-        return
-
-
-def func(x: int):
-    return 1 or 2.5 if x > 0 else 1.5 or "str"
-
-
-def func(x: int):
-    return 1 + 2.5 if x > 0 else 1.5 or "str"
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S608.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S608.py
@@ -101,5 +101,4 @@ query = "INSERT table VALUES (%s)" % (var,)
 query = "REPLACE INTO table VALUES (%s)" % (var,)
 query = "REPLACE table VALUES (%s)" % (var,)

-not_a_query = "Deselect something that is not SQL even though it has a ' from ' somewhere in %s." % "there"
-not_a_query = f"Please select a value from the list of possible variants: {variants}."
+query = "Deselect something that is not SQL even though it has a ' from ' somewhere in %s." % "there"
--- a/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S702.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_bandit/S702.py
@@ -1,9 +0,0 @@
-from mako.template import Template
-from mako import template
-import mako
-
-
-Template("hello")
-
-mako.template.Template("hern")
-template.Template("hern")
--- a/crates/ruff_linter/resources/test/fixtures/flake8_boolean_trap/FBT.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_boolean_trap/FBT.py
@@ -91,18 +91,3 @@ class Registry:

    def foo(self) -> None:
        object.__setattr__(self, "flag", True)
-
-
-from typing import Optional, Union
-
-
-def func(x: Union[list, Optional[int | str | float | bool]]):
-    pass
-
-
-def func(x: bool | str):
-    pass
-
-
-def func(x: int | str):
-    pass
--- a/crates/ruff_linter/resources/test/fixtures/flake8_commas/COM81.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_commas/COM81.py
@@ -639,18 +639,3 @@ foo = namedtuple(
        :20
    ],
 )
-
-# F-strings
-kwargs.pop("remove", f"this {trailing_comma}",)
-
-raise Exception(
-    "first", extra=f"Add trailing comma here ->"
-)
-
-assert False, f"<- This is not a trailing comma"
-
-f"""This is a test. {
-    "Another sentence."
-    if True else
-    "Don't add a trailing comma here ->"
-}"""
--- a/crates/ruff_linter/resources/test/fixtures/flake8_errmsg/EM.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_errmsg/EM.py
@@ -58,33 +58,3 @@ def f_fix_indentation_check(foo):
 # Report these, but don't fix them
 if foo: raise RuntimeError("This is an example exception")
 if foo: x = 1; raise RuntimeError("This is an example exception")
-
-
-def f_triple_quoted_string():
-    raise RuntimeError(f"""This is an {"example"} exception""")
-
-
-def f_multi_line_string():
-    raise RuntimeError(
-        "first"
-        "second"
-    )
-
-
-def f_multi_line_string2():
-    raise RuntimeError(
-        "This is an {example} exception".format(
-            example="example"
-        )
-    )
-
-
-def f_multi_line_string2():
-    raise RuntimeError(
-        (
-            "This is an "
-            "{example} exception"
-        ).format(
-            example="example"
-        )
-    )
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE790.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE790.py
@@ -148,32 +148,3 @@ for i in range(10):
 for i in range(10):
    pass  # comment
    pass
-
-
-def foo():
-    print("foo")
-    ...
-
-
-def foo():
-    """A docstring."""
-    print("foo")
-    ...
-
-
-for i in range(10):
-    ...
-    ...
-
-for i in range(10):
-    ...
-
-    ...
-
-for i in range(10):
-    ...  # comment
-    ...
-
-for i in range(10):
-    ...
-    pass
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE794.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE794.py
@@ -38,15 +38,3 @@ class User:
    foo: bool = BooleanField()
    # ...
    bar = StringField()  # PIE794
-
-
-class Person:
-    name = "Foo"
-    name = name + " Bar"
-    name = "Bar"  # PIE794
-
-
-class Person:
-    name: str = "Foo"
-    name: str = name + " Bar"
-    name: str = "Bar"  # PIE794
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE800.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE800.py
@@ -1,21 +1,9 @@
 {"foo": 1, **{"bar": 1}}  # PIE800

-{**{"bar": 10}, "a": "b"}  # PIE800
-
 foo({**foo, **{"bar": True}})  # PIE800

 {**foo, **{"bar": 10}}  # PIE800

-{ # PIE800
-    "a": "b",
-    # Preserve
-    **{
-        # all
-        "bar": 10,  # the
-        # comments
-    },
-}
-
 {**foo, **buzz, **{bar: 10}}  # PIE800

 {**foo,    "bar": True  }  # OK
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE807.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE807.py
@@ -1,37 +1,27 @@
@dataclass
 class Foo:
    foo: List[str] = field(default_factory=lambda: [])  # PIE807
-    bar: Dict[str, int] = field(default_factory=lambda: {})  # PIE807


 class FooTable(BaseTable):
-    foo = fields.ListField(default=lambda: [])  # PIE807
-    bar = fields.ListField(default=lambda: {})  # PIE807
+    bar = fields.ListField(default=lambda: [])  # PIE807


 class FooTable(BaseTable):
-    foo = fields.ListField(lambda: [])  # PIE807
-    bar = fields.ListField(default=lambda: {})  # PIE807
+    bar = fields.ListField(lambda: [])  # PIE807


@dataclass
 class Foo:
    foo: List[str] = field(default_factory=list)
-    bar: Dict[str, int] = field(default_factory=dict)


 class FooTable(BaseTable):
-    foo = fields.ListField(list)
-    bar = fields.ListField(dict)
+    bar = fields.ListField(list)


 lambda *args, **kwargs: []
-lambda *args, **kwargs: {}

 lambda *args: []
-lambda *args: {}

 lambda **kwargs: []
-lambda **kwargs: {}
-
-lambda: {**unwrap}
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI034.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI034.py
@@ -3,11 +3,9 @@
 import abc
 import builtins
 import collections.abc
-import enum
 import typing
-from abc import ABCMeta, abstractmethod
+from abc import abstractmethod
 from collections.abc import AsyncIterable, AsyncIterator, Iterable, Iterator
-from enum import EnumMeta
 from typing import Any, overload

 import typing_extensions
@@ -201,31 +199,6 @@ class AsyncIteratorReturningAsyncIterable:
        ...  # Y045 "__aiter__" methods should return an AsyncIterator, not an AsyncIterable


-class MetaclassInWhichSelfCannotBeUsed(type):
-    def __new__(cls) -> MetaclassInWhichSelfCannotBeUsed: ...
-    def __enter__(self) -> MetaclassInWhichSelfCannotBeUsed: ...
-    async def __aenter__(self) -> MetaclassInWhichSelfCannotBeUsed: ...
-    def __isub__(self, other: MetaclassInWhichSelfCannotBeUsed) -> MetaclassInWhichSelfCannotBeUsed: ...
-
-class MetaclassInWhichSelfCannotBeUsed2(EnumMeta):
-    def __new__(cls) -> MetaclassInWhichSelfCannotBeUsed2: ...
-    def __enter__(self) -> MetaclassInWhichSelfCannotBeUsed2: ...
-    async def __aenter__(self) -> MetaclassInWhichSelfCannotBeUsed2: ...
-    def __isub__(self, other: MetaclassInWhichSelfCannotBeUsed2) -> MetaclassInWhichSelfCannotBeUsed2: ...
-
-class MetaclassInWhichSelfCannotBeUsed3(enum.EnumType):
-    def __new__(cls) -> MetaclassInWhichSelfCannotBeUsed3: ...
-    def __enter__(self) -> MetaclassInWhichSelfCannotBeUsed3: ...
-    async def __aenter__(self) -> MetaclassInWhichSelfCannotBeUsed3: ...
-    def __isub__(self, other: MetaclassInWhichSelfCannotBeUsed3) -> MetaclassInWhichSelfCannotBeUsed3: ...
-
-class MetaclassInWhichSelfCannotBeUsed4(ABCMeta):
-    def __new__(cls) -> MetaclassInWhichSelfCannotBeUsed4: ...
-    def __enter__(self) -> MetaclassInWhichSelfCannotBeUsed4: ...
-    async def __aenter__(self) -> MetaclassInWhichSelfCannotBeUsed4: ...
-    def __isub__(self, other: MetaclassInWhichSelfCannotBeUsed4) -> MetaclassInWhichSelfCannotBeUsed4: ...
-
-
 class Abstract(Iterator[str]):
    @abstractmethod
    def __iter__(self) -> Iterator[str]:
--- a/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI034.pyi
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI034.pyi
@@ -3,11 +3,9 @@
 import abc
 import builtins
 import collections.abc
-import enum
 import typing
-from abc import ABCMeta, abstractmethod
+from abc import abstractmethod
 from collections.abc import AsyncIterable, AsyncIterator, Iterable, Iterator
-from enum import EnumMeta
 from typing import Any, overload

 import typing_extensions
@@ -154,30 +152,6 @@ class AsyncIteratorReturningAsyncIterable:
        str
    ]: ...  # Y045 "__aiter__" methods should return an AsyncIterator, not an AsyncIterable

-class MetaclassInWhichSelfCannotBeUsed(type):
-    def __new__(cls) -> MetaclassInWhichSelfCannotBeUsed: ...
-    def __enter__(self) -> MetaclassInWhichSelfCannotBeUsed: ...
-    async def __aenter__(self) -> MetaclassInWhichSelfCannotBeUsed: ...
-    def __isub__(self, other: MetaclassInWhichSelfCannotBeUsed) -> MetaclassInWhichSelfCannotBeUsed: ...
-
-class MetaclassInWhichSelfCannotBeUsed2(EnumMeta):
-    def __new__(cls) -> MetaclassInWhichSelfCannotBeUsed2: ...
-    def __enter__(self) -> MetaclassInWhichSelfCannotBeUsed2: ...
-    async def __aenter__(self) -> MetaclassInWhichSelfCannotBeUsed2: ...
-    def __isub__(self, other: MetaclassInWhichSelfCannotBeUsed2) -> MetaclassInWhichSelfCannotBeUsed2: ...
-
-class MetaclassInWhichSelfCannotBeUsed3(enum.EnumType):
-    def __new__(cls) -> MetaclassInWhichSelfCannotBeUsed3: ...
-    def __enter__(self) -> MetaclassInWhichSelfCannotBeUsed3: ...
-    async def __aenter__(self) -> MetaclassInWhichSelfCannotBeUsed3: ...
-    def __isub__(self, other: MetaclassInWhichSelfCannotBeUsed3) -> MetaclassInWhichSelfCannotBeUsed3: ...
-
-class MetaclassInWhichSelfCannotBeUsed4(ABCMeta):
-    def __new__(cls) -> MetaclassInWhichSelfCannotBeUsed4: ...
-    def __enter__(self) -> MetaclassInWhichSelfCannotBeUsed4: ...
-    async def __aenter__(self) -> MetaclassInWhichSelfCannotBeUsed4: ...
-    def __isub__(self, other: MetaclassInWhichSelfCannotBeUsed4) -> MetaclassInWhichSelfCannotBeUsed4: ...
-
 class Abstract(Iterator[str]):
    @abstractmethod
    def __iter__(self) -> Iterator[str]: ...
--- a/crates/ruff_linter/resources/test/fixtures/flake8_quotes/doubles_escaped_unnecessary.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_quotes/doubles_escaped_unnecessary.py
@@ -1,45 +0,0 @@
-this_should_raise_Q004 = 'This is a \"string\"'
-this_should_raise_Q004 = 'This is \\ a \\\"string\"'
-this_is_fine = '"This" is a \"string\"'
-this_is_fine = "This is a 'string'"
-this_is_fine = "\"This\" is a 'string'"
-this_is_fine = r'This is a \"string\"'
-this_is_fine = R'This is a \"string\"'
-this_should_raise_Q004 = (
-    'This is a'
-    '\"string\"'
-)
-
-# Same as above, but with f-strings
-f'This is a \"string\"'  # Q004
-f'This is \\ a \\\"string\"'  # Q004
-f'"This" is a \"string\"'
-f"This is a 'string'"
-f"\"This\" is a 'string'"
-fr'This is a \"string\"'
-fR'This is a \"string\"'
-this_should_raise_Q004 = (
-    f'This is a'
-    f'\"string\"'  # Q004
-)
-
-# Nested f-strings (Python 3.12+)
-#
-# The first one is interesting because the fix for it is valid pre 3.12:
-#
-#   f"'foo' {'nested'}"
-#
-# but as the actual string itself is invalid pre 3.12, we don't catch it.
-f'\"foo\" {'nested'}'  # Q004
-f'\"foo\" {f'nested'}'  # Q004
-f'\"foo\" {f'\"nested\"'} \"\"'  # Q004
-
-f'normal {f'nested'} normal'
-f'\"normal\" {f'nested'} normal'  # Q004
-f'\"normal\" {f'nested'} "double quotes"'
-f'\"normal\" {f'\"nested\" {'other'} normal'} "double quotes"'  # Q004
-f'\"normal\" {f'\"nested\" {'other'} "double quotes"'} normal'  # Q004
-
-# Make sure we do not unescape quotes
-this_is_fine = 'This is an \\"escaped\\" quote'
-this_should_raise_Q004 = 'This is an \\\"escaped\\\" quote with an extra backslash'
--- a/crates/ruff_linter/resources/test/fixtures/flake8_quotes/singles_escaped_unnecessary.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_quotes/singles_escaped_unnecessary.py
@@ -1,43 +0,0 @@
-this_should_raise_Q004 = "This is a \'string\'"
-this_should_raise_Q004 = "'This' is a \'string\'"
-this_is_fine = 'This is a "string"'
-this_is_fine = '\'This\' is a "string"'
-this_is_fine = r"This is a \'string\'"
-this_is_fine = R"This is a \'string\'"
-this_should_raise_Q004 = (
-    "This is a"
-    "\'string\'"
-)
-
-# Same as above, but with f-strings
-f"This is a \'string\'"  # Q004
-f"'This' is a \'string\'"  # Q004
-f'This is a "string"'
-f'\'This\' is a "string"'
-fr"This is a \'string\'"
-fR"This is a \'string\'"
-this_should_raise_Q004 = (
-    f"This is a"
-    f"\'string\'"  # Q004
-)
-
-# Nested f-strings (Python 3.12+)
-#
-# The first one is interesting because the fix for it is valid pre 3.12:
-#
-#   f'"foo" {"nested"}'
-#
-# but as the actual string itself is invalid pre 3.12, we don't catch it.
-f"\'foo\' {"foo"}"  # Q004
-f"\'foo\' {f"foo"}"  # Q004
-f"\'foo\' {f"\'foo\'"} \'\'"  # Q004
-
-f"normal {f"nested"} normal"
-f"\'normal\' {f"nested"} normal"  # Q004
-f"\'normal\' {f"nested"} 'single quotes'"
-f"\'normal\' {f"\'nested\' {"other"} normal"} 'single quotes'"  # Q004
-f"\'normal\' {f"\'nested\' {"other"} 'single quotes'"} normal"  # Q004
-
-# Make sure we do not unescape quotes
-this_is_fine = "This is an \\'escaped\\' quote"
-this_should_raise_Q004 = "This is an \\\'escaped\\\' quote with an extra backslash"
--- a/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM118.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM118.py
@@ -1,5 +1,3 @@
-obj = {}
-
 key in obj.keys()  # SIM118

 key not in obj.keys()  # SIM118
--- a/crates/ruff_linter/resources/test/fixtures/flake8_trio/TRIO100.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_trio/TRIO100.py
@@ -1,18 +0,0 @@
-import trio
-
-
-async def foo():
-    with trio.fail_after():
-        ...
-
-async def foo():
-    with trio.fail_at():
-        await ...
-
-async def foo():
-    with trio.move_on_after():
-        ...
-
-async def foo():
-    with trio.move_at():
-        await ...
--- a/crates/ruff_linter/resources/test/fixtures/flake8_trio/TRIO105.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_trio/TRIO105.py
@@ -1,64 +0,0 @@
-import trio
-
-
-async def func() -> None:
-    trio.run(foo)  # OK, not async
-
-    # OK
-    await trio.aclose_forcefully(foo)
-    await trio.open_file(foo)
-    await trio.open_ssl_over_tcp_listeners(foo, foo)
-    await trio.open_ssl_over_tcp_stream(foo, foo)
-    await trio.open_tcp_listeners(foo)
-    await trio.open_tcp_stream(foo, foo)
-    await trio.open_unix_socket(foo)
-    await trio.run_process(foo)
-    await trio.sleep(5)
-    await trio.sleep_until(5)
-    await trio.lowlevel.cancel_shielded_checkpoint()
-    await trio.lowlevel.checkpoint()
-    await trio.lowlevel.checkpoint_if_cancelled()
-    await trio.lowlevel.open_process(foo)
-    await trio.lowlevel.permanently_detach_coroutine_object(foo)
-    await trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
-    await trio.lowlevel.temporarily_detach_coroutine_object(foo)
-    await trio.lowlevel.wait_readable(foo)
-    await trio.lowlevel.wait_task_rescheduled(foo)
-    await trio.lowlevel.wait_writable(foo)
-
-    # TRIO105
-    trio.aclose_forcefully(foo)
-    trio.open_file(foo)
-    trio.open_ssl_over_tcp_listeners(foo, foo)
-    trio.open_ssl_over_tcp_stream(foo, foo)
-    trio.open_tcp_listeners(foo)
-    trio.open_tcp_stream(foo, foo)
-    trio.open_unix_socket(foo)
-    trio.run_process(foo)
-    trio.serve_listeners(foo, foo)
-    trio.serve_ssl_over_tcp(foo, foo, foo)
-    trio.serve_tcp(foo, foo)
-    trio.sleep(foo)
-    trio.sleep_forever()
-    trio.sleep_until(foo)
-    trio.lowlevel.cancel_shielded_checkpoint()
-    trio.lowlevel.checkpoint()
-    trio.lowlevel.checkpoint_if_cancelled()
-    trio.lowlevel.open_process()
-    trio.lowlevel.permanently_detach_coroutine_object(foo)
-    trio.lowlevel.reattach_detached_coroutine_object(foo, foo)
-    trio.lowlevel.temporarily_detach_coroutine_object(foo)
-    trio.lowlevel.wait_readable(foo)
-    trio.lowlevel.wait_task_rescheduled(foo)
-    trio.lowlevel.wait_writable(foo)
-
-    async with await trio.open_file(foo):  # Ok
-        pass
-
-    async with trio.open_file(foo):  # TRIO105
-        pass
-
-
-def func() -> None:
-    # TRIO105 (without fix)
-    trio.open_file(foo)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_trio/TRIO109.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_trio/TRIO109.py
@@ -1,13 +0,0 @@
-import trio
-
-
-async def func():
-    ...
-
-
-async def func(timeout):
-    ...
-
-
-async def func(timeout=10):
-    ...
--- a/crates/ruff_linter/resources/test/fixtures/flake8_trio/TRIO110.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_trio/TRIO110.py
@@ -1,16 +0,0 @@
-import trio
-
-
-async def func():
-    while True:
-        await trio.sleep(10)
-
-
-async def func():
-    while True:
-        await trio.sleep_until(10)
-
-
-async def func():
-    while True:
-        trio.sleep(10)
--- a/crates/ruff_linter/resources/test/fixtures/flake8_trio/TRIO115.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_trio/TRIO115.py
@@ -1,28 +0,0 @@
-import trio
-from trio import sleep
-
-
-async def func():
-    await trio.sleep(0)  # TRIO115
-    await trio.sleep(1)  # OK
-    await trio.sleep(0, 1)  # OK
-    await trio.sleep(...)  # OK
-    await trio.sleep()  # OK
-
-    trio.sleep(0)  # TRIO115
-    foo = 0
-    trio.sleep(foo)  # TRIO115
-    trio.sleep(1)  # OK
-    time.sleep(0)  # OK
-
-    sleep(0)  # TRIO115
-
-    bar = "bar"
-    trio.sleep(bar)
-
-
-trio.sleep(0)  # TRIO115
-
-
-def func():
-    trio.run(trio.sleep(0))  # TRIO115
--- a/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TCH002.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TCH002.py
@@ -172,14 +172,3 @@ def f():
    from module import Member

    x: Member = 1
-
-
-def f():
-    from typing_extensions import TYPE_CHECKING
-
-    from pandas import y
-
-    if TYPE_CHECKING:
-        _type = x
-    elif True:
-        _type = y
--- a/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TCH004_16.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TCH004_16.py
@@ -1,10 +0,0 @@
-from __future__ import annotations
-
-from typing_extensions import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from pandas import DataFrame
-
-
-def example() -> DataFrame:
-    pass
--- a/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TCH004_17.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TCH004_17.py
@@ -1,10 +0,0 @@
-from __future__ import annotations
-
-from typing_extensions import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from pandas import DataFrame
-
-
-def example() -> DataFrame:
-    x = DataFrame()
--- a/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TCH005.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TCH005.py
@@ -37,9 +37,3 @@ if False:

 if 0:
    x: List
-
-
-from typing_extensions import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    pass  # TCH005
--- a/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/module/init.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/module/init.py
--- a/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/module/direct.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/module/direct.py
@@ -1,11 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Sequence
-
-
-class MyBaseClass:
-    pass
-
-
-class Foo(MyBaseClass):
-    foo: Sequence
--- a/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/module/import.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/module/import.py
@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Sequence
-
-from module.direct import MyBaseClass
-
-
-class Foo(MyBaseClass):
-    foo: Sequence
--- a/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/module/undefined.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/module/undefined.py
@@ -1,7 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Sequence
-
-
-class Foo(MyBaseClass):
-    foo: Sequence
--- a/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/runtime_evaluated_base_classes_5.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/runtime_evaluated_base_classes_5.py
@@ -1,11 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Sequence  # TCH003
-
-
-class MyBaseClass:
-    pass
-
-
-class Foo(MyBaseClass):
-    foo: Sequence
--- a/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/typing_modules_1.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/typing_modules_1.py
@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-from typing_extensions import Self
-
-
-def func():
-    from pandas import DataFrame
-
-    df: DataFrame
--- a/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/typing_modules_2.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_type_checking/typing_modules_2.py
@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-import typing_extensions
-
-
-def func():
-    from pandas import DataFrame
-
-    df: DataFrame
--- a/crates/ruff_linter/resources/test/fixtures/isort/force_sort_within_sections_with_as_names.py
+++ b/crates/ruff_linter/resources/test/fixtures/isort/force_sort_within_sections_with_as_names.py
@@ -1,5 +0,0 @@
-import encodings
-from datetime import timezone as tz
-from datetime import timedelta
-import datetime as dt
-import datetime
--- a/crates/ruff_linter/resources/test/fixtures/isort/no_sections.py
+++ b/crates/ruff_linter/resources/test/fixtures/isort/no_sections.py
@@ -1,8 +0,0 @@
-from __future__ import annotations
-
-import django.settings
-import os
-import pytz
-import sys
-from . import local
-from library import foo
--- a/crates/ruff_linter/resources/test/fixtures/isort/pyproject.toml
+++ b/crates/ruff_linter/resources/test/fixtures/isort/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.ruff]
 line-length = 88

-[tool.ruff.lint.isort]
+[tool.ruff.isort]
 lines-after-imports = 3
 lines-between-types = 2
 known-local-folder = ["ruff"]
--- a/crates/ruff_linter/resources/test/fixtures/numpy/NPY201.py
+++ b/crates/ruff_linter/resources/test/fixtures/numpy/NPY201.py
@@ -1,106 +0,0 @@
-def func():
-    import numpy as np
-
-    np.add_docstring
-
-    np.add_newdoc
-
-    np.add_newdoc_ufunc
-
-    np.asfarray([1,2,3])
-
-    np.byte_bounds(np.array([1,2,3]))
-
-    np.cast
-
-    np.cfloat(12+34j)
-
-    np.clongfloat(12+34j)
-
-    np.compat
-
-    np.complex_(12+34j)
-
-    np.DataSource
-
-    np.deprecate
-
-    np.deprecate_with_doc
-
-    np.disp(10)
-
-    np.fastCopyAndTranspose
-
-    np.find_common_type
-
-    np.get_array_wrap
-
-    np.float_
-
-    np.geterrobj
-
-    np.Inf
-
-    np.Infinity
-
-    np.infty
-
-    np.issctype
-
-    np.issubclass_(np.int32, np.integer)
-
-    np.issubsctype
-
-    np.mat
-
-    np.maximum_sctype
-
-    np.NaN
-
-    np.nbytes[np.int64]
-
-    np.NINF
-
-    np.NZERO
-
-    np.longcomplex(12+34j)
-
-    np.longfloat(12+34j)
-
-    np.lookfor
-
-    np.obj2sctype(int)
-
-    np.PINF
-
-    np.PZERO
-
-    np.recfromcsv
-
-    np.recfromtxt
-
-    np.round_(12.34)
-
-    np.safe_eval
-
-    np.sctype2char
-
-    np.sctypes
-
-    np.seterrobj
-
-    np.set_numeric_ops
-
-    np.set_string_function
-
-    np.singlecomplex(12+1j)
-
-    np.string_("asdf")
-
-    np.source
-
-    np.tracemalloc_domain
-
-    np.unicode_("asf")
-
-    np.who()
--- a/crates/ruff_linter/resources/test/fixtures/pep8_naming/N805.py
+++ b/crates/ruff_linter/resources/test/fixtures/pep8_naming/N805.py
@@ -63,33 +63,3 @@ class PosOnlyClass:

    def bad_method_pos_only(this, blah, /, self, something: str):
        pass
-
-
-class ModelClass:
-    @hybrid_property
-    def bad(cls):
-        pass
-
-    @bad.expression
-    def bad(self):
-        pass
-
-    @bad.wtf
-    def bad(cls):
-        pass
-
-    @hybrid_property
-    def good(self):
-        pass
-
-    @good.expression
-    def good(cls):
-        pass
-
-    @good.wtf
-    def good(self):
-        pass
-
-    @foobar.thisisstatic
-    def badstatic(foo):
-        pass
--- a/crates/ruff_linter/resources/test/fixtures/pycodestyle/E20.py
+++ b/crates/ruff_linter/resources/test/fixtures/pycodestyle/E20.py
@@ -89,49 +89,3 @@ x = [  #
 f"{ {'a': 1} }"
 f"{[ { {'a': 1} } ]}"
 f"normal { {f"{ { [1, 2] } }" } } normal"
-
-#: Okay
-ham[lower + offset : upper + offset]
-
-#: Okay
-ham[(lower + offset) : upper + offset]
-
-#: E203:1:19
-ham{lower + offset : upper + offset}
-
-#: E203:1:19
-ham[lower + offset  : upper + offset]
-
-#: Okay
-release_lines = history_file_lines[history_file_lines.index('## Unreleased') + 1: -1]
-
-#: Okay
-release_lines = history_file_lines[history_file_lines.index('## Unreleased') + 1 : -1]
-
-#: Okay
-ham[1:9], ham[1:9:3], ham[:9:3], ham[1::3], ham[1:9:]
-ham[lower:upper], ham[lower:upper:], ham[lower::step]
-ham[lower+offset : upper+offset]
-ham[: upper_fn(x) : step_fn(x)], ham[:: step_fn(x)]
-ham[lower + offset : upper + offset]
-
-#: E201:1:5
-ham[ : upper]
-
-#: Okay
-ham[lower + offset :: upper + offset]
-
-#: Okay
-ham[(lower + offset) :: upper + offset]
-
-#: Okay
-ham[lower + offset::upper + offset]
-
-#: E203:1:21
-ham[lower + offset : : upper + offset]
-
-#: E203:1:20
-ham[lower + offset: :upper + offset]
-
-#: E203:1:20
-ham[{lower + offset : upper + offset} : upper + offset]
--- a/crates/ruff_linter/resources/test/fixtures/pycodestyle/E21.py
+++ b/crates/ruff_linter/resources/test/fixtures/pycodestyle/E21.py
@@ -12,19 +12,3 @@ dict['key'] = list[index]
 # This is not prohibited by PEP8, but avoid it.
 class Foo (Bar, Baz):
    pass
-
-
-def fetch_name () -> Union[str, None]:
-    """Fetch name from --person-name in sys.argv.
-
-   Returns:
-        name of the person if available, otherwise None
-    """
-    test = len(5)
-    Logger.info(test)
-    # test commented code
-    # Logger.info("test code")
-    for i in range (0, len (sys.argv)) :
-        if sys.argv[i] == "--name" :
-            return sys.argv[i + 1]
-    return None
--- a/crates/ruff_linter/resources/test/fixtures/pycodestyle/E23.py
+++ b/crates/ruff_linter/resources/test/fixtures/pycodestyle/E23.py
@@ -40,11 +40,5 @@ f"{(a:=1)}"
 f"{(lambda x:x)}"
 f"normal{f"{a:.3f}"}normal"

-#: Okay
-snapshot.file_uri[len(f's3://{self.s3_bucket_name}/'):]
-
-#: E231
-{len(f's3://{self.s3_bucket_name}/'):1}
-
 #: Okay
 a = (1,
--- a/crates/ruff_linter/resources/test/fixtures/pycodestyle/E70.py
+++ b/crates/ruff_linter/resources/test/fixtures/pycodestyle/E70.py
@@ -69,5 +69,3 @@ while 1:
 #: E701:2:3
 a = \
  5;
-#:
-with x(y) as z: ...
--- a/crates/ruff_linter/resources/test/fixtures/pycodestyle/E721.py
+++ b/crates/ruff_linter/resources/test/fixtures/pycodestyle/E721.py
@@ -4,9 +4,6 @@ if type(res) == type(42):
 #: E721
 if type(res) != type(""):
    pass
-#: E721
-if type(res) == memoryview:
-    pass
 #: Okay
 import types

@@ -50,14 +47,6 @@ if isinstance(res, str):
    pass
 if isinstance(res, types.MethodType):
    pass
-if isinstance(res, memoryview):
-    pass
-#: Okay
-if type(res) is type:
-    pass
-#: E721
-if type(res) == type:
-    pass
 #: Okay
 def func_histype(a, b, c):
    pass
--- a/crates/ruff_linter/resources/test/fixtures/pycodestyle/constant_literals.py
+++ b/crates/ruff_linter/resources/test/fixtures/pycodestyle/constant_literals.py
@@ -16,48 +16,6 @@ if False == None:  # E711, E712 (fix)
 if None == False:  # E711, E712 (fix)
    pass

-named_var = []
-if [] is []:  # F632 (fix)
-    pass
-if named_var is []:  # F632 (fix)
-    pass
-if [] is named_var:  # F632 (fix)
-    pass
-if named_var is [1]:  # F632 (fix)
-    pass
-if [1] is named_var:  # F632 (fix)
-    pass
-if named_var is [i for i in [1]]:  # F632 (fix)
-    pass
-
-named_var = {}
-if {} is {}:  # F632 (fix)
-    pass
-if named_var is {}:  # F632 (fix)
-    pass
-if {} is named_var:  # F632 (fix)
-    pass
-if named_var is {1}:  # F632 (fix)
-    pass
-if {1} is named_var:  # F632 (fix)
-    pass
-if named_var is {i for i in [1]}:  # F632 (fix)
-    pass
-
-named_var = {1: 1}
-if {1: 1} is {1: 1}:  # F632 (fix)
-    pass
-if named_var is {1: 1}:  # F632 (fix)
-    pass
-if {1: 1} is named_var:  # F632 (fix)
-    pass
-if named_var is {1: 1}:  # F632 (fix)
-    pass
-if {1: 1} is named_var:  # F632 (fix)
-    pass
-if named_var is {i: 1 for i in [1]}:  # F632 (fix)
-    pass
-
 ###
 # Non-errors
 ###
@@ -75,45 +33,3 @@ if False is None:
    pass
 if None is False:
    pass
-
-named_var = []
-if [] == []:
-    pass
-if named_var == []:
-    pass
-if [] == named_var:
-    pass
-if named_var == [1]:
-    pass
-if [1] == named_var:
-    pass
-if named_var == [i for i in [1]]:
-    pass
-
-named_var = {}
-if {} == {}:
-    pass
-if named_var == {}:
-    pass
-if {} == named_var:
-    pass
-if named_var == {1}:
-    pass
-if {1} == named_var:
-    pass
-if named_var == {i for i in [1]}:
-    pass
-
-named_var = {1: 1}
-if {1: 1} == {1: 1}:
-    pass
-if named_var == {1: 1}:
-    pass
-if {1: 1} == named_var:
-    pass
-if named_var == {1: 1}:
-    pass
-if {1: 1} == named_var:
-    pass
-if named_var == {i: 1 for i in [1]}:
-    pass
--- a/crates/ruff_linter/resources/test/fixtures/pydocstyle/D300.py
+++ b/crates/ruff_linter/resources/test/fixtures/pydocstyle/D300.py
@@ -8,19 +8,3 @@ def ends_in_quote():

 def contains_quote():
    'Sum"\\mary.'
-
-
-# OK
-def contains_triples(t):
-    """('''|\""")"""
-
-
-# OK
-def contains_triples(t):
-    '''(\'''|""")'''
-
-
-# TODO: here should raise D300 for using dobule quotes instead,
-# because escaped double quote does allow us.
-def contains_triples(t):
-    '''(\""")'''
--- a/crates/ruff_linter/resources/test/fixtures/pydocstyle/D301.py
+++ b/crates/ruff_linter/resources/test/fixtures/pydocstyle/D301.py
@@ -31,7 +31,3 @@ def make_unique_pod_id(pod_id: str) -> str | None:
    :param pod_id: requested pod name
    :return: ``str`` valid Pod name of appropriate length
    """
-
-
-def shouldnt_add_raw_here2():
-    u"Sum\\mary."
--- a/crates/ruff_linter/resources/test/fixtures/pyflakes/F821_21.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F821_21.py
@@ -1,4 +0,0 @@
-"""Test for IPython-only builtins."""
-
-x = 1
-display(x)
--- a/crates/ruff_linter/resources/test/fixtures/pyflakes/F821_22.ipynb
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F821_22.ipynb
@@ -1,74 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "id": "af8fee97-f9aa-47c2-b34c-b109a5f083d6",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "1"
-      ]
-     },
-     "execution_count": 1,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "1"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 2,
-   "id": "acd5eb1e-6991-42b8-806f-20d17d7e571f",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "1"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    }
-   ],
-   "source": [
-    "display(1)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "f8f3f599-030e-48b3-bcd3-31d97f725c68",
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.11.5"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
--- a/crates/ruff_linter/resources/test/fixtures/pyflakes/F841_1.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F841_1.py
@@ -1,5 +1,5 @@
 def f(tup):
-    x, y = tup
+    x, y = tup  # this does NOT trigger F841


 def f():
@@ -7,17 +7,17 @@ def f():


 def f():
-    (x, y) = coords = 1, 2
+    (x, y) = coords = 1, 2  # this does NOT trigger F841
    if x > 1:
        print(coords)


 def f():
-    (x, y) = coords = 1, 2
+    (x, y) = coords = 1, 2  # this triggers F841 on coords


 def f():
-    coords = (x, y) = 1, 2
+    coords = (x, y) = 1, 2  # this triggers F841 on coords


 def f():
--- a/crates/ruff_linter/resources/test/fixtures/pyflakes/F841_4.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyflakes/F841_4.py
@@ -1,32 +0,0 @@
-"""Test fix for issue #8441.
-
-Ref: https://github.com/astral-sh/ruff/issues/8441
-"""
-
-
-def foo():
-    ...
-
-
-def bar():
-    a = foo()
-    b, c = foo()
-
-
-def baz():
-    d, _e = foo()
-    print(d)
-
-
-def qux():
-    f, _ = foo()
-    print(f)
-
-
-def quux():
-    g, h = foo()
-    print(g, h)
-
-
-def quuz():
-    _i, _j = foo()
--- 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
@@ -70,10 +70,6 @@ class Apples:
    def __html__(self):
        pass

-    # Allow Python's __index__
-    def __index__(self):
-        pass
-
    # Allow _missing_, used by enum.Enum.
    @classmethod
    def _missing_(cls, value):
--- a/crates/ruff_linter/resources/test/fixtures/pylint/bad_open_mode.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/bad_open_mode.py
@@ -1,34 +0,0 @@
-import pathlib
-
-NAME = "foo.bar"
-open(NAME, "wb")
-open(NAME, "w", encoding="utf-8")
-open(NAME, "rb")
-open(NAME, "x", encoding="utf-8")
-open(NAME, "br")
-open(NAME, "+r", encoding="utf-8")
-open(NAME, "xb")
-open(NAME, "rwx")  # [bad-open-mode]
-open(NAME, mode="rwx")  # [bad-open-mode]
-open(NAME, "rwx", encoding="utf-8")  # [bad-open-mode]
-open(NAME, "rr", encoding="utf-8")  # [bad-open-mode]
-open(NAME, "+", encoding="utf-8")  # [bad-open-mode]
-open(NAME, "xw", encoding="utf-8")  # [bad-open-mode]
-open(NAME, "ab+")
-open(NAME, "a+b")
-open(NAME, "+ab")
-open(NAME, "+rUb")
-open(NAME, "x+b")
-open(NAME, "Ua", encoding="utf-8")  # [bad-open-mode]
-open(NAME, "Ur++", encoding="utf-8")  # [bad-open-mode]
-open(NAME, "Ut", encoding="utf-8")
-open(NAME, "Ubr")
-
-mode = "rw"
-open(NAME, mode)
-
-pathlib.Path(NAME).open("wb")
-pathlib.Path(NAME).open(mode)
-pathlib.Path(NAME).open("rwx")  # [bad-open-mode]
-pathlib.Path(NAME).open(mode="rwx")  # [bad-open-mode]
-pathlib.Path(NAME).open("rwx", encoding="utf-8")  # [bad-open-mode]
--- a/crates/ruff_linter/resources/test/fixtures/pylint/bad_string_format_type.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/bad_string_format_type.py
@@ -57,9 +57,3 @@ r'\%03o' % (ord(c),)
 '(%r, %r, %r, %r)' % (hostname, address, username, '$PASSWORD')
 '%r' % ({'server_school_roles': server_school_roles, 'is_school_multiserver_domain': is_school_multiserver_domain}, )
 "%d" % (1 if x > 0 else 2)
-
-# Special cases for %c allowing single character strings
-# https://github.com/astral-sh/ruff/issues/8406
-"%c" % ("x",)
-"%c" % "x"
-"%c" % "œ"
--- a/crates/ruff_linter/resources/test/fixtures/pylint/import_outside_top_level.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/import_outside_top_level.py
@@ -1,22 +0,0 @@
-from typing import TYPE_CHECKING
-
-# Verify that statements nested in conditionals (such as top-level type-checking blocks)
-# are still considered top-level
-if TYPE_CHECKING:
-    import string
-
-
-def import_in_function():
-    import symtable  # [import-outside-toplevel]
-    import os, sys  # [import-outside-toplevel]
-    import time as thyme  # [import-outside-toplevel]
-    import random as rand, socket as sock  # [import-outside-toplevel]
-    from collections import defaultdict # [import-outside-toplevel]
-    from math import sin as sign, cos as cosplay  # [import-outside-toplevel]
-
-
-class ClassWithImports:
-    import tokenize  # [import-outside-toplevel]
-
-    def __init__(self):
-        import trace  # [import-outside-toplevel]
--- a/crates/ruff_linter/resources/test/fixtures/pylint/redefined_argument_from_local.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/redefined_argument_from_local.py
@@ -1,79 +0,0 @@
-# No Errors
-def func(a):
-    for b in range(1):
-        ...
-
-
-def func(a):
-    try:
-        ...
-    except ValueError:
-        ...
-    except KeyError:
-        ...
-
-
-if True:
-    def func(a):
-        ...
-else:
-    for a in range(1):
-        print(a)
-
-
-# Errors
-def func(a):
-    for a in range(1):
-        ...
-
-
-def func(i):
-    for i in range(10):
-        print(i)
-
-
-def func(e):
-    try:
-        ...
-    except Exception as e:
-        print(e)
-
-
-def func(f):
-    with open('', ) as f:
-        print(f)
-
-
-def func(a, b):
-    with context() as (a, b, c):
-        print(a, b, c)
-
-
-def func(a, b):
-    with context() as [a, b, c]:
-        print(a, b, c)
-
-
-def func(a):
-    with open('foo.py', ) as f, open('bar.py') as a:
-        ...
-
-
-def func(a):
-    def bar(b):
-        for a in range(1):
-            print(a)
-
-
-def func(a):
-    def bar(b):
-        for b in range(1):
-            print(b)
-
-
-def func(a=1):
-    def bar(b=2):
-        for a in range(1):
-            print(a)
-        for b in range(1):
-            print(b)
--- a/crates/ruff_linter/resources/test/fixtures/pylint/useless_with_lock.py
+++ b/crates/ruff_linter/resources/test/fixtures/pylint/useless_with_lock.py
@@ -1,56 +0,0 @@
-import threading
-from threading import Lock, RLock, Condition, Semaphore, BoundedSemaphore
-
-
-with threading.Lock():  # [useless-with-lock]
-    ...
-
-with Lock():  # [useless-with-lock]
-    ...
-
-with threading.Lock() as this_shouldnt_matter:  # [useless-with-lock]
-    ...
-
-with threading.RLock():  # [useless-with-lock]
-    ...
-
-with RLock():  # [useless-with-lock]
-    ...
-
-with threading.Condition():  # [useless-with-lock]
-    ...
-
-with Condition():  # [useless-with-lock]
-    ...
-
-with threading.Semaphore():  # [useless-with-lock]
-    ...
-
-with Semaphore():  # [useless-with-lock]
-    ...
-
-with threading.BoundedSemaphore():  # [useless-with-lock]
-    ...
-
-with BoundedSemaphore():  # [useless-with-lock]
-    ...
-
-lock = threading.Lock()
-with lock:  # this is ok
-    ...
-
-rlock = threading.RLock()
-with rlock:  # this is ok
-    ...
-
-cond = threading.Condition()
-with cond:  # this is ok
-    ...
-
-sem = threading.Semaphore()
-with sem:  # this is ok
-    ...
-
-b_sem = threading.BoundedSemaphore()
-with b_sem:  # this is ok
-    ...
--- a/crates/ruff_linter/resources/test/fixtures/pyproject.toml
+++ b/crates/ruff_linter/resources/test/fixtures/pyproject.toml
@@ -5,6 +5,4 @@ extend-exclude = [
  "migrations",
  "with_excluded_file/other_excluded_file.py",
 ]
-
-[tool.ruff.lint]
 per-file-ignores = { "__init__.py" = ["F401"] }
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP007.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP007.py
@@ -114,8 +114,3 @@ class ServiceRefOrValue:
 class Collection(Protocol[*_B0]):
    def __iter__(self) -> Iterator[Union[*_B0]]:
        ...
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/8609
-def f(x: Union[int, str, bytes]) -> None:
-    ...
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP014.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP014.py
@@ -23,11 +23,3 @@ MyType = typing.NamedTuple("MyType", a=int, b=tuple[str, ...])
 MyType = typing.NamedTuple("MyType", [("a", int)], [("b", str)])
 MyType = typing.NamedTuple("MyType", [("a", int)], b=str)
 MyType = typing.NamedTuple(typename="MyType", a=int, b=str)
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/8402#issuecomment-1788787357
-S3File = NamedTuple(
-    "S3File",
-    [
-        ("dataHPK",* str),
-    ],
-)
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP025.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP025.py
@@ -25,6 +25,3 @@ u = u

 def hello():
    return"Hello"
-
-f"foo"u"bar"
-f"foo" u"bar"
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP032_0.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP032_0.py
@@ -207,22 +207,3 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 # The fixed string will exceed the line length, but it's still smaller than the
 # existing line length, so it's fine.
 "<Customer: {}, {}, {}, {}, {}>".format(self.internal_ids, self.external_ids, self.properties, self.tags, self.others)
-
-# When fixing, trim the trailing empty string.
-raise ValueError("Conflicting configuration dicts: {!r} {!r}"
-                 "".format(new_dict, d))
-
-# When fixing, trim the trailing empty string.
-raise ValueError("Conflicting configuration dicts: {!r} {!r}"
-                 .format(new_dict, d))
-
-raise ValueError(
-    "Conflicting configuration dicts: {!r} {!r}"
-    "".format(new_dict, d)
-)
-
-raise ValueError(
-    "Conflicting configuration dicts: {!r} {!r}"
-    "".format(new_dict, d)
-
-)
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP041.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP041.py
@@ -1,68 +0,0 @@
-import asyncio, socket
-# These should be fixed
-try:
-    pass
-except asyncio.TimeoutError:
-    pass
-
-try:
-    pass
-except socket.timeout:
-    pass
-
-# Should NOT be in parentheses when replaced
-
-try:
-    pass
-except (asyncio.TimeoutError,):
-    pass
-
-try:
-    pass
-except (socket.timeout,):
-    pass
-
-try:
-    pass
-except (asyncio.TimeoutError, socket.timeout,):
-    pass
-
-# Should be kept in parentheses (because multiple)
-
-try:
-    pass
-except (asyncio.TimeoutError, socket.timeout, KeyError, TimeoutError):
-    pass
-
-# First should change, second should not
-
-from .mmap import error
-try:
-    pass
-except (asyncio.TimeoutError, error):
-    pass
-
-# These should not change
-
-from foo import error
-
-try:
-    pass
-except (TimeoutError, error):
-    pass
-
-try:
-    pass
-except:
-    pass
-
-try:
-    pass
-except TimeoutError:
-    pass
-
-
-try:
-    pass
-except (TimeoutError, KeyError):
-    pass
--- a/crates/ruff_linter/resources/test/fixtures/refurb/FURB113.py
+++ b/crates/ruff_linter/resources/test/fixtures/refurb/FURB113.py
@@ -123,15 +123,6 @@ def yes_six(x: list):
    x.append(2)


-if True:
-    # FURB113
-    nums.append(1)
-    # comment
-    nums.append(2)
-    # comment
-    nums.append(3)
-
-
 # Non-errors.

 nums.append(1)
--- a/crates/ruff_linter/resources/test/fixtures/refurb/FURB131.py
+++ b/crates/ruff_linter/resources/test/fixtures/refurb/FURB131.py
@@ -43,12 +43,6 @@ def yes_four(x: Dict[int, str]):
    del x[:]


-def yes_five(x: Dict[int, str]):
-    # FURB131
-    del x[:]
-
-    x = 1
-
 # these should not

 del names["key"]
--- a/crates/ruff_linter/resources/test/fixtures/refurb/FURB136.py
+++ b/crates/ruff_linter/resources/test/fixtures/refurb/FURB136.py
@@ -1,25 +0,0 @@
-x = 1
-y = 2
-
-x if x > y else y  # FURB136
-
-x if x >= y else y  # FURB136
-
-x if x < y else y  # FURB136
-
-x if x <= y else y  # FURB136
-
-y if x > y else x  # FURB136
-
-y if x >= y else x  # FURB136
-
-y if x < y else x  # FURB136
-
-y if x <= y else x  # FURB136
-
-x + y if x > y else y  # OK
-
-x if (
-    x
-    > y
-) else y  # FURB136
--- a/crates/ruff_linter/resources/test/fixtures/refurb/FURB168.py
+++ b/crates/ruff_linter/resources/test/fixtures/refurb/FURB168.py
@@ -1,51 +0,0 @@
-foo: object
-
-# Errors.
-
-if isinstance(foo, type(None)):
-    pass
-
-if isinstance(foo, (type(None))):
-    pass
-
-if isinstance(foo, (type(None), type(None), type(None))):
-    pass
-
-if isinstance(foo, None | None):
-    pass
-
-if isinstance(foo, (None | None)):
-    pass
-
-if isinstance(foo, None | type(None)):
-    pass
-
-if isinstance(foo, (None | type(None))):
-    pass
-
-# A bit contrived, but is both technically valid and equivalent to the above.
-if isinstance(foo, (type(None) | ((((type(None))))) | ((None | type(None))))):
-    pass
-
-
-# Okay.
-
-if isinstance(foo, int):
-    pass
-
-if isinstance(foo, (int)):
-    pass
-
-if isinstance(foo, (int, str)):
-    pass
-
-if isinstance(foo, (int, type(None), str)):
-    pass
-
-# This is a TypeError, which the rule ignores.
-if isinstance(foo, None):
-    pass
-
-# This is also a TypeError, which the rule ignores.
-if isinstance(foo, (None,)):
-    pass
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Micha Reiser	98f29bdcec	Discard changes to crates/ruff_python_formatter/src/lib.rs	2023-10-27 17:09:07 -05:00
Micha Reiser	215b1c9f25	Split tuples in return positions by comma first	2023-10-27 17:09:07 -05:00
Zanie	88bf2ac43f	Lint	2023-10-27 15:48:21 -05:00
Zanie	16e511a734	Use `FormatOptions`; exclude file from `demisto/content` with syntax error	2023-10-27 15:46:33 -05:00
Zanie	7d5122603e	Show a different summary if there are only errors	2023-10-27 15:39:49 -05:00
Zanie	7d4b59d6cb	Merge branch 'main' into zanie/ecosystem-format	2023-10-27 15:16:20 -05:00
Zanie	ee1883ac6c	Fix missing space	2023-10-27 13:28:09 -05:00
Zanie	0c1a7ffbdc	Fix chmod	2023-10-27 13:27:40 -05:00
Zanie	1337c4ad2a	Add docstrings for formatting	2023-10-27 12:49:29 -05:00
Zanie	c3354ad843	Lint	2023-10-27 12:48:14 -05:00
Zanie	b6066c6bef	Fix missing newline	2023-10-27 12:41:17 -05:00
Zanie	eb769ac03d	Improve handling of ruff executable lookup	2023-10-27 12:40:42 -05:00
Zanie	39c04c8335	Fix spacing in examples	2023-10-27 12:30:49 -05:00
Zanie	5f28912a0d	Remove format ignore lines re	2023-10-27 12:29:36 -05:00
Zanie	05ab316609	Rename `cache` variable; update `clone` type	2023-10-27 12:29:03 -05:00
Zanie	a16c04c6db	Fix `limited_parallelism` type annotation	2023-10-27 12:25:55 -05:00
Zanie	2a14b94995	Explicitly cast checkout directory to string	2023-10-27 12:23:51 -05:00
Zanie	c4bddb88c9	Use `cls` in `DiagnosticLine.try_from_string`	2023-10-27 12:23:04 -05:00
Zanie	8441db69ae	Fix `total_changes_by_rule` type annotation	2023-10-27 12:22:25 -05:00
Zanie	e304d46637	Add mutability note for `RuleChanges`	2023-10-27 12:21:03 -05:00
Zanie	23050b3653	Guard against dataclass types in jsonable implementation	2023-10-27 12:15:59 -05:00
Zanie	54bc49303f	Add deprecation message to old ecosystem script	2023-10-27 12:10:06 -05:00
Zanie	63f1122a5a	Run CI workflow when its changed	2023-10-27 12:08:50 -05:00
Zanie	d5127842d7	Undo changes to CI	2023-10-27 12:08:50 -05:00
Zanie Blue	7dc97fd358	Improve readme description. Co-authored-by: konsti <konstin@mailbox.org>	2023-10-27 12:08:50 -05:00
Zanie	3936bc119a	Drop coloring	2023-10-27 12:08:50 -05:00
Zanie	a1bec32a7b	Fix error rendering	2023-10-27 12:08:50 -05:00
Zanie	6f593cac68	in files -> across files	2023-10-27 12:08:50 -05:00
Zanie	823ec4cf88	Strip all newlines from error reports	2023-10-27 12:08:50 -05:00
Zanie	087d9c705e	Test adding color to diff; fix newline in error report	2023-10-27 12:08:50 -05:00
Zanie	06f71f5235	Remove comma for consistency	2023-10-27 12:08:50 -05:00
Zanie	2270485c09	Display errors in code fences	2023-10-27 12:08:50 -05:00
Zanie	1bbe88f0a0	Fix project truncation	2023-10-27 12:08:50 -05:00
Zanie	e0def9ef95	Truncate more aggressively	2023-10-27 12:08:50 -05:00
Zanie	85de1e97e2	Add completed project count to summary title	2023-10-27 12:08:50 -05:00
Zanie	9cdf864043	Enable all projects again	2023-10-27 12:08:50 -05:00
Zanie	9a8bd09ae6	Fix table	2023-10-27 12:08:50 -05:00
Zanie	2e36781a8a	Add more truncation?	2023-10-27 12:08:50 -05:00
Zanie	615e56906e	Fix added / removed counts for `format`	2023-10-27 12:08:50 -05:00
Zanie	ce290076b8	Restore display of fixes	2023-10-27 12:08:50 -05:00
Zanie	1f6b28c29c	Fix table	2023-10-27 12:08:50 -05:00
Zanie	d4e9418825	Fix calculation to ignore fixes	2023-10-27 12:08:50 -05:00
Zanie	89f9803f4a	Restructuring parsing	2023-10-27 12:08:50 -05:00
Zanie	250b226f16	Restore changelog	2023-10-27 12:08:50 -05:00
Zanie	25bda80e48	Improve limits per rule code	2023-10-27 12:08:50 -05:00
Zanie	88e3663dbe	Fix affected rules total	2023-10-27 12:08:50 -05:00
Zanie	5a055aadb0	Fix titles	2023-10-27 12:08:50 -05:00
Zanie	333aedc903	Refactor fixable detection	2023-10-27 12:08:50 -05:00
Zanie	6025081825	Add messy fixable detection to reduce rule changes	2023-10-27 12:08:44 -05:00
Zanie	c806b4a35a	Sort imports	2023-10-27 12:07:51 -05:00
Zanie	1c820b0200	Clean up Python implementation; enable all projects	2023-10-27 12:07:51 -05:00
Zanie	1f4e87f043	Use `set` instead of `sorted` in `RuleChanges.from_diff`	2023-10-27 12:07:51 -05:00
Zanie	db5dfd4eff	Loosen linked ranges for format diffs since they are not correct	2023-10-27 12:07:51 -05:00
Zanie	c2cae71247	Improve rule table title	2023-10-27 12:07:51 -05:00
Zanie	11e99655b8	Fix formatting of command	2023-10-27 12:07:51 -05:00
Zanie	8898906ef4	Update options display	2023-10-27 12:07:51 -05:00
Zanie	9c63d80257	Change table title	2023-10-27 12:07:51 -05:00
Zanie	d6e35f72a9	Move rule change table into details block	2023-10-27 12:07:51 -05:00
Zanie	c547ec1417	Combine reports into a single artifact again	2023-10-27 12:07:51 -05:00
Zanie	b049c8651a	Revert all changes to `pr-comment`	2023-10-27 12:07:51 -05:00
Zanie	8a48dfe3e3	Continue the battle for if-comment	2023-10-27 12:07:51 -05:00
Zanie	c437a899f8	Fix paths	2023-10-27 12:07:51 -05:00
Zanie	3fd64dac83	Fix file paths	2023-10-27 12:07:51 -05:00
Zanie	28bfab5eff	Fix titles	2023-10-27 12:07:51 -05:00
Zanie	f7790698b7	Tweak pull request comment	2023-10-27 12:07:51 -05:00
Zanie	89501451d9	Remove file links (only do line links)	2023-10-27 12:07:51 -05:00
Zanie	368cb3ee95	Add max lines per project to `ruff check`	2023-10-27 12:07:51 -05:00
Zanie	cbc24a3de2	Use `<pre>` for check output	2023-10-27 12:07:51 -05:00
Zanie	fc6a3c1c71	Skip more CI checks to speed things up	2023-10-27 12:07:51 -05:00
Zanie	4288d8a6f4	Skip fuzz and bench as well	2023-10-27 12:07:51 -05:00
Zanie	246830c29d	Skip tests for now	2023-10-27 12:07:51 -05:00
Zanie	f72c37ff46	Write results separately then combine	2023-10-27 12:07:51 -05:00
Zanie	071c54e89b	Add unidiff dep	2023-10-27 12:07:51 -05:00
Zanie	ff3dc646b0	Check against v0.0.292 for debugging	2023-10-27 12:07:51 -05:00
Zanie	d6aa117949	Lint	2023-10-27 12:07:51 -05:00
Zanie	92f935eb2b	Update formatter if	2023-10-27 12:07:51 -05:00
Zanie	ab49eaae61	Add formatter ecosystem checks	2023-10-27 12:07:51 -05:00
Zanie	4b79f57872	Refactor ecosystem checks into module	2023-10-27 12:07:51 -05:00