Add CI job to auto-update pre-commit dependencies weekly

.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:
+        - "*"

.github/workflows/ci.yaml

@@ -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,7 +209,7 @@ 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
@@ -222,30 +218,13 @@ jobs:
           # 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-stable
+          ruff-ecosystem check ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff --cache ./checkouts --output-format markdown | tee ecosystem-result-check
 
-          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
@@ -254,28 +233,10 @@ jobs:
           # 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-stable
+          ruff-ecosystem format ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff --cache ./checkouts --output-format markdown | tee ecosystem-result-format
 
-          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: |

.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:
@@ -44,15 +44,13 @@ jobs:
           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 +58,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'

.github/workflows/pre-commit.yaml

@@ -0,0 +1,36 @@
+# Until Dependabot support is released https://github.com/dependabot/dependabot-core/issues/1524
+name: Pre-commit update
+
+on:
+  # every week on monday
+  schedule:
+    - cron: "0 0 * * 1"
+  workflow_dispatch:
+
+permissions:
+  pull-requests: write
+
+jobs:
+  upgrade:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+
+      - name: Run autoupdate
+        run: |
+          pre-commit autoupdate
+
+      - name: Commit and push
+        run: |
+          git add ".pre-commit-config.yaml"
+          git commit -m "Upgrade pre-commit dependencies"
+          git push origin upgrade/pre-commit
+
+      - name: Open pull request
+        run: |
+          gh pr create --fill

.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

.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]

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

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

CONTRIBUTING.md

@@ -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
 

Cargo.lock

@@ -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"
@@ -383,7 +383,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -407,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",
@@ -418,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",
@@ -608,7 +608,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -619,7 +619,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -810,7 +810,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.1.5"
+version = "0.1.3"
 dependencies = [
  "anyhow",
  "clap",
@@ -1129,7 +1129,7 @@ dependencies = [
  "pmutil 0.6.1",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1440,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",
@@ -1707,7 +1707,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -2060,14 +2060,14 @@ dependencies = [
 
 [[package]]
 name = "ruff_cli"
-version = "0.1.5"
+version = "0.1.3"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
  "argfile",
  "assert_cmd",
  "bincode",
- "bitflags 2.4.1",
+ "bitflags 2.4.0",
  "cachedir",
  "chrono",
  "clap",
@@ -2196,12 +2196,12 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.1.5"
+version = "0.1.3"
 dependencies = [
  "aho-corasick",
  "annotate-snippets 0.9.1",
  "anyhow",
- "bitflags 2.4.1",
+ "bitflags 2.4.0",
  "chrono",
  "clap",
  "colored",
@@ -2267,7 +2267,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "ruff_python_trivia",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -2293,7 +2293,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",
@@ -2325,7 +2325,7 @@ name = "ruff_python_formatter"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "bitflags 2.4.1",
+ "bitflags 2.4.0",
  "clap",
  "countme",
  "insta",
@@ -2369,7 +2369,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",
@@ -2383,7 +2383,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",
@@ -2413,7 +2413,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",
@@ -2447,7 +2447,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_shrinking"
-version = "0.1.5"
+version = "0.1.3"
 dependencies = [
  "anyhow",
  "clap",
@@ -2563,7 +2563,7 @@ version = "0.38.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -2682,9 +2682,9 @@ dependencies = [
 
 [[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",
@@ -2699,7 +2699,7 @@ checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -2715,9 +2715,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",
@@ -2761,7 +2761,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -2856,7 +2856,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -2872,9 +2872,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",
@@ -2961,7 +2961,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -2973,7 +2973,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
  "test-case-core",
 ]
 
@@ -2994,7 +2994,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -3131,7 +3131,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -3349,7 +3349,7 @@ checksum = "3d8c6bba9b149ee82950daefc9623b32bb1dacbfb1890e352f6b887bd582adaf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -3443,7 +3443,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
  "wasm-bindgen-shared",
 ]
 
@@ -3477,7 +3477,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.39",
+ "syn 2.0.38",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]

Cargo.toml

@@ -13,7 +13,7 @@ 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"] }
 colored = { version = "2.0.0" }
@@ -35,14 +35,14 @@ 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_json = { version = "1.0.107" }
 shellexpand = { version = "3.0.0" }
 similar = { version = "2.3.0", features = ["inline"] }
 smallvec = { version = "1.11.1" }
 static_assertions = "1.1.0"
 strum = { version = "0.25.0", features = ["strum_macros"] }
 strum_macros = { version = "0.25.3" }
-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" }

LICENSE

@@ -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

README.md

@@ -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))
@@ -416,7 +415,6 @@ 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)
@@ -425,7 +423,6 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [PyTorch](https://github.com/pytorch/pytorch)
 - [Pydantic](https://github.com/pydantic/pydantic)
 - [Pylint](https://github.com/PyCQA/pylint)
-- [PyMC-Marketing](https://github.com/pymc-labs/pymc-marketing)
 - [Reflex](https://github.com/reflex-dev/reflex)
 - [Rippling](https://rippling.com)
 - [Robyn](https://github.com/sansyrox/robyn)

_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"

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.
 """

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"

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 }

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};
@@ -278,7 +278,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 +351,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 +374,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 +409,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,
@@ -538,7 +532,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 +552,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,
@@ -651,7 +643,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 {
@@ -736,9 +727,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
     }

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,
@@ -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>,

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(
@@ -21,9 +21,6 @@ pub(crate) fn check_stdin(
     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());
             }
 
@@ -32,17 +29,14 @@ pub(crate) fn check_stdin(
                 .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 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,

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`.
@@ -34,9 +34,6 @@ pub(crate) fn format_stdin(cli: &FormatArguments, overrides: &CliOverrides) -> R
     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);
             }
 
@@ -45,9 +42,6 @@ pub(crate) fn format_stdin(cli: &FormatArguments, overrides: &CliOverrides) -> R
                 .file_name()
                 .is_some_and(|name| match_exclusion(filename, name, &format_settings.exclude))
             {
-                if mode.is_write() {
-                    parrot_stdin()?;
-                }
                 return Ok(ExitStatus::Success);
             }
         }
@@ -56,9 +50,6 @@ pub(crate) fn format_stdin(cli: &FormatArguments, overrides: &CliOverrides) -> R
     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);
     };
 

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,
@@ -226,35 +221,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.
@@ -379,15 +370,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.

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(())
-}

crates/ruff_cli/tests/format.rs

@@ -320,11 +320,6 @@ if __name__ == '__main__':
     exit_code: 0
     ----- stdout -----
 
-    from test import say_hy
-
-    if __name__ == '__main__':
-        say_hy("dear Ruff contributor")
-
     ----- stderr -----
     "###);
     Ok(())

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,47 +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(())
-}

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,57 +125,22 @@ 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(parent_set, ConfigurationFile::PyprojectToml),
-        field.example,
-    ));
-    output.push_str(&format_tab(
-        "ruff.toml",
-        &format_header(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() {
+            if set_name == "format" {
+                String::from(".format")
+            } else {
+                format!(".lint.{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, "    ")
-    )
-}
-
-fn format_header(parent_set: &Set, configuration: ConfigurationFile) -> String {
-    let fmt = if let Some(set_name) = parent_set.name() {
-        if set_name == "format" {
-            String::from(".format")
-        } else {
-            format!(".lint.{set_name}")
-        }
-    } else {
-        String::new()
-    };
-    match configuration {
-        ConfigurationFile::PyprojectToml => format!("[tool.ruff{fmt}]"),
-        ConfigurationFile::RuffToml => {
-            if fmt.is_empty() {
-                String::new()
-            } else {
-                format!("[{}]", fmt.strip_prefix('.').unwrap())
-            }
-        }
-    }
-}
-
-#[derive(Debug, Copy, Clone)]
-enum ConfigurationFile {
-    PyprojectToml,
-    RuffToml,
-}
-
 #[derive(Default)]
 struct CollectOptionsVisitor {
     groups: Vec<(String, OptionSet)>,

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(),
         }
     }

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 }

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")

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 ->"
-}"""

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"
-        )
-    )

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

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 ...

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)

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):
-    ...

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)

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

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

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

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()

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

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

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

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

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

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

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

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()

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

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: ...

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

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):
-    '''(\""")'''

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."

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():

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()

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" % "œ"

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),
-    ],
-)

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

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)

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"]

crates/ruff_linter/resources/test/fixtures/refurb/FURB169.py

@@ -1,67 +0,0 @@
-foo = None
-
-# Error.
-
-type(foo) is type(None)
-
-type(None) is type(foo)
-
-type(None) is type(None)
-
-type(foo) is not type(None)
-
-type(None) is not type(foo)
-
-type(None) is not type(None)
-
-type(foo) == type(None)
-
-type(None) == type(foo)
-
-type(None) == type(None)
-
-type(foo) != type(None)
-
-type(None) != type(foo)
-
-type(None) != type(None)
-
-# Ok.
-
-foo is None
-
-foo is not None
-
-None is foo
-
-None is not foo
-
-None is None
-
-None is not None
-
-foo is type(None)
-
-type(foo) is None
-
-type(None) is None
-
-foo is not type(None)
-
-type(foo) is not None
-
-type(None) is not None
-
-foo == type(None)
-
-type(foo) == None
-
-type(None) == None
-
-foo != type(None)
-
-type(foo) != None
-
-type(None) != None
-
-type(foo) > type(None)

crates/ruff_linter/resources/test/fixtures/refurb/FURB171.py

@@ -43,6 +43,3 @@ if 1 is {1}:
 
 if "a" == "a":
     pass
-
-if 1 in {*[1]}:
-    pass

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

@@ -45,11 +45,3 @@ x = f"string { # And here's a comment with an unusual parenthesis: ）
 # And here's a comment with a greek alpha: ∗
 foo # And here's a comment with an unusual punctuation mark: ᜵
 }"
-
-# At runtime the attribute will be stored as Greek small letter mu instead of
-# micro sign because of PEP 3131's NFKC normalization
-class Labware:
-    µL = 1.5
-
-
-assert getattr(Labware(), "µL") == 1.5

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

@@ -15,8 +15,8 @@ use crate::rules::{
     flake8_comprehensions, flake8_datetimez, flake8_debugger, flake8_django,
     flake8_future_annotations, flake8_gettext, flake8_implicit_str_concat, flake8_logging,
     flake8_logging_format, flake8_pie, flake8_print, flake8_pyi, flake8_pytest_style, flake8_self,
-    flake8_simplify, flake8_tidy_imports, flake8_trio, flake8_use_pathlib, flynt, numpy,
-    pandas_vet, pep8_naming, pycodestyle, pyflakes, pygrep_hooks, pylint, pyupgrade, refurb, ruff,
+    flake8_simplify, flake8_tidy_imports, flake8_use_pathlib, flynt, numpy, pandas_vet,
+    pep8_naming, pycodestyle, pyflakes, pygrep_hooks, pylint, pyupgrade, refurb, ruff,
 };
 use crate::settings::types::PythonVersion;
 
@@ -158,9 +158,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                     if checker.enabled(Rule::NumpyDeprecatedFunction) {
                         numpy::rules::deprecated_function(checker, expr);
                     }
-                    if checker.enabled(Rule::Numpy2Deprecation) {
-                        numpy::rules::numpy_2_0_deprecation(checker, expr);
-                    }
                     if checker.enabled(Rule::CollectionsNamedTuple) {
                         flake8_pyi::rules::collections_named_tuple(checker, expr);
                     }
@@ -317,9 +314,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::NumpyDeprecatedFunction) {
                 numpy::rules::deprecated_function(checker, expr);
             }
-            if checker.enabled(Rule::Numpy2Deprecation) {
-                numpy::rules::numpy_2_0_deprecation(checker, expr);
-            }
             if checker.enabled(Rule::DeprecatedMockImport) {
                 pyupgrade::rules::deprecated_mock_attribute(checker, expr);
             }
@@ -466,11 +460,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::OSErrorAlias) {
                 pyupgrade::rules::os_error_alias_call(checker, func);
             }
-            if checker.enabled(Rule::TimeoutErrorAlias) {
-                if checker.settings.target_version >= PythonVersion::Py310 {
-                    pyupgrade::rules::timeout_error_alias_call(checker, func);
-                }
-            }
             if checker.enabled(Rule::NonPEP604Isinstance) {
                 if checker.settings.target_version >= PythonVersion::Py310 {
                     pyupgrade::rules::use_pep604_isinstance(checker, expr, func, args);
@@ -571,9 +560,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::Jinja2AutoescapeFalse) {
                 flake8_bandit::rules::jinja2_autoescape_false(checker, call);
             }
-            if checker.enabled(Rule::MakoTemplates) {
-                flake8_bandit::rules::mako_templates(checker, call);
-            }
             if checker.enabled(Rule::HardcodedPasswordFuncArg) {
                 flake8_bandit::rules::hardcoded_password_func_arg(checker, keywords);
             }
@@ -929,12 +915,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::ImplicitCwd) {
                 refurb::rules::no_implicit_cwd(checker, call);
             }
-            if checker.enabled(Rule::TrioSyncCall) {
-                flake8_trio::rules::sync_call(checker, call);
-            }
-            if checker.enabled(Rule::TrioZeroSleepCall) {
-                flake8_trio::rules::zero_sleep_call(checker, call);
-            }
         }
         Expr::Dict(
             dict @ ast::ExprDict {
@@ -1244,9 +1224,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                     comparators,
                 );
             }
-            if checker.enabled(Rule::TypeNoneComparison) {
-                refurb::rules::type_none_comparison(checker, compare);
-            }
             if checker.enabled(Rule::SingleItemMembershipTest) {
                 refurb::rules::single_item_membership_test(checker, expr, left, ops, comparators);
             }

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

@@ -12,8 +12,8 @@ use crate::rules::{
     airflow, flake8_bandit, flake8_boolean_trap, flake8_bugbear, flake8_builtins, flake8_debugger,
     flake8_django, flake8_errmsg, flake8_import_conventions, flake8_pie, flake8_pyi,
     flake8_pytest_style, flake8_raise, flake8_return, flake8_simplify, flake8_slots,
-    flake8_tidy_imports, flake8_trio, flake8_type_checking, mccabe, pandas_vet, pep8_naming,
-    perflint, pycodestyle, pyflakes, pygrep_hooks, pylint, pyupgrade, refurb, ruff, tryceratops,
+    flake8_tidy_imports, flake8_type_checking, mccabe, pandas_vet, pep8_naming, perflint,
+    pycodestyle, pyflakes, pygrep_hooks, pylint, pyupgrade, refurb, ruff, tryceratops,
 };
 use crate::settings::types::PythonVersion;
 
@@ -356,9 +356,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     flake8_builtins::rules::builtin_variable_shadowing(checker, name, name.range());
                 }
             }
-            if checker.enabled(Rule::TrioAsyncFunctionWithTimeout) {
-                flake8_trio::rules::async_function_with_timeout(checker, function_def);
-            }
             #[cfg(feature = "unreachable-code")]
             if checker.enabled(Rule::UnreachableCode) {
                 checker
@@ -1009,13 +1006,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     pyupgrade::rules::os_error_alias_raise(checker, item);
                 }
             }
-            if checker.enabled(Rule::TimeoutErrorAlias) {
-                if checker.settings.target_version >= PythonVersion::Py310 {
-                    if let Some(item) = exc {
-                        pyupgrade::rules::timeout_error_alias_raise(checker, item);
-                    }
-                }
-            }
             if checker.enabled(Rule::RaiseVanillaClass) {
                 if let Some(expr) = exc {
                     tryceratops::rules::raise_vanilla_class(checker, expr);
@@ -1205,11 +1195,8 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             if checker.enabled(Rule::UselessWithLock) {
                 pylint::rules::useless_with_lock(checker, with_stmt);
             }
-            if checker.enabled(Rule::TrioTimeoutWithoutAwait) {
-                flake8_trio::rules::timeout_without_await(checker, with_stmt, items);
-            }
         }
-        Stmt::While(while_stmt @ ast::StmtWhile { body, orelse, .. }) => {
+        Stmt::While(ast::StmtWhile { body, orelse, .. }) => {
             if checker.enabled(Rule::FunctionUsesLoopVariable) {
                 flake8_bugbear::rules::function_uses_loop_variable(checker, &Node::Stmt(stmt));
             }
@@ -1219,9 +1206,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             if checker.enabled(Rule::TryExceptInLoop) {
                 perflint::rules::try_except_in_loop(checker, body);
             }
-            if checker.enabled(Rule::TrioUnneededSleep) {
-                flake8_trio::rules::unneeded_sleep(checker, while_stmt);
-            }
         }
         Stmt::For(
             for_stmt @ ast::StmtFor {
@@ -1317,11 +1301,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             if checker.enabled(Rule::OSErrorAlias) {
                 pyupgrade::rules::os_error_alias_handlers(checker, handlers);
             }
-            if checker.enabled(Rule::TimeoutErrorAlias) {
-                if checker.settings.target_version >= PythonVersion::Py310 {
-                    pyupgrade::rules::timeout_error_alias_handlers(checker, handlers);
-                }
-            }
             if checker.enabled(Rule::PytestAssertInExcept) {
                 flake8_pytest_style::rules::assert_in_exception_handler(checker, handlers);
             }

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

@@ -1415,7 +1415,7 @@ impl<'a> Checker<'a> {
         // subsequent nodes are evaluated in the inner scope.
         //
         // For example, given:
-        // ```python
+        // ```py
         // class A:
         //     T = range(10)
         //
@@ -1423,7 +1423,7 @@ impl<'a> Checker<'a> {
         // ```
         //
         // Conceptually, this is compiled as:
-        // ```python
+        // ```py
         // class A:
         //     T = range(10)
         //
@@ -1615,28 +1615,38 @@ impl<'a> Checker<'a> {
     fn handle_node_store(&mut self, id: &'a str, expr: &Expr) {
         let parent = self.semantic.current_statement();
 
-        let mut flags = BindingFlags::empty();
-        if helpers::is_unpacking_assignment(parent, expr) {
-            flags.insert(BindingFlags::UNPACKED_ASSIGNMENT);
-        }
-
         // Match the left-hand side of an annotated assignment, like `x` in `x: int`.
         if matches!(
             parent,
             Stmt::AnnAssign(ast::StmtAnnAssign { value: None, .. })
         ) && !self.semantic.in_annotation()
         {
-            self.add_binding(id, expr.range(), BindingKind::Annotation, flags);
+            self.add_binding(
+                id,
+                expr.range(),
+                BindingKind::Annotation,
+                BindingFlags::empty(),
+            );
             return;
         }
 
         if parent.is_for_stmt() {
-            self.add_binding(id, expr.range(), BindingKind::LoopVar, flags);
+            self.add_binding(
+                id,
+                expr.range(),
+                BindingKind::LoopVar,
+                BindingFlags::empty(),
+            );
             return;
         }
 
-        if parent.is_with_stmt() {
-            self.add_binding(id, expr.range(), BindingKind::WithItemVar, flags);
+        if helpers::is_unpacking_assignment(parent, expr) {
+            self.add_binding(
+                id,
+                expr.range(),
+                BindingKind::UnpackedAssignment,
+                BindingFlags::empty(),
+            );
             return;
         }
 
@@ -1671,6 +1681,7 @@ impl<'a> Checker<'a> {
             let (all_names, all_flags) =
                 extract_all_names(parent, |name| self.semantic.is_builtin(name));
 
+            let mut flags = BindingFlags::empty();
             if all_flags.intersects(DunderAllFlags::INVALID_OBJECT) {
                 flags |= BindingFlags::INVALID_ALL_OBJECT;
             }
@@ -1694,11 +1705,21 @@ impl<'a> Checker<'a> {
             .current_expressions()
             .any(Expr::is_named_expr_expr)
         {
-            self.add_binding(id, expr.range(), BindingKind::NamedExprAssignment, flags);
+            self.add_binding(
+                id,
+                expr.range(),
+                BindingKind::NamedExprAssignment,
+                BindingFlags::empty(),
+            );
             return;
         }
 
-        self.add_binding(id, expr.range(), BindingKind::Assignment, flags);
+        self.add_binding(
+            id,
+            expr.range(),
+            BindingKind::Assignment,
+            BindingFlags::empty(),
+        );
     }
 
     fn handle_node_delete(&mut self, expr: &'a Expr) {

crates/ruff_linter/src/checkers/tokens.rs

@@ -141,7 +141,7 @@ pub(crate) fn check_tokens(
         Rule::TrailingCommaOnBareTuple,
         Rule::ProhibitedTrailingComma,
     ]) {
-        flake8_commas::rules::trailing_commas(&mut diagnostics, tokens, locator, indexer);
+        flake8_commas::rules::trailing_commas(&mut diagnostics, tokens, locator);
     }
 
     if settings.rules.enabled(Rule::ExtraneousParentheses) {

crates/ruff_linter/src/codes.rs

@@ -290,13 +290,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Async, "101") => (RuleGroup::Stable, rules::flake8_async::rules::OpenSleepOrSubprocessInAsyncFunction),
         (Flake8Async, "102") => (RuleGroup::Stable, rules::flake8_async::rules::BlockingOsCallInAsyncFunction),
 
-        // flake8-trio
-        (Flake8Trio, "100") => (RuleGroup::Preview, rules::flake8_trio::rules::TrioTimeoutWithoutAwait),
-        (Flake8Trio, "105") => (RuleGroup::Preview, rules::flake8_trio::rules::TrioSyncCall),
-        (Flake8Trio, "109") => (RuleGroup::Preview, rules::flake8_trio::rules::TrioAsyncFunctionWithTimeout),
-        (Flake8Trio, "110") => (RuleGroup::Preview, rules::flake8_trio::rules::TrioUnneededSleep),
-        (Flake8Trio, "115") => (RuleGroup::Preview, rules::flake8_trio::rules::TrioZeroSleepCall),
-
         // flake8-builtins
         (Flake8Builtins, "001") => (RuleGroup::Stable, rules::flake8_builtins::rules::BuiltinVariableShadowing),
         (Flake8Builtins, "002") => (RuleGroup::Stable, rules::flake8_builtins::rules::BuiltinArgumentShadowing),
@@ -504,7 +497,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pyupgrade, "038") => (RuleGroup::Stable, rules::pyupgrade::rules::NonPEP604Isinstance),
         (Pyupgrade, "039") => (RuleGroup::Stable, rules::pyupgrade::rules::UnnecessaryClassParentheses),
         (Pyupgrade, "040") => (RuleGroup::Stable, rules::pyupgrade::rules::NonPEP695TypeAlias),
-        (Pyupgrade, "041") => (RuleGroup::Preview, rules::pyupgrade::rules::TimeoutErrorAlias),
 
         // pydocstyle
         (Pydocstyle, "100") => (RuleGroup::Stable, rules::pydocstyle::rules::UndocumentedPublicModule),
@@ -631,7 +623,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Bandit, "609") => (RuleGroup::Stable, rules::flake8_bandit::rules::UnixCommandWildcardInjection),
         (Flake8Bandit, "612") => (RuleGroup::Stable, rules::flake8_bandit::rules::LoggingConfigInsecureListen),
         (Flake8Bandit, "701") => (RuleGroup::Stable, rules::flake8_bandit::rules::Jinja2AutoescapeFalse),
-        (Flake8Bandit, "702") => (RuleGroup::Preview, rules::flake8_bandit::rules::MakoTemplates),
 
         // flake8-boolean-trap
         (Flake8BooleanTrap, "001") => (RuleGroup::Stable, rules::flake8_boolean_trap::rules::BooleanTypeHintPositionalArgument),
@@ -865,7 +856,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Numpy, "001") => (RuleGroup::Stable, rules::numpy::rules::NumpyDeprecatedTypeAlias),
         (Numpy, "002") => (RuleGroup::Stable, rules::numpy::rules::NumpyLegacyRandom),
         (Numpy, "003") => (RuleGroup::Stable, rules::numpy::rules::NumpyDeprecatedFunction),
-        (Numpy, "201") => (RuleGroup::Preview, rules::numpy::rules::Numpy2Deprecation),
 
         // ruff
         (Ruff, "001") => (RuleGroup::Stable, rules::ruff::rules::AmbiguousUnicodeCharacterString),
@@ -949,7 +939,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Refurb, "145") => (RuleGroup::Preview, rules::refurb::rules::SliceCopy),
         (Refurb, "148") => (RuleGroup::Preview, rules::refurb::rules::UnnecessaryEnumerate),
         (Refurb, "168") => (RuleGroup::Preview, rules::refurb::rules::IsinstanceTypeNone),
-        (Refurb, "169") => (RuleGroup::Preview, rules::refurb::rules::TypeNoneComparison),
         (Refurb, "171") => (RuleGroup::Preview, rules::refurb::rules::SingleItemMembershipTest),
         (Refurb, "177") => (RuleGroup::Preview, rules::refurb::rules::ImplicitCwd),
 

crates/ruff_linter/src/importer/insertion.rs

@@ -189,7 +189,7 @@ impl<'a> Insertion<'a> {
                     Tok::NonLogicalNewline => {}
                     Tok::Indent => {
                         // This is like:
-                        // ```python
+                        // ```py
                         // if True:
                         //     pass
                         // ```

crates/ruff_linter/src/importer/mod.rs

@@ -132,7 +132,11 @@ impl<'a> Importer<'a> {
         )?;
 
         // Import the `TYPE_CHECKING` symbol from the typing module.
-        let (type_checking_edit, type_checking) = self.get_or_import_type_checking(at, semantic)?;
+        let (type_checking_edit, type_checking) = self.get_or_import_symbol(
+            &ImportRequest::import_from("typing", "TYPE_CHECKING"),
+            at,
+            semantic,
+        )?;
 
         // Add the import to a `TYPE_CHECKING` block.
         let add_import_edit = if let Some(block) = self.preceding_type_checking_block(at) {
@@ -157,30 +161,6 @@ impl<'a> Importer<'a> {
         })
     }
 
-    /// Generate an [`Edit`] to reference `typing.TYPE_CHECKING`. Returns the [`Edit`] necessary to
-    /// make the symbol available in the current scope along with the bound name of the symbol.
-    fn get_or_import_type_checking(
-        &self,
-        at: TextSize,
-        semantic: &SemanticModel,
-    ) -> Result<(Edit, String), ResolutionError> {
-        for module in semantic.typing_modules() {
-            if let Some((edit, name)) = self.get_symbol(
-                &ImportRequest::import_from(module, "TYPE_CHECKING"),
-                at,
-                semantic,
-            )? {
-                return Ok((edit, name));
-            }
-        }
-
-        self.import_symbol(
-            &ImportRequest::import_from("typing", "TYPE_CHECKING"),
-            at,
-            semantic,
-        )
-    }
-
     /// Generate an [`Edit`] to reference the given symbol. Returns the [`Edit`] necessary to make
     /// the symbol available in the current scope along with the bound name of the symbol.
     ///
@@ -229,7 +209,7 @@ impl<'a> Importer<'a> {
         // We also add a no-op edit to force conflicts with any other fixes that might try to
         // remove the import. Consider:
         //
-        // ```python
+        // ```py
         // import sys
         //
         // quit()

crates/ruff_linter/src/linter.rs

@@ -8,7 +8,7 @@ use itertools::Itertools;
 use log::error;
 use rustc_hash::FxHashMap;
 
-use ruff_diagnostics::Diagnostic;
+use ruff_diagnostics::{Applicability, Diagnostic};
 use ruff_python_ast::imports::ImportMap;
 use ruff_python_ast::PySourceType;
 use ruff_python_codegen::Stylist;
@@ -268,13 +268,24 @@ pub fn check_path(
     }
 
     // Update fix applicability to account for overrides
-    if !settings.fix_safety.is_empty() {
+    if !settings.extend_safe_fixes.is_empty() || !settings.extend_unsafe_fixes.is_empty() {
         for diagnostic in &mut diagnostics {
             if let Some(fix) = diagnostic.fix.take() {
-                let fixed_applicability = settings
-                    .fix_safety
-                    .resolve_applicability(diagnostic.kind.rule(), fix.applicability());
-                diagnostic.set_fix(fix.with_applicability(fixed_applicability));
+                // Enforce demotions over promotions so if someone puts a rule in both we are conservative
+                if fix.applicability().is_safe()
+                    && settings
+                        .extend_unsafe_fixes
+                        .contains(diagnostic.kind.rule())
+                {
+                    diagnostic.set_fix(fix.with_applicability(Applicability::Unsafe));
+                } else if fix.applicability().is_unsafe()
+                    && settings.extend_safe_fixes.contains(diagnostic.kind.rule())
+                {
+                    diagnostic.set_fix(fix.with_applicability(Applicability::Safe));
+                } else {
+                    // Retain the existing fix (will be dropped from `.take()` otherwise)
+                    diagnostic.set_fix(fix);
+                }
             }
         }
     }

crates/ruff_linter/src/message/diff.rs

@@ -54,9 +54,9 @@ impl Display for Diff<'_> {
 
         let message = match self.fix.applicability() {
             // TODO(zanieb): Adjust this messaging once it's user-facing
-            Applicability::Safe => "Safe fix",
-            Applicability::Unsafe => "Unsafe fix",
-            Applicability::DisplayOnly => "Display-only fix",
+            Applicability::Safe => "Fix",
+            Applicability::Unsafe => "Suggested fix",
+            Applicability::Display => "Possible fix",
         };
         writeln!(f, "ℹ {}", message.blue())?;
 

crates/ruff_linter/src/registry.rs

@@ -64,9 +64,6 @@ pub enum Linter {
     /// [flake8-async](https://pypi.org/project/flake8-async/)
     #[prefix = "ASYNC"]
     Flake8Async,
-    /// [flake8-trio](https://pypi.org/project/flake8-trio/)
-    #[prefix = "TRIO"]
-    Flake8Trio,
     /// [flake8-bandit](https://pypi.org/project/flake8-bandit/)
     #[prefix = "S"]
     Flake8Bandit,

crates/ruff_linter/src/renamer.rs

@@ -245,10 +245,10 @@ impl Renamer {
             | BindingKind::Argument
             | BindingKind::TypeParam
             | BindingKind::NamedExprAssignment
+            | BindingKind::UnpackedAssignment
             | BindingKind::Assignment
             | BindingKind::BoundException
             | BindingKind::LoopVar
-            | BindingKind::WithItemVar
             | BindingKind::Global
             | BindingKind::Nonlocal(_)
             | BindingKind::ClassDefinition(_)

crates/ruff_linter/src/rules/eradicate/detection.rs

@@ -163,15 +163,11 @@ mod tests {
             "# ( user_content_type , _ )= TimelineEvent.objects.using(db_alias).get_or_create(",
             &[]
         ));
-        assert!(comment_contains_code("# )", &[]));
-
-        // This used to return true, but our parser has gotten a bit better
-        // at rejecting invalid Python syntax. And indeed, this is not valid
-        // Python code.
-        assert!(!comment_contains_code(
+        assert!(comment_contains_code(
             "#     app_label=\"core\", model=\"user\"",
             &[]
         ));
+        assert!(comment_contains_code("# )", &[]));
 
         // TODO(charlie): This should be `true` under aggressive mode.
         assert!(!comment_contains_code("#def foo():", &[]));

crates/ruff_linter/src/rules/eradicate/rules/commented_out_code.rs

@@ -66,7 +66,7 @@ pub(crate) fn commented_out_code(
         if is_standalone_comment(line) && comment_contains_code(line, &settings.task_tags[..]) {
             let mut diagnostic = Diagnostic::new(CommentedOutCode, *range);
 
-            diagnostic.set_fix(Fix::display_only_edit(Edit::range_deletion(
+            diagnostic.set_fix(Fix::display_edit(Edit::range_deletion(
                 locator.full_lines_range(*range),
             )));
             diagnostics.push(diagnostic);

crates/ruff_linter/src/rules/eradicate/snapshots/ruff_linter__rules__eradicate__tests__ERA001_ERA001.py.snap

@@ -10,7 +10,7 @@ ERA001.py:1:1: ERA001 Found commented-out code
   |
   = help: Remove commented-out code
 
-ℹ Display-only fix
+ℹ Possible fix
 1   |-#import os
 2 1 | # from foo import junk
 3 2 | #a = 3
@@ -26,7 +26,7 @@ ERA001.py:2:1: ERA001 Found commented-out code
   |
   = help: Remove commented-out code
 
-ℹ Display-only fix
+ℹ Possible fix
 1 1 | #import os
 2   |-# from foo import junk
 3 2 | #a = 3
@@ -44,7 +44,7 @@ ERA001.py:3:1: ERA001 Found commented-out code
   |
   = help: Remove commented-out code
 
-ℹ Display-only fix
+ℹ Possible fix
 1 1 | #import os
 2 2 | # from foo import junk
 3   |-#a = 3
@@ -63,7 +63,7 @@ ERA001.py:5:1: ERA001 Found commented-out code
   |
   = help: Remove commented-out code
 
-ℹ Display-only fix
+ℹ Possible fix
 2 2 | # from foo import junk
 3 3 | #a = 3
 4 4 | a = 4
@@ -82,7 +82,7 @@ ERA001.py:13:5: ERA001 Found commented-out code
    |
    = help: Remove commented-out code
 
-ℹ Display-only fix
+ℹ Possible fix
 10 10 | 
 11 11 |     # This is a real comment.
 12 12 |     # # This is a (nested) comment.
@@ -100,7 +100,7 @@ ERA001.py:21:5: ERA001 Found commented-out code
    |
    = help: Remove commented-out code
 
-ℹ Display-only fix
+ℹ Possible fix
 18 18 | 
 19 19 | class A():
 20 20 |     pass
@@ -120,7 +120,7 @@ ERA001.py:26:5: ERA001 Found commented-out code
    |
    = help: Remove commented-out code
 
-ℹ Display-only fix
+ℹ Possible fix
 23 23 | 
 24 24 | dictionary = {
 25 25 |     # "key1": 123,  # noqa: ERA001
@@ -139,7 +139,7 @@ ERA001.py:27:5: ERA001 Found commented-out code
    |
    = help: Remove commented-out code
 
-ℹ Display-only fix
+ℹ Possible fix
 24 24 | dictionary = {
 25 25 |     # "key1": 123,  # noqa: ERA001
 26 26 |     # "key2": 456,

crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__defaults.snap

@@ -252,7 +252,7 @@ annotation_presence.py:159:9: ANN204 [*] Missing return type annotation for spec
     |
     = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 156 156 | 
 157 157 | class Foo:
 158 158 |     @decorator()
@@ -272,7 +272,7 @@ annotation_presence.py:165:9: ANN204 [*] Missing return type annotation for spec
     |
     = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 162 162 | 
 163 163 | # Regression test for: https://github.com/astral-sh/ruff/issues/7711
 164 164 | class Class:

crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__mypy_init_return.snap

@@ -11,7 +11,7 @@ mypy_init_return.py:5:9: ANN204 [*] Missing return type annotation for special m
   |
   = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 2 2 | 
 3 3 | # Error
 4 4 | class Foo:
@@ -31,7 +31,7 @@ mypy_init_return.py:11:9: ANN204 [*] Missing return type annotation for special
    |
    = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 8  8  | 
 9  9  | # Error
 10 10 | class Foo:
@@ -59,7 +59,7 @@ mypy_init_return.py:47:9: ANN204 [*] Missing return type annotation for special
    |
    = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 44 44 | # Error – used to be ok for a moment since the mere presence
 45 45 | # of a vararg falsely indicated that the function has a typed argument.
 46 46 | class Foo:

crates/ruff_linter/src/rules/flake8_annotations/snapshots/ruff_linter__rules__flake8_annotations__tests__simple_magic_methods.snap

@@ -10,7 +10,7 @@ simple_magic_methods.py:2:9: ANN204 [*] Missing return type annotation for speci
   |
   = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 1 1 | class Foo:
 2   |-    def __str__(self):
   2 |+    def __str__(self) -> str:
@@ -28,7 +28,7 @@ simple_magic_methods.py:5:9: ANN204 [*] Missing return type annotation for speci
   |
   = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 2 2 |     def __str__(self):
 3 3 |         ...
 4 4 | 
@@ -48,7 +48,7 @@ simple_magic_methods.py:8:9: ANN204 [*] Missing return type annotation for speci
   |
   = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 5 5 |     def __repr__(self):
 6 6 |         ...
 7 7 | 
@@ -68,7 +68,7 @@ simple_magic_methods.py:11:9: ANN204 [*] Missing return type annotation for spec
    |
    = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 8  8  |     def __len__(self):
 9  9  |         ...
 10 10 | 
@@ -88,7 +88,7 @@ simple_magic_methods.py:14:9: ANN204 [*] Missing return type annotation for spec
    |
    = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 11 11 |     def __length_hint__(self):
 12 12 |         ...
 13 13 | 
@@ -108,7 +108,7 @@ simple_magic_methods.py:17:9: ANN204 [*] Missing return type annotation for spec
    |
    = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 14 14 |     def __init__(self):
 15 15 |         ...
 16 16 | 
@@ -128,7 +128,7 @@ simple_magic_methods.py:20:9: ANN204 [*] Missing return type annotation for spec
    |
    = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 17 17 |     def __del__(self):
 18 18 |         ...
 19 19 | 
@@ -148,7 +148,7 @@ simple_magic_methods.py:23:9: ANN204 [*] Missing return type annotation for spec
    |
    = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 20 20 |     def __bool__(self):
 21 21 |         ...
 22 22 | 
@@ -168,7 +168,7 @@ simple_magic_methods.py:26:9: ANN204 [*] Missing return type annotation for spec
    |
    = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 23 23 |     def __bytes__(self):
 24 24 |         ...
 25 25 | 
@@ -188,7 +188,7 @@ simple_magic_methods.py:29:9: ANN204 [*] Missing return type annotation for spec
    |
    = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 26 26 |     def __format__(self, format_spec):
 27 27 |         ...
 28 28 | 
@@ -208,7 +208,7 @@ simple_magic_methods.py:32:9: ANN204 [*] Missing return type annotation for spec
    |
    = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 29 29 |     def __contains__(self, item):
 30 30 |         ...
 31 31 | 
@@ -228,7 +228,7 @@ simple_magic_methods.py:35:9: ANN204 [*] Missing return type annotation for spec
    |
    = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 32 32 |     def __complex__(self):
 33 33 |         ...
 34 34 | 
@@ -248,7 +248,7 @@ simple_magic_methods.py:38:9: ANN204 [*] Missing return type annotation for spec
    |
    = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 35 35 |     def __int__(self):
 36 36 |         ...
 37 37 | 
@@ -268,7 +268,7 @@ simple_magic_methods.py:41:9: ANN204 [*] Missing return type annotation for spec
    |
    = help: Add `None` return type
 
-ℹ Unsafe fix
+ℹ Suggested fix
 38 38 |     def __float__(self):
 39 39 |         ...
 40 40 | 

crates/ruff_linter/src/rules/flake8_bandit/mod.rs

@@ -28,7 +28,6 @@ mod tests {
     #[test_case(Rule::HardcodedTempFile, Path::new("S108.py"))]
     #[test_case(Rule::HashlibInsecureHashFunction, Path::new("S324.py"))]
     #[test_case(Rule::Jinja2AutoescapeFalse, Path::new("S701.py"))]
-    #[test_case(Rule::MakoTemplates, Path::new("S702.py"))]
     #[test_case(Rule::LoggingConfigInsecureListen, Path::new("S612.py"))]
     #[test_case(Rule::ParamikoCall, Path::new("S601.py"))]
     #[test_case(Rule::RequestWithNoCertValidation, Path::new("S501.py"))]

crates/ruff_linter/src/rules/flake8_bandit/rules/mako_templates.rs

@@ -1,57 +0,0 @@
-use crate::checkers::ast::Checker;
-use ruff_diagnostics::{Diagnostic, Violation};
-use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::{self as ast};
-use ruff_text_size::Ranged;
-
-/// ## What it does
-/// Checks for uses of the `mako` templates.
-///
-/// ## Why is this bad?
-/// Mako templates allow HTML and JavaScript rendering by default, and are
-/// inherently open to XSS attacks. Ensure variables in all templates are
-/// properly sanitized via the `n`, `h` or `x` flags (depending on context).
-/// For example, to HTML escape the variable `data`, use `${ data |h }`.
-///
-/// ## Example
-/// ```python
-/// from mako.template import Template
-///
-/// Template("hello")
-/// ```
-///
-/// Use instead:
-/// ```python
-/// from mako.template import Template
-///
-/// Template("hello |h")
-/// ```
-///
-/// ## References
-/// - [Mako documentation](https://www.makotemplates.org/)
-/// - [OpenStack security: Cross site scripting XSS](https://security.openstack.org/guidelines/dg_cross-site-scripting-xss.html)
-/// - [Common Weakness Enumeration: CWE-80](https://cwe.mitre.org/data/definitions/80.html)
-#[violation]
-pub struct MakoTemplates;
-
-impl Violation for MakoTemplates {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!(
-            "Mako templates allow HTML and JavaScript rendering by default and are inherently open to XSS attacks"
-        )
-    }
-}
-
-/// S702
-pub(crate) fn mako_templates(checker: &mut Checker, call: &ast::ExprCall) {
-    if checker
-        .semantic()
-        .resolve_call_path(&call.func)
-        .is_some_and(|call_path| matches!(call_path.as_slice(), ["mako", "template", "Template"]))
-    {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(MakoTemplates, call.func.range()));
-    }
-}

crates/ruff_linter/src/rules/flake8_bandit/rules/mod.rs

@@ -11,7 +11,6 @@ pub(crate) use hardcoded_tmp_directory::*;
 pub(crate) use hashlib_insecure_hash_functions::*;
 pub(crate) use jinja2_autoescape_false::*;
 pub(crate) use logging_config_insecure_listen::*;
-pub(crate) use mako_templates::*;
 pub(crate) use paramiko_calls::*;
 pub(crate) use request_with_no_cert_validation::*;
 pub(crate) use request_without_timeout::*;
@@ -38,7 +37,6 @@ mod hardcoded_tmp_directory;
 mod hashlib_insecure_hash_functions;
 mod jinja2_autoescape_false;
 mod logging_config_insecure_listen;
-mod mako_templates;
 mod paramiko_calls;
 mod request_with_no_cert_validation;
 mod request_without_timeout;

crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S702_S702.py.snap

@@ -1,28 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_bandit/mod.rs
----
-S702.py:6:1: S702 Mako templates allow HTML and JavaScript rendering by default and are inherently open to XSS attacks
-  |
-6 | Template("hello")
-  | ^^^^^^^^ S702
-7 | 
-8 | mako.template.Template("hern")
-  |
-
-S702.py:8:1: S702 Mako templates allow HTML and JavaScript rendering by default and are inherently open to XSS attacks
-  |
-6 | Template("hello")
-7 | 
-8 | mako.template.Template("hern")
-  | ^^^^^^^^^^^^^^^^^^^^^^ S702
-9 | template.Template("hern")
-  |
-
-S702.py:9:1: S702 Mako templates allow HTML and JavaScript rendering by default and are inherently open to XSS attacks
-  |
-8 | mako.template.Template("hern")
-9 | template.Template("hern")
-  | ^^^^^^^^^^^^^^^^^ S702
-  |
-
-

crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs

@@ -27,11 +27,6 @@ use crate::checkers::ast::Checker;
 /// raise AssertionError
 /// ```
 ///
-/// ## Fix safety
-/// This rule's fix is marked as unsafe, as changing an `assert` to a
-/// `raise` will change the behavior of your program when running in
-/// optimized mode (`python -O`).
-///
 /// ## References
 /// - [Python documentation: `assert`](https://docs.python.org/3/reference/simple_stmts.html#the-assert-statement)
 #[violation]

crates/ruff_linter/src/rules/flake8_bugbear/rules/function_call_in_argument_default.rs

@@ -50,16 +50,6 @@ use crate::checkers::ast::Checker;
 ///     return arg
 /// ```
 ///
-/// If the use of a singleton is intentional, assign the result call to a
-/// module-level variable, and use that variable in the default argument:
-/// ```python
-/// ERROR = ValueError("Hosts weren't successfully added")
-///
-///
-/// def add_host(error: Exception = ERROR) -> None:
-///     ...
-/// ```
-///
 /// ## Options
 /// - `flake8-bugbear.extend-immutable-calls`
 #[violation]
@@ -72,9 +62,9 @@ impl Violation for FunctionCallInDefaultArgument {
     fn message(&self) -> String {
         let FunctionCallInDefaultArgument { name } = self;
         if let Some(name) = name {
-            format!("Do not perform function call `{name}` in argument defaults; instead, perform the call within the function, or read the default from a module-level singleton variable")
+            format!("Do not perform function call `{name}` in argument defaults")
         } else {
-            format!("Do not perform function call in argument defaults; instead, perform the call within the function, or read the default from a module-level singleton variable")
+            format!("Do not perform function call in argument defaults")
         }
     }
 }

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B004_B004.py.snap

@@ -12,7 +12,7 @@ B004.py:3:8: B004 [*] Using `hasattr(x, "__call__")` to test if x is callable is
   |
   = help: Replace with `callable()`
 
-ℹ Safe fix
+ℹ Fix
 1 1 | def this_is_a_bug():
 2 2 |     o = object()
 3   |-    if hasattr(o, "__call__"):

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_1.py.snap

@@ -12,7 +12,7 @@ B006_1.py:3:22: B006 [*] Do not use mutable data structures for argument default
   |
   = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 1 1 | # Docstring followed by a newline
 2 2 | 
 3   |-def foobar(foor, bar={}):    

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_2.py.snap

@@ -12,7 +12,7 @@ B006_2.py:4:22: B006 [*] Do not use mutable data structures for argument default
   |
   = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 1 1 | # Docstring followed by whitespace with no newline
 2 2 | # Regression test for https://github.com/astral-sh/ruff/issues/7155
 3 3 | 

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_3.py.snap

@@ -10,7 +10,7 @@ B006_3.py:4:22: B006 [*] Do not use mutable data structures for argument default
   |
   = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 1 1 | # Docstring with no newline
 2 2 | 
 3 3 | 

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_4.py.snap

@@ -10,7 +10,7 @@ B006_4.py:7:26: B006 [*] Do not use mutable data structures for argument default
   |
   = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 4  4  | 
 5  5  | 
 6  6  | class FormFeedIndent:

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_5.py.snap

@@ -9,7 +9,7 @@ B006_5.py:5:49: B006 [*] Do not use mutable data structures for argument default
   |
   = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 2 2 | # https://github.com/astral-sh/ruff/issues/7616
 3 3 | 
 4 4 | 
@@ -30,7 +30,7 @@ B006_5.py:9:61: B006 [*] Do not use mutable data structures for argument default
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 6  6  |     import os
 7  7  | 
 8  8  | 
@@ -53,7 +53,7 @@ B006_5.py:15:50: B006 [*] Do not use mutable data structures for argument defaul
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 12 12 |     return 2
 13 13 | 
 14 14 | 
@@ -76,7 +76,7 @@ B006_5.py:21:54: B006 [*] Do not use mutable data structures for argument defaul
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 18 18 |     import itertools
 19 19 | 
 20 20 | 
@@ -98,7 +98,7 @@ B006_5.py:25:55: B006 [*] Do not use mutable data structures for argument defaul
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 22 22 |     from os import path
 23 23 | 
 24 24 | 
@@ -121,7 +121,7 @@ B006_5.py:30:66: B006 [*] Do not use mutable data structures for argument defaul
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 27 27 |     from sys import version_info
 28 28 | 
 29 29 | 
@@ -144,7 +144,7 @@ B006_5.py:35:59: B006 [*] Do not use mutable data structures for argument defaul
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 32 32 |     from sys import version_info
 33 33 | 
 34 34 | 
@@ -167,7 +167,7 @@ B006_5.py:40:49: B006 [*] Do not use mutable data structures for argument defaul
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 37 37 |     import os
 38 38 | 
 39 39 | 
@@ -190,7 +190,7 @@ B006_5.py:45:49: B006 [*] Do not use mutable data structures for argument defaul
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 42 42 |     import os; import sys
 43 43 | 
 44 44 | 
@@ -212,7 +212,7 @@ B006_5.py:50:49: B006 [*] Do not use mutable data structures for argument defaul
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 47 47 |     import os; import sys; x = 1
 48 48 | 
 49 49 | 
@@ -234,7 +234,7 @@ B006_5.py:55:49: B006 [*] Do not use mutable data structures for argument defaul
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 52 52 |     import os; import sys
 53 53 | 
 54 54 | 
@@ -255,7 +255,7 @@ B006_5.py:59:49: B006 [*] Do not use mutable data structures for argument defaul
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 56 56 |     import os; import sys
 57 57 | 
 58 58 | 
@@ -275,7 +275,7 @@ B006_5.py:63:49: B006 [*] Do not use mutable data structures for argument defaul
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 60 60 |     import os; import sys; x = 1
 61 61 | 
 62 62 | 

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_6.py.snap

@@ -11,7 +11,7 @@ B006_6.py:4:22: B006 [*] Do not use mutable data structures for argument default
   |
   = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 1 1 | # Import followed by whitespace with no newline
 2 2 | # Same as B006_2.py, but import instead of docstring
 3 3 | 

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_7.py.snap

@@ -11,7 +11,7 @@ B006_7.py:4:22: B006 [*] Do not use mutable data structures for argument default
   |
   = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 1 1 | # Import with no newline
 2 2 | # Same as B006_3.py, but import instead of docstring
 3 3 | 

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B006_B006_B008.py.snap

@@ -9,7 +9,7 @@ B006_B008.py:63:25: B006 [*] Do not use mutable data structures for argument def
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 60 60 | # Flag mutable literals/comprehensions
 61 61 | 
 62 62 | 
@@ -29,7 +29,7 @@ B006_B008.py:67:30: B006 [*] Do not use mutable data structures for argument def
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 64 64 |     ...
 65 65 | 
 66 66 | 
@@ -51,7 +51,7 @@ B006_B008.py:73:52: B006 [*] Do not use mutable data structures for argument def
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 70 70 | 
 71 71 | class Foo:
 72 72 |     @staticmethod
@@ -74,7 +74,7 @@ B006_B008.py:77:31: B006 [*] Do not use mutable data structures for argument def
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 74 74 |         pass
 75 75 | 
 76 76 | 
@@ -105,7 +105,7 @@ B006_B008.py:85:20: B006 [*] Do not use mutable data structures for argument def
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 82 82 | def single_line_func_wrong(value = {}): ...
 83 83 | 
 84 84 | 
@@ -125,7 +125,7 @@ B006_B008.py:89:20: B006 [*] Do not use mutable data structures for argument def
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 86 86 |     ...
 87 87 | 
 88 88 | 
@@ -145,7 +145,7 @@ B006_B008.py:93:32: B006 [*] Do not use mutable data structures for argument def
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 90 90 |     ...
 91 91 | 
 92 92 | 
@@ -165,7 +165,7 @@ B006_B008.py:97:26: B006 [*] Do not use mutable data structures for argument def
    |
    = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 94  94  |     ...
 95  95  | 
 96  96  | 
@@ -186,7 +186,7 @@ B006_B008.py:102:46: B006 [*] Do not use mutable data structures for argument de
     |
     = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 99  99  | 
 100 100 | 
 101 101 | # N.B. we're also flagging the function call in the comprehension
@@ -206,7 +206,7 @@ B006_B008.py:106:46: B006 [*] Do not use mutable data structures for argument de
     |
     = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 103 103 |     pass
 104 104 | 
 105 105 | 
@@ -226,7 +226,7 @@ B006_B008.py:110:45: B006 [*] Do not use mutable data structures for argument de
     |
     = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 107 107 |     pass
 108 108 | 
 109 109 | 
@@ -246,7 +246,7 @@ B006_B008.py:114:33: B006 [*] Do not use mutable data structures for argument de
     |
     = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 111 111 |     pass
 112 112 | 
 113 113 | 
@@ -268,7 +268,7 @@ B006_B008.py:239:20: B006 [*] Do not use mutable data structures for argument de
     |
     = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 236 236 | 
 237 237 | # B006 and B008
 238 238 | # We should handle arbitrary nesting of these B008.
@@ -290,7 +290,7 @@ B006_B008.py:276:27: B006 [*] Do not use mutable data structures for argument de
     |
     = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 273 273 | 
 274 274 | 
 275 275 | def mutable_annotations(
@@ -317,7 +317,7 @@ B006_B008.py:277:35: B006 [*] Do not use mutable data structures for argument de
     |
     = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 274 274 | 
 275 275 | def mutable_annotations(
 276 276 |     a: list[int] | None = [],
@@ -343,7 +343,7 @@ B006_B008.py:278:62: B006 [*] Do not use mutable data structures for argument de
     |
     = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 275 275 | def mutable_annotations(
 276 276 |     a: list[int] | None = [],
 277 277 |     b: Optional[Dict[int, int]] = {},
@@ -368,7 +368,7 @@ B006_B008.py:279:80: B006 [*] Do not use mutable data structures for argument de
     |
     = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 276 276 |     a: list[int] | None = [],
 277 277 |     b: Optional[Dict[int, int]] = {},
 278 278 |     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
@@ -389,7 +389,7 @@ B006_B008.py:284:52: B006 [*] Do not use mutable data structures for argument de
     |
     = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 281 281 |     pass
 282 282 | 
 283 283 | 
@@ -411,7 +411,7 @@ B006_B008.py:288:52: B006 [*] Do not use mutable data structures for argument de
     |
     = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 285 285 |     """Docstring"""
 286 286 | 
 287 287 | 
@@ -432,7 +432,7 @@ B006_B008.py:293:52: B006 [*] Do not use mutable data structures for argument de
     |
     = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 290 290 |     ...
 291 291 | 
 292 292 | 
@@ -453,7 +453,7 @@ B006_B008.py:297:52: B006 [*] Do not use mutable data structures for argument de
     |
     = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 294 294 |     """Docstring"""; ...
 295 295 | 
 296 296 | 
@@ -476,7 +476,7 @@ B006_B008.py:302:52: B006 [*] Do not use mutable data structures for argument de
     |
     = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 299 299 |         ...
 300 300 | 
 301 301 | 
@@ -508,7 +508,7 @@ B006_B008.py:313:52: B006 [*] Do not use mutable data structures for argument de
     |
     = help: Replace with `None`; initialize within function
 
-ℹ Unsafe fix
+ℹ Suggested fix
 310 310 |     """Docstring"""
 311 311 | 
 312 312 | 

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B007_B007.py.snap

@@ -21,7 +21,7 @@ B007.py:18:13: B007 [*] Loop control variable `k` not used within loop body
    |
    = help: Rename unused `k` to `_k`
 
-ℹ Unsafe fix
+ℹ Suggested fix
 15 15 | 
 16 16 | for i in range(10):
 17 17 |     for j in range(10):
@@ -47,7 +47,7 @@ B007.py:30:13: B007 [*] Loop control variable `k` not used within loop body
    |
    = help: Rename unused `k` to `_k`
 
-ℹ Unsafe fix
+ℹ Suggested fix
 27 27 |                     yield i, (j, (k, l))
 28 28 | 
 29 29 | 
@@ -110,7 +110,7 @@ B007.py:52:14: B007 [*] Loop control variable `bar` not used within loop body
    |
    = help: Rename unused `bar` to `_bar`
 
-ℹ Unsafe fix
+ℹ Suggested fix
 49 49 | 
 50 50 | def f():
 51 51 |     # Fixable.
@@ -142,7 +142,7 @@ B007.py:68:14: B007 [*] Loop control variable `bar` not used within loop body
    |
    = help: Rename unused `bar` to `_bar`
 
-ℹ Unsafe fix
+ℹ Suggested fix
 65 65 | 
 66 66 | def f():
 67 67 |     # Fixable.

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B008_B006_B008.py.snap

@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
 ---
-B006_B008.py:102:61: B008 Do not perform function call `range` in argument defaults; instead, perform the call within the function, or read the default from a module-level singleton variable
+B006_B008.py:102:61: B008 Do not perform function call `range` in argument defaults
     |
 101 | # N.B. we're also flagging the function call in the comprehension
 102 | def list_comprehension_also_not_okay(default=[i**2 for i in range(3)]):
@@ -9,21 +9,21 @@ B006_B008.py:102:61: B008 Do not perform function call `range` in argument defau
 103 |     pass
     |
 
-B006_B008.py:106:64: B008 Do not perform function call `range` in argument defaults; instead, perform the call within the function, or read the default from a module-level singleton variable
+B006_B008.py:106:64: B008 Do not perform function call `range` in argument defaults
     |
 106 | def dict_comprehension_also_not_okay(default={i: i**2 for i in range(3)}):
     |                                                                ^^^^^^^^ B008
 107 |     pass
     |
 
-B006_B008.py:110:60: B008 Do not perform function call `range` in argument defaults; instead, perform the call within the function, or read the default from a module-level singleton variable
+B006_B008.py:110:60: B008 Do not perform function call `range` in argument defaults
     |
 110 | def set_comprehension_also_not_okay(default={i**2 for i in range(3)}):
     |                                                            ^^^^^^^^ B008
 111 |     pass
     |
 
-B006_B008.py:126:39: B008 Do not perform function call `time.time` in argument defaults; instead, perform the call within the function, or read the default from a module-level singleton variable
+B006_B008.py:126:39: B008 Do not perform function call `time.time` in argument defaults
     |
 124 | # B008
 125 | # Flag function calls as default args (including if they are part of a sub-expression)
@@ -32,21 +32,21 @@ B006_B008.py:126:39: B008 Do not perform function call `time.time` in argument d
 127 |     ...
     |
 
-B006_B008.py:130:12: B008 Do not perform function call `dt.datetime.now` in argument defaults; instead, perform the call within the function, or read the default from a module-level singleton variable
+B006_B008.py:130:12: B008 Do not perform function call `dt.datetime.now` in argument defaults
     |
 130 | def f(when=dt.datetime.now() + dt.timedelta(days=7)):
     |            ^^^^^^^^^^^^^^^^^ B008
 131 |     pass
     |
 
-B006_B008.py:134:30: B008 Do not perform function call in argument defaults; instead, perform the call within the function, or read the default from a module-level singleton variable
+B006_B008.py:134:30: B008 Do not perform function call in argument defaults
     |
 134 | def can_even_catch_lambdas(a=(lambda x: x)()):
     |                              ^^^^^^^^^^^^^^^ B008
 135 |     ...
     |
 
-B006_B008.py:239:31: B008 Do not perform function call `dt.datetime.now` in argument defaults; instead, perform the call within the function, or read the default from a module-level singleton variable
+B006_B008.py:239:31: B008 Do not perform function call `dt.datetime.now` in argument defaults
     |
 237 | # B006 and B008
 238 | # We should handle arbitrary nesting of these B008.
@@ -55,7 +55,7 @@ B006_B008.py:239:31: B008 Do not perform function call `dt.datetime.now` in argu
 240 |     pass
     |
 
-B006_B008.py:245:22: B008 Do not perform function call `map` in argument defaults; instead, perform the call within the function, or read the default from a module-level singleton variable
+B006_B008.py:245:22: B008 Do not perform function call `map` in argument defaults
     |
 243 | # Don't flag nested B006 since we can't guarantee that
 244 | # it isn't made mutable by the outer operation.
@@ -64,7 +64,7 @@ B006_B008.py:245:22: B008 Do not perform function call `map` in argument default
 246 |     pass
     |
 
-B006_B008.py:250:19: B008 Do not perform function call `random.randint` in argument defaults; instead, perform the call within the function, or read the default from a module-level singleton variable
+B006_B008.py:250:19: B008 Do not perform function call `random.randint` in argument defaults
     |
 249 | # B008-ception.
 250 | def nested_b008(a=random.randint(0, dt.datetime.now().year)):
@@ -72,7 +72,7 @@ B006_B008.py:250:19: B008 Do not perform function call `random.randint` in argum
 251 |     pass
     |
 
-B006_B008.py:250:37: B008 Do not perform function call `dt.datetime.now` in argument defaults; instead, perform the call within the function, or read the default from a module-level singleton variable
+B006_B008.py:250:37: B008 Do not perform function call `dt.datetime.now` in argument defaults
     |
 249 | # B008-ception.
 250 | def nested_b008(a=random.randint(0, dt.datetime.now().year)):

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B009_B009_B010.py.snap

@@ -11,7 +11,7 @@ B009_B010.py:19:1: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 16 16 | getattr(foo, "__123abc")
 17 17 | 
 18 18 | # Invalid usage
@@ -32,7 +32,7 @@ B009_B010.py:20:1: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 17 17 | 
 18 18 | # Invalid usage
 19 19 | getattr(foo, "bar")
@@ -53,7 +53,7 @@ B009_B010.py:21:1: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 18 18 | # Invalid usage
 19 19 | getattr(foo, "bar")
 20 20 | getattr(foo, "_123abc")
@@ -74,7 +74,7 @@ B009_B010.py:22:1: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 19 19 | getattr(foo, "bar")
 20 20 | getattr(foo, "_123abc")
 21 21 | getattr(foo, "__123abc__")
@@ -95,7 +95,7 @@ B009_B010.py:23:1: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 20 20 | getattr(foo, "_123abc")
 21 21 | getattr(foo, "__123abc__")
 22 22 | getattr(foo, "abc123")
@@ -116,7 +116,7 @@ B009_B010.py:24:15: B009 [*] Do not call `getattr` with a constant attribute val
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 21 21 | getattr(foo, "__123abc__")
 22 22 | getattr(foo, "abc123")
 23 23 | getattr(foo, r"abc123")
@@ -137,7 +137,7 @@ B009_B010.py:25:4: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 22 22 | getattr(foo, "abc123")
 23 23 | getattr(foo, r"abc123")
 24 24 | _ = lambda x: getattr(x, "bar")
@@ -158,7 +158,7 @@ B009_B010.py:27:1: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 24 24 | _ = lambda x: getattr(x, "bar")
 25 25 | if getattr(x, "bar"):
 26 26 |     pass
@@ -179,7 +179,7 @@ B009_B010.py:28:1: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 25 25 | if getattr(x, "bar"):
 26 26 |     pass
 27 27 | getattr(1, "real")
@@ -200,7 +200,7 @@ B009_B010.py:29:1: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 26 26 |     pass
 27 27 | getattr(1, "real")
 28 28 | getattr(1., "real")
@@ -221,7 +221,7 @@ B009_B010.py:30:1: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 27 27 | getattr(1, "real")
 28 28 | getattr(1., "real")
 29 29 | getattr(1.0, "real")
@@ -242,7 +242,7 @@ B009_B010.py:31:1: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 28 28 | getattr(1., "real")
 29 29 | getattr(1.0, "real")
 30 30 | getattr(1j, "real")
@@ -263,7 +263,7 @@ B009_B010.py:32:1: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 29 29 | getattr(1.0, "real")
 30 30 | getattr(1j, "real")
 31 31 | getattr(True, "real")
@@ -284,7 +284,7 @@ B009_B010.py:33:1: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 30 30 | getattr(1j, "real")
 31 31 | getattr(True, "real")
 32 32 | getattr(x := 1, "real")
@@ -304,7 +304,7 @@ B009_B010.py:34:1: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 31 31 | getattr(True, "real")
 32 32 | getattr(x := 1, "real")
 33 33 | getattr(x + y, "real")
@@ -326,7 +326,7 @@ B009_B010.py:58:8: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 55 55 | setattr(foo.bar, r"baz", None)
 56 56 | 
 57 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
@@ -345,7 +345,7 @@ B009_B010.py:65:1: B009 [*] Do not call `getattr` with a constant attribute valu
    |
    = help: Replace `getattr` with attribute access
 
-ℹ Safe fix
+ℹ Fix
 62 62 | setattr(*foo, "bar", None)
 63 63 | 
 64 64 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1739800901

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B010_B009_B010.py.snap

@@ -11,7 +11,7 @@ B009_B010.py:50:1: B010 [*] Do not call `setattr` with a constant attribute valu
    |
    = help: Replace `setattr` with assignment
 
-ℹ Safe fix
+ℹ Fix
 47 47 |     pass
 48 48 | 
 49 49 | # Invalid usage
@@ -32,7 +32,7 @@ B009_B010.py:51:1: B010 [*] Do not call `setattr` with a constant attribute valu
    |
    = help: Replace `setattr` with assignment
 
-ℹ Safe fix
+ℹ Fix
 48 48 | 
 49 49 | # Invalid usage
 50 50 | setattr(foo, "bar", None)
@@ -53,7 +53,7 @@ B009_B010.py:52:1: B010 [*] Do not call `setattr` with a constant attribute valu
    |
    = help: Replace `setattr` with assignment
 
-ℹ Safe fix
+ℹ Fix
 49 49 | # Invalid usage
 50 50 | setattr(foo, "bar", None)
 51 51 | setattr(foo, "_123abc", None)
@@ -74,7 +74,7 @@ B009_B010.py:53:1: B010 [*] Do not call `setattr` with a constant attribute valu
    |
    = help: Replace `setattr` with assignment
 
-ℹ Safe fix
+ℹ Fix
 50 50 | setattr(foo, "bar", None)
 51 51 | setattr(foo, "_123abc", None)
 52 52 | setattr(foo, "__123abc__", None)
@@ -94,7 +94,7 @@ B009_B010.py:54:1: B010 [*] Do not call `setattr` with a constant attribute valu
    |
    = help: Replace `setattr` with assignment
 
-ℹ Safe fix
+ℹ Fix
 51 51 | setattr(foo, "_123abc", None)
 52 52 | setattr(foo, "__123abc__", None)
 53 53 | setattr(foo, "abc123", None)
@@ -115,7 +115,7 @@ B009_B010.py:55:1: B010 [*] Do not call `setattr` with a constant attribute valu
    |
    = help: Replace `setattr` with assignment
 
-ℹ Safe fix
+ℹ Fix
 52 52 | setattr(foo, "__123abc__", None)
 53 53 | setattr(foo, "abc123", None)
 54 54 | setattr(foo, r"abc123", None)