Change the Cargo.toml file

.github/dependabot.yml

@@ -5,10 +5,6 @@ updates:
     schedule:
       interval: "weekly"
     labels: ["internal"]
-    groups:
-      actions:
-        patterns:
-          - "*"
 
   - package-ecosystem: "cargo"
     directory: "/"

.github/workflows/ci.yaml

@@ -95,9 +95,9 @@ jobs:
           rustup target add wasm32-unknown-unknown
       - uses: Swatinem/rust-cache@v2
       - name: "Clippy"
-        run: cargo clippy --workspace --all-targets --all-features --locked -- -D warnings
+        run: cargo clippy --workspace --all-targets --all-features -- -D warnings
       - name: "Clippy (wasm)"
-        run: cargo clippy -p ruff_wasm --target wasm32-unknown-unknown --all-features --locked -- -D warnings
+        run: cargo clippy -p ruff_wasm --target wasm32-unknown-unknown --all-features -- -D warnings
 
   cargo-test-linux:
     runs-on: ubuntu-latest
@@ -215,7 +215,7 @@ jobs:
       }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
@@ -226,7 +226,7 @@ jobs:
           name: ruff
           path: target/debug
 
-      - uses: dawidd6/action-download-artifact@v3
+      - uses: dawidd6/action-download-artifact@v2
         name: Download baseline Ruff binary
         with:
           name: ruff
@@ -338,7 +338,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
@@ -362,7 +362,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: "Install Rust toolchain"
@@ -392,7 +392,7 @@ jobs:
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
         uses: webfactory/ssh-agent@v0.8.0
@@ -455,7 +455,7 @@ jobs:
         with:
           repository: "astral-sh/ruff-lsp"
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 

.github/workflows/docs.yaml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
         uses: webfactory/ssh-agent@v0.8.0

.github/workflows/flake8-to-ruff.yaml

@@ -20,7 +20,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
@@ -43,7 +43,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
@@ -69,7 +69,7 @@ jobs:
         target: [x64, x86]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: ${{ matrix.target }}
@@ -97,7 +97,7 @@ jobs:
         target: [x86_64, i686]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
@@ -124,7 +124,7 @@ jobs:
         target: [aarch64, armv7, s390x, ppc64le, ppc64]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: "Build wheels"
@@ -161,7 +161,7 @@ jobs:
           - i686-unknown-linux-musl
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
@@ -197,7 +197,7 @@ jobs:
             arch: armv7
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: "Build wheels"
@@ -237,7 +237,7 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: wheels
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
       - name: "Publish to PyPi"
         env:
           TWINE_USERNAME: __token__

.github/workflows/pr-comment.yaml

@@ -17,7 +17,7 @@ jobs:
   comment:
     runs-on: ubuntu-latest
     steps:
-      - uses: dawidd6/action-download-artifact@v3
+      - uses: dawidd6/action-download-artifact@v2
         name: Download pull request number
         with:
           name: pr-number
@@ -32,7 +32,7 @@ jobs:
             echo "pr-number=$(<pr-number)" >> $GITHUB_OUTPUT
           fi
 
-      - uses: dawidd6/action-download-artifact@v3
+      - uses: dawidd6/action-download-artifact@v2
         name: "Download ecosystem results"
         id: download-ecosystem-result
         if: steps.pr-number.outputs.pr-number

.github/workflows/release.yaml

@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: "Prep README.md"
@@ -63,7 +63,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
@@ -73,7 +73,7 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: x86_64
-          args: --release --locked --out dist
+          args: --release --out dist
       - name: "Test wheel - x86_64"
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
@@ -103,7 +103,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
@@ -112,7 +112,7 @@ jobs:
       - name: "Build wheels - universal2"
         uses: PyO3/maturin-action@v1
         with:
-          args: --release --locked --target universal2-apple-darwin --out dist
+          args: --release --target universal2-apple-darwin --out dist
       - name: "Test wheel - universal2"
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall
@@ -151,7 +151,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: ${{ matrix.platform.arch }}
@@ -161,7 +161,7 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          args: --release --locked --out dist
+          args: --release --out dist
       - name: "Test wheel"
         if: ${{ !startsWith(matrix.platform.target, 'aarch64') }}
         shell: bash
@@ -199,7 +199,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
@@ -210,7 +210,7 @@ jobs:
         with:
           target: ${{ matrix.target }}
           manylinux: auto
-          args: --release --locked --out dist
+          args: --release --out dist
       - name: "Test wheel"
         if: ${{ startsWith(matrix.target, 'x86_64') }}
         run: |
@@ -258,7 +258,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: "Prep README.md"
@@ -269,7 +269,7 @@ jobs:
           target: ${{ matrix.platform.target }}
           manylinux: auto
           docker-options: ${{ matrix.platform.maturin_docker_options }}
-          args: --release --locked --out dist
+          args: --release --out dist
       - uses: uraimo/run-on-arch-action@v2
         if: matrix.platform.arch != 'ppc64'
         name: Test wheel
@@ -313,7 +313,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
@@ -324,7 +324,7 @@ jobs:
         with:
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
-          args: --release --locked --out dist
+          args: --release --out dist
       - name: "Test wheel"
         if: matrix.target == 'x86_64-unknown-linux-musl'
         uses: addnab/docker-run-action@v3
@@ -332,10 +332,10 @@ jobs:
           image: alpine:latest
           options: -v ${{ github.workspace }}:/io -w /io
           run: |
-            apk add python3
-            python -m venv .venv
-            .venv/bin/pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-            .venv/bin/ruff check --help
+            apk add py3-pip
+            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/dist/ --force-reinstall
+            ruff --help
+            python -m ruff --help
       - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
@@ -369,7 +369,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: "Prep README.md"
@@ -379,7 +379,7 @@ jobs:
         with:
           target: ${{ matrix.platform.target }}
           manylinux: musllinux_1_2
-          args: --release --locked --out dist
+          args: --release --out dist
           docker-options: ${{ matrix.platform.maturin_docker_options }}
       - uses: uraimo/run-on-arch-action@v2
         name: Test wheel
@@ -388,11 +388,10 @@ jobs:
           distro: alpine_latest
           githubToken: ${{ github.token }}
           install: |
-            apk add python3
+            apk add py3-pip
           run: |
-            python -m venv .venv
-            .venv/bin/pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-            .venv/bin/ruff check --help
+            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
+            ruff check --help
       - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:

BREAKING_CHANGES.md

@@ -1,42 +1,5 @@
 # Breaking Changes
 
-## 0.1.9
-
-### `site-packages` is now excluded by default ([#5513](https://github.com/astral-sh/ruff/pull/5513))
-
-Ruff maintains a list of default exclusions, which now consists of the following patterns:
-
-- `.bzr`
-- `.direnv`
-- `.eggs`
-- `.git-rewrite`
-- `.git`
-- `.hg`
-- `.ipynb_checkpoints`
-- `.mypy_cache`
-- `.nox`
-- `.pants.d`
-- `.pyenv`
-- `.pytest_cache`
-- `.pytype`
-- `.ruff_cache`
-- `.svn`
-- `.tox`
-- `.venv`
-- `.vscode`
-- `__pypackages__`
-- `_build`
-- `buck-out`
-- `build`
-- `dist`
-- `node_modules`
-- `site-packages`
-- `venv`
-
-Previously, the `site-packages` directory was not excluded by default. While `site-packages` tends
-to be excluded anyway by virtue of the `.venv` exclusion, this may not be the case when using Ruff
-from VS Code outside a virtual environment.
-
 ## 0.1.0
 
 ### The deprecated `format` setting has been removed

CHANGELOG.md

@@ -1,118 +1,5 @@
 # Changelog
 
-## 0.1.9
-
-### Breaking changes
-
-- Add site-packages to default exclusions ([#9188](https://github.com/astral-sh/ruff/pull/9188))
-
-### Preview features
-
-- Fix: Avoid parenthesizing subscript targets and values ([#9209](https://github.com/astral-sh/ruff/pull/9209))
-- \[`pylint`\] Implement `too-many-locals` (`PLR0914`) ([#9163](https://github.com/astral-sh/ruff/pull/9163))
-- Implement `reimplemented_operator` (FURB118) ([#9171](https://github.com/astral-sh/ruff/pull/9171))
-- Add a rule to detect string members in runtime-evaluated unions ([#9143](https://github.com/astral-sh/ruff/pull/9143))
-- Implement `no_blank_line_before_class_docstring` preview style ([#9154](https://github.com/astral-sh/ruff/pull/9154))
-
-### Rule changes
-
-- `CONSTANT_CASE` variables are improperly flagged for yoda violation (`SIM300`) ([#9164](https://github.com/astral-sh/ruff/pull/9164))
-- \[`flake8-pyi`\] Cover ParamSpecs and TypeVarTuples (`PYI018`) ([#9198](https://github.com/astral-sh/ruff/pull/9198))
-- \[`flake8-bugbear`\] Add fix for `zip-without-explicit-strict` (`B905`) ([#9176](https://github.com/astral-sh/ruff/pull/9176))
-- Add fix to automatically remove `print` and `pprint` statements (`T201`, `T203`) ([#9208](https://github.com/astral-sh/ruff/pull/9208))
-- Prefer `Never` to `NoReturn` in auto-typing in Python >= 3.11 (`ANN201`) ([#9213](https://github.com/astral-sh/ruff/pull/9213))
-
-### Formatter
-
-- `can_omit_optional_parentheses`: Exit early for unparenthesized expressions ([#9125](https://github.com/astral-sh/ruff/pull/9125))
-- Fix `dynamic` mode with doctests so that it doesn't exceed configured line width ([#9129](https://github.com/astral-sh/ruff/pull/9129))
-- Fix `can_omit_optional_parentheses` for expressions with a right most fstring ([#9124](https://github.com/astral-sh/ruff/pull/9124))
-- Add `target_version` to formatter options ([#9220](https://github.com/astral-sh/ruff/pull/9220))
-
-### CLI
-
-- Update `ruff format --check` to display message for already formatted files ([#9153](https://github.com/astral-sh/ruff/pull/9153))
-
-### Bug fixes
-
-- Reverse order of arguments for `operator.contains` ([#9192](https://github.com/astral-sh/ruff/pull/9192))
-- Iterate over lambdas in deferred type annotations ([#9175](https://github.com/astral-sh/ruff/pull/9175))
-- Fix panic in `D208` with multibyte indent ([#9147](https://github.com/astral-sh/ruff/pull/9147))
-- Add support for `NoReturn` in auto-return-typing ([#9206](https://github.com/astral-sh/ruff/pull/9206))
-- Allow removal of `typing` from `exempt-modules` ([#9214](https://github.com/astral-sh/ruff/pull/9214))
-- Avoid `mutable-class-default` violations for Pydantic subclasses ([#9187](https://github.com/astral-sh/ruff/pull/9187))
-- Fix dropped union expressions for piped non-types in `PYI055` autofix ([#9161](https://github.com/astral-sh/ruff/pull/9161))
-- Enable annotation quoting for multi-line expressions ([#9142](https://github.com/astral-sh/ruff/pull/9142))
-- Deduplicate edits when quoting annotations ([#9140](https://github.com/astral-sh/ruff/pull/9140))
-- Prevent invalid utf8 indexing in cell magic detection ([#9146](https://github.com/astral-sh/ruff/pull/9146))
-- Avoid nested quotations in auto-quoting fix ([#9168](https://github.com/astral-sh/ruff/pull/9168))
-- Add base-class inheritance detection to flake8-django rules ([#9151](https://github.com/astral-sh/ruff/pull/9151))
-- Avoid `asyncio-dangling-task` violations on shadowed bindings ([#9215](https://github.com/astral-sh/ruff/pull/9215))
-
-### Documentation
-
-- Fix blog post URL in changelog ([#9119](https://github.com/astral-sh/ruff/pull/9119))
-- Add error suppression hint for multi-line strings ([#9205](https://github.com/astral-sh/ruff/pull/9205))
-- Fix typo in SemanticModel.parent_expression docstring ([#9167](https://github.com/astral-sh/ruff/pull/9167))
-- Document link between import sorting and formatter ([#9117](https://github.com/astral-sh/ruff/pull/9117))
-
-## 0.1.8
-
-This release includes opt-in support for formatting Python snippets within
-docstrings via the `docstring-code-format` setting.
-[Check out the blog post](https://astral.sh/blog/ruff-v0.1.8) for more details!
-
-### Preview features
-
-- Add `"preserve"` quote-style to mimic Black's skip-string-normalization ([#8822](https://github.com/astral-sh/ruff/pull/8822))
-- Implement `prefer_splitting_right_hand_side_of_assignments` preview style ([#8943](https://github.com/astral-sh/ruff/pull/8943))
-- \[`pycodestyle`\] Add fix for `unexpected-spaces-around-keyword-parameter-equals` ([#9072](https://github.com/astral-sh/ruff/pull/9072))
-- \[`pycodestyle`\] Add fix for comment-related whitespace rules ([#9075](https://github.com/astral-sh/ruff/pull/9075))
-- \[`pycodestyle`\] Allow `sys.path` modifications between imports ([#9047](https://github.com/astral-sh/ruff/pull/9047))
-- \[`refurb`\] Implement `hashlib-digest-hex` (`FURB181`) ([#9077](https://github.com/astral-sh/ruff/pull/9077))
-
-### Rule changes
-
-- Allow `flake8-type-checking` rules to automatically quote runtime-evaluated references ([#6001](https://github.com/astral-sh/ruff/pull/6001))
-- Allow transparent cell magics in Jupyter Notebooks ([#8911](https://github.com/astral-sh/ruff/pull/8911))
-- \[`flake8-annotations`\] Avoid `ANN2xx` fixes for abstract methods with empty bodies ([#9034](https://github.com/astral-sh/ruff/pull/9034))
-- \[`flake8-self`\] Ignore underscore references in type annotations ([#9036](https://github.com/astral-sh/ruff/pull/9036))
-- \[`pep8-naming`\] Allow class names when `apps.get_model` is a non-string ([#9065](https://github.com/astral-sh/ruff/pull/9065))
-- \[`pycodestyle`\] Allow `matplotlib.use` calls to intersperse imports ([#9094](https://github.com/astral-sh/ruff/pull/9094))
-- \[`pyflakes`\] Support fixing unused assignments in tuples by renaming variables (`F841`) ([#9107](https://github.com/astral-sh/ruff/pull/9107))
-- \[`pylint`\] Add fix for `subprocess-run-without-check` (`PLW1510`) ([#6708](https://github.com/astral-sh/ruff/pull/6708))
-
-### Formatter
-
-- Add `docstring-code-format` knob to enable docstring snippet formatting ([#8854](https://github.com/astral-sh/ruff/pull/8854))
-- Use double quotes for all docstrings, including single-quoted docstrings ([#9020](https://github.com/astral-sh/ruff/pull/9020))
-- Implement "dynamic" line width mode for docstring code formatting ([#9098](https://github.com/astral-sh/ruff/pull/9098))
-- Support reformatting Markdown code blocks ([#9030](https://github.com/astral-sh/ruff/pull/9030))
-- add support for formatting reStructuredText code snippets ([#9003](https://github.com/astral-sh/ruff/pull/9003))
-- Avoid trailing comma for single-argument with positional separator ([#9076](https://github.com/astral-sh/ruff/pull/9076))
-- Fix handling of trailing target comment ([#9051](https://github.com/astral-sh/ruff/pull/9051))
-
-### CLI
-
-- Hide unsafe fix suggestions when explicitly disabled ([#9095](https://github.com/astral-sh/ruff/pull/9095))
-- Add SARIF support to `--output-format` ([#9078](https://github.com/astral-sh/ruff/pull/9078))
-
-### Bug fixes
-
-- Apply unnecessary index rule prior to enumerate rewrite ([#9012](https://github.com/astral-sh/ruff/pull/9012))
-- \[`flake8-err-msg`\] Allow `EM` fixes even if `msg` variable is defined ([#9059](https://github.com/astral-sh/ruff/pull/9059))
-- \[`flake8-pie`\] Prevent keyword arguments duplication ([#8450](https://github.com/astral-sh/ruff/pull/8450))
-- \[`flake8-pie`\] Respect trailing comma in `unnecessary-dict-kwargs` (`PIE804`) ([#9015](https://github.com/astral-sh/ruff/pull/9015))
-- \[`flake8-raise`\] Avoid removing parentheses on ctypes.WinError ([#9027](https://github.com/astral-sh/ruff/pull/9027))
-- \[`isort`\] Avoid invalid combination of `force-sort-within-types` and `lines-between-types` ([#9041](https://github.com/astral-sh/ruff/pull/9041))
-- \[`isort`\] Ensure that from-style imports are always ordered first in `__future__` ([#9039](https://github.com/astral-sh/ruff/pull/9039))
-- \[`pycodestyle`\] Allow tab indentation before keyword ([#9099](https://github.com/astral-sh/ruff/pull/9099))
-- \[`pylint`\] Ignore `@overrides` and `@overloads` for `too-many-positional` ([#9000](https://github.com/astral-sh/ruff/pull/9000))
-- \[`pyupgrade`\] Enable `printf-string-formatting` fix with comments on right-hand side ([#9037](https://github.com/astral-sh/ruff/pull/9037))
-- \[`refurb`\] Make `math-constant` (`FURB152`) rule more targeted ([#9054](https://github.com/astral-sh/ruff/pull/9054))
-- \[`refurb`\] Support floating-point base in `redundant-log-base` (`FURB163`) ([#9100](https://github.com/astral-sh/ruff/pull/9100))
-- \[`ruff`\] Detect `unused-asyncio-dangling-task` (`RUF006`) on unused assignments ([#9060](https://github.com/astral-sh/ruff/pull/9060))
-
 ## 0.1.7
 
 ### Preview features

CONTRIBUTING.md

@@ -326,18 +326,16 @@ We use an experimental in-house tool for managing releases.
     - 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. Run `cargo check`. This should update the lock file with new versions.
 1. Create a pull request with the changelog and version updates
 1. Merge the PR
-1. Run the [release workflow](https://github.com/astral-sh/ruff/actions/workflows/release.yaml) with:
-    - The new version number (without starting `v`)
-    - The commit hash of the merged release pull request on `main`
+1. Run the release workflow with the version number (without starting `v`) as input. Make sure
+    main has your merged PR as last commit
 1. The release workflow will do the following:
     1. Build all the assets. If this fails (even though we tested in step 4), we haven't tagged or
         uploaded anything, you can restart after pushing a fix.
     1. Upload to PyPI.
     1. Create and push the Git tag (as extracted from `pyproject.toml`). We create the Git tag only
-        after building the wheels and uploading to PyPI, since we can't delete or modify the tag ([#4468](https://github.com/astral-sh/ruff/issues/4468)).
+        after building the wheels and uploading to PyPI, since we can't delete or modify the tag ([#4468](https://github.com/charliermarsh/ruff/issues/4468)).
     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.
@@ -346,10 +344,7 @@ We use an experimental in-house tool for managing releases.
     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. If needed, [update the schemastore](https://github.com/astral-sh/ruff/blob/main/scripts/update_schemastore.py).
-    1. One can determine if an update is needed when
-        `git diff old-version-tag new-version-tag -- ruff.schema.json` returns a non-empty diff.
-    1. Once run successfully, you should follow the link in the output to create a PR.
+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
@@ -561,10 +556,10 @@ examples.
 
 #### Linux
 
-Install `perf` and build `ruff_benchmark` with the `profiling` profile and then run it with perf
+Install `perf` and build `ruff_benchmark` with the `release-debug` profile and then run it with perf
 
 ```shell
-cargo bench -p ruff_benchmark --no-run --profile=profiling && perf record --call-graph dwarf -F 9999 cargo bench -p ruff_benchmark --profile=profiling -- --profile-time=1
+cargo bench -p ruff_benchmark --no-run --profile=release-debug && perf record --call-graph dwarf -F 9999 cargo bench -p ruff_benchmark --profile=release-debug -- --profile-time=1
 ```
 
 You can also use the `ruff_dev` launcher to run `ruff check` multiple times on a repository to
@@ -572,8 +567,8 @@ gather enough samples for a good flamegraph (change the 999, the sample rate, an
 of checks, to your liking)
 
 ```shell
-cargo build --bin ruff_dev --profile=profiling
-perf record -g -F 999 target/profiling/ruff_dev repeat --repeat 30 --exit-zero --no-cache path/to/cpython > /dev/null
+cargo build --bin ruff_dev --profile=release-debug
+perf record -g -F 999 target/release-debug/ruff_dev repeat --repeat 30 --exit-zero --no-cache path/to/cpython > /dev/null
 ```
 
 Then convert the recorded profile
@@ -603,7 +598,7 @@ cargo install cargo-instruments
 Then run the profiler with
 
 ```shell
-cargo instruments -t time --bench linter --profile profiling -p ruff_benchmark -- --profile-time=1
+cargo instruments -t time --bench linter --profile release-debug -p ruff_benchmark -- --profile-time=1
 ```
 
 - `-t`: Specifies what to profile. Useful options are `time` to profile the wall time and `alloc`

Cargo.lock

@@ -16,15 +16,14 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.8.6"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
 dependencies = [
  "cfg-if",
  "getrandom",
  "once_cell",
  "version_check",
- "zerocopy",
 ]
 
 [[package]]
@@ -123,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.76"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "argfile"
@@ -234,9 +233,9 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 
 [[package]]
 name = "cachedir"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4703f3937077db8fa35bee3c8789343c1aec2585f0146f09d658d4ccc0e8d873"
+checksum = "e236bf5873ea57ec2877445297f4da008916bfae51567131acfc54a073d694f3"
 dependencies = [
  "tempfile",
 ]
@@ -382,7 +381,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -434,10 +433,11 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "colored"
-version = "2.1.0"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
+checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
 dependencies = [
+ "is-terminal",
  "lazy_static",
  "windows-sys 0.48.0",
 ]
@@ -606,7 +606,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -617,7 +617,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -735,9 +735,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
 name = "env_logger"
-version = "0.10.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
+checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
 dependencies = [
  "humantime",
  "is-terminal",
@@ -790,14 +790,14 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.23"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.4.1",
- "windows-sys 0.52.0",
+ "redox_syscall 0.3.5",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -808,7 +808,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.1.9"
+version = "0.1.7"
 dependencies = [
  "anyhow",
  "clap",
@@ -817,7 +817,7 @@ dependencies = [
  "itertools 0.11.0",
  "log",
  "once_cell",
- "pep440_rs 0.4.0",
+ "pep440_rs",
  "pretty_assertions",
  "regex",
  "ruff_linter",
@@ -827,7 +827,7 @@ dependencies = [
  "serde_json",
  "strum",
  "strum_macros",
- "toml",
+ "toml 0.7.8",
 ]
 
 [[package]]
@@ -997,16 +997,17 @@ dependencies = [
 
 [[package]]
 name = "ignore"
-version = "0.4.21"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060"
+checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
 dependencies = [
- "crossbeam-deque",
  "globset",
+ "lazy_static",
  "log",
  "memchr",
- "regex-automata 0.4.3",
+ "regex",
  "same-file",
+ "thread_local",
  "walkdir",
  "winapi-util",
 ]
@@ -1121,15 +1122,15 @@ dependencies = [
 
 [[package]]
 name = "is-macro"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc74b7abae208af9314a406bd7dcc65091230b6e749c09e07a645885fecf34f9"
+checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e"
 dependencies = [
  "Inflector",
  "pmutil 0.6.1",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -1480,9 +1481,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "oorandom"
@@ -1603,18 +1604,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "pep440_rs"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c29f9c43de378b4e4e0cd7dbcce0e5cfb80443de8c05620368b2948bc936a1"
-dependencies = [
- "once_cell",
- "regex",
- "serde",
- "unicode-width",
-]
-
 [[package]]
 name = "pep508_rs"
 version = "0.2.1"
@@ -1622,7 +1611,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0713d7bb861ca2b7d4c50a38e1f31a4b63a2e2df35ef1e5855cc29e108453e2"
 dependencies = [
  "once_cell",
- "pep440_rs 0.3.12",
+ "pep440_rs",
  "regex",
  "serde",
  "thiserror",
@@ -1719,7 +1708,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -1804,9 +1793,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.71"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8"
+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
 dependencies = [
  "unicode-ident",
 ]
@@ -1818,10 +1807,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46d4a5e69187f23a29f8aa0ea57491d104ba541bc55f76552c2a74962aa20e04"
 dependencies = [
  "indexmap",
- "pep440_rs 0.3.12",
+ "pep440_rs",
  "pep508_rs",
  "serde",
- "toml",
+ "toml 0.8.2",
 ]
 
 [[package]]
@@ -2073,7 +2062,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_cli"
-version = "0.1.9"
+version = "0.1.7"
 dependencies = [
  "annotate-snippets 0.9.2",
  "anyhow",
@@ -2165,7 +2154,7 @@ dependencies = [
  "strum",
  "strum_macros",
  "tempfile",
- "toml",
+ "toml 0.7.8",
  "tracing",
  "tracing-indicatif",
  "tracing-subscriber",
@@ -2209,7 +2198,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.1.9"
+version = "0.1.7"
 dependencies = [
  "aho-corasick",
  "annotate-snippets 0.9.2",
@@ -2232,7 +2221,7 @@ dependencies = [
  "once_cell",
  "path-absolutize",
  "pathdiff",
- "pep440_rs 0.4.0",
+ "pep440_rs",
  "pretty_assertions",
  "pyproject-toml",
  "quick-junit",
@@ -2265,11 +2254,10 @@ dependencies = [
  "tempfile",
  "test-case",
  "thiserror",
- "toml",
+ "toml 0.7.8",
  "typed-arena",
  "unicode-width",
  "unicode_names2",
- "url",
  "wsl",
 ]
 
@@ -2281,7 +2269,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "ruff_python_trivia",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2462,7 +2450,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_shrinking"
-version = "0.1.9"
+version = "0.1.7"
 dependencies = [
  "anyhow",
  "clap",
@@ -2538,7 +2526,7 @@ dependencies = [
  "log",
  "once_cell",
  "path-absolutize",
- "pep440_rs 0.4.0",
+ "pep440_rs",
  "regex",
  "ruff_cache",
  "ruff_formatter",
@@ -2553,7 +2541,7 @@ dependencies = [
  "shellexpand",
  "strum",
  "tempfile",
- "toml",
+ "toml 0.7.8",
 ]
 
 [[package]]
@@ -2688,18 +2676,18 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde-wasm-bindgen"
-version = "0.6.3"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b713f70513ae1f8d92665bbbbda5c295c2cf1da5542881ae5eefe20c9af132"
+checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d"
 dependencies = [
  "js-sys",
  "serde",
@@ -2708,13 +2696,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2741,9 +2729,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
 dependencies = [
  "serde",
 ]
@@ -2776,7 +2764,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2880,7 +2868,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2896,9 +2884,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.40"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2968,9 +2956,9 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "test-case"
-version = "3.3.1"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8"
+checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425"
 dependencies = [
  "test-case-macros",
 ]
@@ -2985,7 +2973,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -2997,28 +2985,28 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
  "test-case-core",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.51"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.51"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -3103,30 +3091,55 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "toml"
-version = "0.8.8"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.20.2",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.21.0"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
  "indexmap",
  "serde",
@@ -3155,7 +3168,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -3170,9 +3183,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-indicatif"
-version = "0.3.6"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069580424efe11d97c3fef4197fa98c004fa26672cc71ad8770d224e23b1951d"
+checksum = "57e05fe4a1c906d94b275d8aeb8ff8b9deaca502aeb59ae8ab500a92b8032ac8"
 dependencies = [
  "indicatif",
  "tracing",
@@ -3292,9 +3305,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "unicode_names2"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac64ef2f016dc69dfa8283394a70b057066eb054d5fcb6b9eb17bd2ec5097211"
+checksum = "5d5506ae2c3c1ccbdf468e52fc5ef536c2ccd981f01273a4cb81aa61021f3a5f"
 dependencies = [
  "phf",
  "unicode_names2_generator",
@@ -3302,9 +3315,9 @@ dependencies = [
 
 [[package]]
 name = "unicode_names2_generator"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "013f6a731e80f3930de580e55ba41dfa846de4e0fdee4a701f97989cb1597d6a"
+checksum = "b6dfc680313e95bc6637fa278cd7a22390c3c2cd7b8b2bd28755bc6c0fc811e7"
 dependencies = [
  "getopts",
  "log",
@@ -3373,7 +3386,7 @@ checksum = "f49e7f3f3db8040a100710a11932239fd30697115e2ba4107080d8252939845e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -3467,15 +3480,15 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.39"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
+checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3501,7 +3514,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -3514,9 +3527,9 @@ checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.39"
+version = "0.3.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cf9242c0d27999b831eae4767b2a146feb0b27d332d553e605864acd2afd403"
+checksum = "c6433b7c56db97397842c46b67e11873eda263170afeb3a2dc74a7cb370fee0d"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -3528,13 +3541,13 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.39"
+version = "0.3.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89"
+checksum = "493fcbab756bb764fa37e6bee8cec2dd709eb4273d06d0c282a5e74275ded735"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -3631,15 +3644,6 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.0",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -3670,21 +3674,6 @@ dependencies = [
  "windows_x86_64_msvc 0.48.5",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
-]
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -3697,12 +3686,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -3715,12 +3698,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -3733,12 +3710,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -3751,12 +3722,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -3769,12 +3734,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -3787,12 +3746,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -3805,12 +3758,6 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
-
 [[package]]
 name = "winnow"
 version = "0.5.15"
@@ -3849,23 +3796,3 @@ checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
 dependencies = [
  "winapi",
 ]
-
-[[package]]
-name = "zerocopy"
-version = "0.7.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.40",
-]

Cargo.toml

@@ -9,32 +9,32 @@ homepage = "https://docs.astral.sh/ruff"
 documentation = "https://docs.astral.sh/ruff"
 repository = "https://github.com/astral-sh/ruff"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
-license = "MIT"
+license = "MIT2"
 
 [workspace.dependencies]
-anyhow = { version = "1.0.76" }
+anyhow = { version = "1.0.69" }
 bitflags = { version = "2.4.1" }
 chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
 clap = { version = "4.4.7", features = ["derive"] }
-colored = { version = "2.1.0" }
-filetime = { version = "0.2.23" }
+colored = { version = "2.0.0" }
+filetime = { version = "0.2.20" }
 glob = { version = "0.3.1" }
 globset = { version = "0.4.14" }
-ignore = { version = "0.4.21" }
+ignore = { version = "0.4.20" }
 insta = { version = "1.34.0", feature = ["filters", "glob"] }
-is-macro = { version = "0.3.1" }
+is-macro = { version = "0.3.0" }
 itertools = { version = "0.11.0" }
 libcst = { version = "1.1.0", default-features = false }
 log = { version = "0.4.17" }
 memchr = { version = "2.6.4" }
-once_cell = { version = "1.19.0" }
+once_cell = { version = "1.17.1" }
 path-absolutize = { version = "3.1.1" }
-proc-macro2 = { version = "1.0.71" }
+proc-macro2 = { version = "1.0.70" }
 quote = { version = "1.0.23" }
 regex = { version = "1.10.2" }
 rustc-hash = { version = "1.1.0" }
 schemars = { version = "0.8.16" }
-serde = { version = "1.0.193", features = ["derive"] }
+serde = { version = "1.0.190", features = ["derive"] }
 serde_json = { version = "1.0.108" }
 shellexpand = { version = "3.0.0" }
 similar = { version = "2.3.0", features = ["inline"] }
@@ -42,15 +42,15 @@ smallvec = { version = "1.11.2" }
 static_assertions = "1.1.0"
 strum = { version = "0.25.0", features = ["strum_macros"] }
 strum_macros = { version = "0.25.3" }
-syn = { version = "2.0.40" }
-test-case = { version = "3.3.1" }
-thiserror = { version = "1.0.51" }
-toml = { version = "0.8.8" }
+syn = { version = "2.0.39" }
+test-case = { version = "3.2.1" }
+thiserror = { version = "1.0.50" }
+toml = { version = "0.7.8" }
 tracing = { version = "0.1.40" }
-tracing-indicatif = { version = "0.3.6" }
+tracing-indicatif = { version = "0.3.4" }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 unicode-ident = { version = "1.0.12" }
-unicode_names2 = { version = "1.2.1" }
+unicode_names2 = { version = "1.2.0" }
 unicode-width = { version = "0.1.11" }
 uuid = { version = "1.6.1", features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
 wsl = { version = "0.1.0" }
@@ -88,20 +88,7 @@ rc_mutex = "warn"
 rest_pat_in_fully_bound_structs = "warn"
 
 [profile.release]
-# Note that we set these explicitly, and these values
-# were chosen based on a trade-off between compile times
-# and runtime performance[1].
-#
-# [1]: https://github.com/astral-sh/ruff/pull/9031
-lto = "thin"
-codegen-units = 16
-
-# Some crates don't change as much but benefit more from
-# more expensive optimization passes, so we selectively
-# decrease codegen-units in some cases.
-[profile.release.package.ruff_python_parser]
-codegen-units = 1
-[profile.release.package.ruff_python_ast]
+lto = "fat"
 codegen-units = 1
 
 [profile.dev.package.insta]
@@ -115,8 +102,8 @@ opt-level = 3
 [profile.dev.package.ruff_python_parser]
 opt-level = 1
 
-# Use the `--profile profiling` flag to show symbols in release mode.
-# e.g. `cargo build --profile profiling`
-[profile.profiling]
+# Use the `--profile release-debug` flag to show symbols in release mode.
+# e.g. `cargo build --profile release-debug`
+[profile.release-debug]
 inherits = "release"
 debug = 1

README.md

@@ -150,7 +150,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.1.9
+  rev: v0.1.7
   hooks:
     # Run the linter.
     - id: ruff
@@ -194,25 +194,20 @@ exclude = [
     ".git",
     ".git-rewrite",
     ".hg",
-    ".ipynb_checkpoints",
     ".mypy_cache",
     ".nox",
     ".pants.d",
-    ".pyenv",
-    ".pytest_cache",
     ".pytype",
     ".ruff_cache",
     ".svn",
     ".tox",
     ".venv",
-    ".vscode",
     "__pypackages__",
     "_build",
     "buck-out",
     "build",
     "dist",
     "node_modules",
-    "site-packages",
     "venv",
 ]
 

crates/flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.1.9"
+version = "0.1.7"
 description = """
 Convert Flake8 configuration files to Ruff configuration files.
 """
@@ -23,7 +23,7 @@ configparser = { version = "3.0.3" }
 itertools = { workspace = true }
 log = { workspace = true }
 once_cell = { workspace = true }
-pep440_rs = { version = "0.4.0", features = ["serde"] }
+pep440_rs = { version = "0.3.12", features = ["serde"] }
 regex = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }

crates/ruff_benchmark/benches/linter.rs

@@ -2,7 +2,7 @@ use ruff_benchmark::criterion::{
     criterion_group, criterion_main, BenchmarkGroup, BenchmarkId, Criterion, Throughput,
 };
 use ruff_benchmark::{TestCase, TestFile, TestFileDownloadError};
-use ruff_linter::linter::{lint_only, ParseSource};
+use ruff_linter::linter::lint_only;
 use ruff_linter::rule_selector::PreviewOptions;
 use ruff_linter::settings::rule_table::RuleTable;
 use ruff_linter::settings::types::PreviewMode;
@@ -10,7 +10,6 @@ use ruff_linter::settings::{flags, LinterSettings};
 use ruff_linter::source_kind::SourceKind;
 use ruff_linter::{registry::Rule, RuleSelector};
 use ruff_python_ast::PySourceType;
-use ruff_python_parser::{lexer, parse_program_tokens, Mode};
 
 #[cfg(target_os = "windows")]
 #[global_allocator]
@@ -54,13 +53,7 @@ fn benchmark_linter(mut group: BenchmarkGroup, settings: &LinterSettings) {
             BenchmarkId::from_parameter(case.name()),
             &case,
             |b, case| {
-                // Tokenize the source.
-                let tokens = lexer::lex(case.code(), Mode::Module).collect::<Vec<_>>();
-
-                // Parse the source.
-                let ast =
-                    parse_program_tokens(tokens.clone(), case.code(), case.name(), false).unwrap();
-
+                let kind = SourceKind::Python(case.code().to_string());
                 b.iter(|| {
                     let path = case.path();
                     let result = lint_only(
@@ -68,12 +61,8 @@ fn benchmark_linter(mut group: BenchmarkGroup, settings: &LinterSettings) {
                         None,
                         settings,
                         flags::Noqa::Enabled,
-                        &SourceKind::Python(case.code().to_string()),
+                        &kind,
                         PySourceType::from(path.as_path()),
-                        ParseSource::Precomputed {
-                            tokens: &tokens,
-                            ast: &ast,
-                        },
                     );
 
                     // Assert that file contains no parse errors

crates/ruff_cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_cli"
-version = "0.1.9"
+version = "0.1.7"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -33,7 +33,7 @@ anyhow = { workspace = true }
 argfile = { version = "0.1.6" }
 bincode = { version = "1.3.3" }
 bitflags = { workspace = true }
-cachedir = { version = "0.3.1" }
+cachedir = { version = "0.3.0" }
 chrono = { workspace = true }
 clap = { workspace = true, features = ["derive", "env"] }
 clap_complete_command = { version = "0.5.1" }

crates/ruff_cli/src/commands/format.rs

@@ -515,7 +515,7 @@ impl<'a> FormatResults<'a> {
         if changed > 0 && unchanged > 0 {
             writeln!(
                 f,
-                "{} file{} {}, {} file{} {}",
+                "{} file{} {}, {} file{} left unchanged",
                 changed,
                 if changed == 1 { "" } else { "s" },
                 match self.mode {
@@ -524,10 +524,6 @@ impl<'a> FormatResults<'a> {
                 },
                 unchanged,
                 if unchanged == 1 { "" } else { "s" },
-                match self.mode {
-                    FormatMode::Write => "left unchanged",
-                    FormatMode::Check | FormatMode::Diff => "already formatted",
-                },
             )
         } else if changed > 0 {
             writeln!(
@@ -543,13 +539,9 @@ impl<'a> FormatResults<'a> {
         } else if unchanged > 0 {
             writeln!(
                 f,
-                "{} file{} {}",
+                "{} file{} left unchanged",
                 unchanged,
                 if unchanged == 1 { "" } else { "s" },
-                match self.mode {
-                    FormatMode::Write => "left unchanged",
-                    FormatMode::Check | FormatMode::Diff => "already formatted",
-                },
             )
         } else {
             Ok(())

crates/ruff_cli/src/diagnostics.rs

@@ -12,7 +12,7 @@ use rustc_hash::FxHashMap;
 
 use crate::cache::{Cache, FileCacheKey, LintCacheData};
 use ruff_diagnostics::Diagnostic;
-use ruff_linter::linter::{lint_fix, lint_only, FixTable, FixerResult, LinterResult, ParseSource};
+use ruff_linter::linter::{lint_fix, lint_only, FixTable, FixerResult, LinterResult};
 use ruff_linter::logging::DisplayParseError;
 use ruff_linter::message::Message;
 use ruff_linter::pyproject_toml::lint_pyproject_toml;
@@ -303,28 +303,12 @@ pub(crate) fn lint_path(
             (result, fixed)
         } else {
             // If we fail to fix, lint the original source code.
-            let result = lint_only(
-                path,
-                package,
-                settings,
-                noqa,
-                &source_kind,
-                source_type,
-                ParseSource::None,
-            );
+            let result = lint_only(path, package, settings, noqa, &source_kind, source_type);
             let fixed = FxHashMap::default();
             (result, fixed)
         }
     } else {
-        let result = lint_only(
-            path,
-            package,
-            settings,
-            noqa,
-            &source_kind,
-            source_type,
-            ParseSource::None,
-        );
+        let result = lint_only(path, package, settings, noqa, &source_kind, source_type);
         let fixed = FxHashMap::default();
         (result, fixed)
     };
@@ -460,7 +444,6 @@ pub(crate) fn lint_stdin(
                 noqa,
                 &source_kind,
                 source_type,
-                ParseSource::None,
             );
             let fixed = FxHashMap::default();
 
@@ -479,7 +462,6 @@ pub(crate) fn lint_stdin(
             noqa,
             &source_kind,
             source_type,
-            ParseSource::None,
         );
         let fixed = FxHashMap::default();
         (result, fixed)

crates/ruff_cli/src/printer.rs

@@ -13,7 +13,7 @@ use ruff_linter::fs::relativize_path;
 use ruff_linter::logging::LogLevel;
 use ruff_linter::message::{
     AzureEmitter, Emitter, EmitterContext, GithubEmitter, GitlabEmitter, GroupedEmitter,
-    JsonEmitter, JsonLinesEmitter, JunitEmitter, PylintEmitter, SarifEmitter, TextEmitter,
+    JsonEmitter, JsonLinesEmitter, JunitEmitter, PylintEmitter, TextEmitter,
 };
 use ruff_linter::notify_user;
 use ruff_linter::registry::{AsRule, Rule};
@@ -125,7 +125,15 @@ impl Printer {
                 if let Some(fixables) = fixables {
                     let fix_prefix = format!("[{}]", "*".cyan());
 
-                    if self.unsafe_fixes.is_hint() {
+                    if self.unsafe_fixes.is_enabled() {
+                        if fixables.applicable > 0 {
+                            writeln!(
+                                writer,
+                                "{fix_prefix} {} fixable with the --fix option.",
+                                fixables.applicable
+                            )?;
+                        }
+                    } else {
                         if fixables.applicable > 0 && fixables.unapplicable_unsafe > 0 {
                             let es = if fixables.unapplicable_unsafe == 1 {
                                 ""
@@ -155,14 +163,6 @@ impl Printer {
                                 fixables.unapplicable_unsafe
                             )?;
                         }
-                    } else {
-                        if fixables.applicable > 0 {
-                            writeln!(
-                                writer,
-                                "{fix_prefix} {} fixable with the --fix option.",
-                                fixables.applicable
-                            )?;
-                        }
                     }
                 }
             } else {
@@ -291,9 +291,6 @@ impl Printer {
             SerializationFormat::Azure => {
                 AzureEmitter.emit(writer, &diagnostics.messages, &context)?;
             }
-            SerializationFormat::Sarif => {
-                SarifEmitter.emit(writer, &diagnostics.messages, &context)?;
-            }
         }
 
         writer.flush()?;

crates/ruff_cli/tests/format.rs

@@ -139,99 +139,6 @@ if condition:
     Ok(())
 }
 
-#[test]
-fn docstring_options() -> Result<()> {
-    let tempdir = TempDir::new()?;
-    let ruff_toml = tempdir.path().join("ruff.toml");
-    fs::write(
-        &ruff_toml,
-        r#"
-[format]
-docstring-code-format = true
-docstring-code-line-length = 20
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .args(["format", "--config"])
-        .arg(&ruff_toml)
-        .arg("-")
-        .pass_stdin(r#"
-def f(x):
-    '''
-    Something about `f`. And an example:
-
-    .. code-block:: python
-
-        foo, bar, quux = this_is_a_long_line(lion, hippo, lemur, bear)
-
-    Another example:
-
-    ```py
-    foo, bar, quux = this_is_a_long_line(lion, hippo, lemur, bear)
-    ```
-
-    And another:
-
-    >>> foo, bar, quux = this_is_a_long_line(lion, hippo, lemur, bear)
-    '''
-    pass
-"#), @r###"
-success: true
-exit_code: 0
------ stdout -----
-def f(x):
-    """
-    Something about `f`. And an example:
-
-    .. code-block:: python
-
-        (
-            foo,
-            bar,
-            quux,
-        ) = this_is_a_long_line(
-            lion,
-            hippo,
-            lemur,
-            bear,
-        )
-
-    Another example:
-
-    ```py
-    (
-        foo,
-        bar,
-        quux,
-    ) = this_is_a_long_line(
-        lion,
-        hippo,
-        lemur,
-        bear,
-    )
-    ```
-
-    And another:
-
-    >>> (
-    ...     foo,
-    ...     bar,
-    ...     quux,
-    ... ) = this_is_a_long_line(
-    ...     lion,
-    ...     hippo,
-    ...     lemur,
-    ...     bear,
-    ... )
-    """
-    pass
-
------ stderr -----
-"###);
-    Ok(())
-}
-
 #[test]
 fn mixed_line_endings() -> Result<()> {
     let tempdir = TempDir::new()?;
@@ -255,7 +162,7 @@ fn mixed_line_endings() -> Result<()> {
     ----- stdout -----
 
     ----- stderr -----
-    2 files already formatted
+    2 files left unchanged
     "###);
     Ok(())
 }
@@ -328,60 +235,6 @@ OTHER = "OTHER"
     Ok(())
 }
 
-#[test]
-fn messages() -> Result<()> {
-    let tempdir = TempDir::new()?;
-
-    fs::write(
-        tempdir.path().join("main.py"),
-        r#"
-from test import say_hy
-
-if __name__ == "__main__":
-    say_hy("dear Ruff contributor")
-"#,
-    )?;
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(["format", "--no-cache", "--isolated", "--check"])
-        .arg("main.py"), @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    Would reformat: main.py
-    1 file would be reformatted
-
-    ----- stderr -----
-    "###);
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(["format", "--no-cache", "--isolated"])
-        .arg("main.py"), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    1 file reformatted
-
-    ----- stderr -----
-    "###);
-
-    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
-        .current_dir(tempdir.path())
-        .args(["format", "--no-cache", "--isolated"])
-        .arg("main.py"), @r###"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    1 file left unchanged
-
-    ----- stderr -----
-    "###);
-
-    Ok(())
-}
-
 #[test]
 fn force_exclude() -> Result<()> {
     let tempdir = TempDir::new()?;
@@ -930,7 +783,7 @@ fn test_diff() {
 
 
         ----- stderr -----
-        2 files would be reformatted, 1 file already formatted
+        2 files would be reformatted, 1 file left unchanged
         "###);
     });
 }

crates/ruff_cli/tests/integration_test.rs

@@ -1158,44 +1158,6 @@ fn check_hints_hidden_unsafe_fixes_with_no_safe_fixes() {
     "###);
 }
 
-#[test]
-fn check_no_hint_for_hidden_unsafe_fixes_when_disabled() {
-    let mut cmd = RuffCheck::default()
-        .args(["--select", "F601,UP034", "--no-unsafe-fixes"])
-        .build();
-    assert_cmd_snapshot!(cmd
-        .pass_stdin("x = {'a': 1, 'a': 1}\nprint(('foo'))\n"),
-        @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:14: F601 Dictionary key literal `'a'` repeated
-    -:2:7: UP034 [*] Avoid extraneous parentheses
-    Found 2 errors.
-    [*] 1 fixable with the --fix option.
-
-    ----- stderr -----
-    "###);
-}
-
-#[test]
-fn check_no_hint_for_hidden_unsafe_fixes_with_no_safe_fixes_when_disabled() {
-    let mut cmd = RuffCheck::default()
-        .args(["--select", "F601", "--no-unsafe-fixes"])
-        .build();
-    assert_cmd_snapshot!(cmd
-        .pass_stdin("x = {'a': 1, 'a': 1}\n"),
-        @r###"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    -:1:14: F601 Dictionary key literal `'a'` repeated
-    Found 1 error.
-
-    ----- stderr -----
-    "###);
-}
-
 #[test]
 fn check_shows_unsafe_fixes_with_opt_in() {
     let mut cmd = RuffCheck::default()

crates/ruff_diagnostics/src/edit.rs

@@ -7,7 +7,7 @@ use ruff_text_size::{Ranged, TextRange, TextSize};
 
 /// A text edit to be applied to a source file. Inserts, deletes, or replaces
 /// content at a given location.
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Edit {
     /// The start location of the edit.

crates/ruff_linter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.1.9"
+version = "0.1.7"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -52,7 +52,7 @@ path-absolutize = { workspace = true, features = [
   "use_unix_paths_on_wasm",
 ] }
 pathdiff = { version = "0.2.1" }
-pep440_rs = { version = "0.4.0", features = ["serde"] }
+pep440_rs = { version = "0.3.12", features = ["serde"] }
 pyproject-toml = { version = "0.8.1" }
 quick-junit = { version = "0.3.5" }
 regex = { workspace = true }
@@ -71,7 +71,6 @@ toml = { workspace = true }
 typed-arena = { version = "2.0.2" }
 unicode-width = { workspace = true }
 unicode_names2 = { workspace = true }
-url = { version = "2.2.2" }
 wsl = { version = "0.1.0" }
 
 [dev-dependencies]

crates/ruff_linter/resources/test/fixtures/flake8_annotations/auto_return_type.py

@@ -182,50 +182,3 @@ class Foo(abc.ABC):
             return 1
         else:
             return 1.5
-
-
-def func(x: int):
-    try:
-        pass
-    except:
-        return 2
-
-
-def func(x: int):
-    try:
-        pass
-    except:
-        return 2
-    else:
-        return 3
-
-
-def func(x: int):
-    if not x:
-        raise ValueError
-    else:
-        raise TypeError
-
-
-def func(x: int):
-    if not x:
-        raise ValueError
-    else:
-        return 1
-
-
-from typing import overload
-
-
-@overload
-def overloaded(i: int) -> "int":
-    ...
-
-
-@overload
-def overloaded(i: "str") -> "str":
-    ...
-
-
-def overloaded(i):
-    return i

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

@@ -8,7 +8,6 @@ def func(address):
 # Error
 "0.0.0.0"
 '0.0.0.0'
-f"0.0.0.0"
 
 
 # Error

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

@@ -5,9 +5,6 @@ with open("/abc/tmp", "w") as f:
 with open("/tmp/abc", "w") as f:
     f.write("def")
 
-with open(f"/tmp/abc", "w") as f:
-    f.write("def")
-
 with open("/var/tmp/123", "w") as f:
     f.write("def")
 

crates/ruff_linter/resources/test/fixtures/flake8_django/DJ012.py

@@ -127,21 +127,3 @@ class MultipleConsecutiveFields(models.Model):
         pass
 
     middle_name = models.CharField(max_length=32)
-
-
-class BaseModel(models.Model):
-    pass
-
-
-class StrBeforeFieldInheritedModel(BaseModel):
-    """Model with `__str__` before fields."""
-
-    class Meta:
-        verbose_name = "test"
-        verbose_name_plural = "tests"
-
-    def __str__(self):
-        return "foobar"
-
-    first_name = models.CharField(max_length=32)
-

crates/ruff_linter/resources/test/fixtures/flake8_errmsg/EM.py

@@ -27,7 +27,7 @@ def f_ok():
     raise RuntimeError(msg)
 
 
-def f_msg_defined():
+def f_unfixable():
     msg = "hello"
     raise RuntimeError("This is an example exception")
 

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

@@ -19,8 +19,5 @@ foo(**{buzz: True})
 foo(**{"": True})
 foo(**{f"buzz__{bar}": True})
 abc(**{"for": 3})
-foo(**{},)
 
-# Duplicated key names won't be fixed, to avoid syntax errors.
-abc(**{'a': b}, **{'a': c})  # PIE804
-abc(a=1, **{'a': c}, **{'b': c})  # PIE804
+foo(**{},)

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

@@ -1,13 +1,8 @@
 import typing
-import typing_extensions
 from typing import TypeVar
-from typing_extensions import ParamSpec, TypeVarTuple
 
 _T = typing.TypeVar("_T")
-_Ts = typing_extensions.TypeVarTuple("_Ts")
-_P = ParamSpec("_P")
-_P2 = typing.ParamSpec("_P2")
-_Ts2 = TypeVarTuple("_Ts2")
+_P = TypeVar("_P")
 
 # OK
 _UsedTypeVar = TypeVar("_UsedTypeVar")

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

@@ -1,13 +1,8 @@
 import typing
-import typing_extensions
 from typing import TypeVar
-from typing_extensions import ParamSpec, TypeVarTuple
 
 _T = typing.TypeVar("_T")
-_Ts = typing_extensions.TypeVarTuple("_Ts")
-_P = ParamSpec("_P")
-_P2 = typing.ParamSpec("_P2")
-_Ts2 = TypeVarTuple("_Ts2")
+_P = TypeVar("_P")
 
 # OK
 _UsedTypeVar = TypeVar("_UsedTypeVar")

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

@@ -32,7 +32,6 @@ def f8(x: bytes = b"50 character byte stringgggggggggggggggggggggggggg\xff") ->
 
 foo: str = "50 character stringggggggggggggggggggggggggggggggg"
 bar: str = "51 character stringgggggggggggggggggggggggggggggggg"
-baz: str = f"51 character stringgggggggggggggggggggggggggggggggg"
 
 baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"
 

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

@@ -29,10 +29,6 @@ baz: bytes = b"50 character byte stringgggggggggggggggggggggggggg"  # OK
 
 qux: bytes = b"51 character byte stringggggggggggggggggggggggggggg\xff"  # Error: PYI053
 
-ffoo: str = f"50 character stringggggggggggggggggggggggggggggggg"  # OK
-
-fbar: str = f"51 character stringgggggggggggggggggggggggggggggggg"  # Error: PYI053
-
 class Demo:
     """Docstrings are excluded from this rule. Some padding."""  # OK
 

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

@@ -37,28 +37,3 @@ def func():
 
     # PYI055
     x: Union[type[requests_mock.Mocker], type[httpretty], type[str]] = requests_mock.Mocker
-
-
-def convert_union(union: UnionType) -> _T | None:
-    converters: tuple[
-        type[_T] | type[Converter[_T]] | Converter[_T] | Callable[[str], _T], ...  # PYI055
-    ] = union.__args__
-    ...
-
-def convert_union(union: UnionType) -> _T | None:
-    converters: tuple[
-        Union[type[_T] | type[Converter[_T]] | Converter[_T] | Callable[[str], _T]], ...  # PYI055
-    ] = union.__args__
-    ...
-
-def convert_union(union: UnionType) -> _T | None:
-    converters: tuple[
-        Union[type[_T] | type[Converter[_T]]] | Converter[_T] | Callable[[str], _T], ...  # PYI055
-    ] = union.__args__
-    ...
-
-def convert_union(union: UnionType) -> _T | None:
-    converters: tuple[
-        Union[type[_T] | type[Converter[_T]] | str] | Converter[_T] | Callable[[str], _T], ...  # PYI055
-    ] = union.__args__
-    ...

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

@@ -1,5 +1,6 @@
 # Errors
 "yoda" == compare  # SIM300
+"yoda" == compare  # SIM300
 42 == age  # SIM300
 ("a", "b") == compare  # SIM300
 "yoda" <= compare  # SIM300
@@ -12,17 +13,10 @@ YODA > age  # SIM300
 YODA >= age  # SIM300
 JediOrder.YODA == age  # SIM300
 0 < (number - 100)  # SIM300
+SomeClass().settings.SOME_CONSTANT_VALUE > (60 * 60)  # SIM300
 B<A[0][0]or B
 B or(B)<A[0][0]
 
-# Errors in preview
-['upper'] == UPPER_LIST
-{} == DummyHandler.CONFIG
-
-# Errors in stable
-UPPER_LIST == ['upper']
-DummyHandler.CONFIG == {}
-
 # OK
 compare == "yoda"
 age == 42
@@ -37,6 +31,3 @@ age <= YODA
 YODA == YODA
 age == JediOrder.YODA
 (number - 100) > 0
-SECONDS_IN_DAY == 60 * 60 * 24 # Error in 0.1.8
-SomeClass().settings.SOME_CONSTANT_VALUE > (60 * 60) # Error in 0.1.8
-{"non-empty-dict": "is-ok"} == DummyHandler.CONFIG

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

@@ -19,32 +19,8 @@ async def func():
     bar = "bar"
     trio.sleep(bar)
 
-    x, y = 0, 2000
-    trio.sleep(x)  # TRIO115
-    trio.sleep(y)  # OK
-
-    (a, b, [c, (d, e)]) = (1, 2, (0, [4, 0]))
-    trio.sleep(c)  # TRIO115
-    trio.sleep(d)  # OK
-    trio.sleep(e)  # TRIO115
-
-    m_x, m_y = 0
-    trio.sleep(m_y)  # OK
-    trio.sleep(m_x)  # OK
-
-    m_a = m_b = 0
-    trio.sleep(m_a)  # TRIO115
-    trio.sleep(m_b)  # TRIO115
-
-    m_c = (m_d, m_e) = (0, 0)
-    trio.sleep(m_c)  # OK
-    trio.sleep(m_d)  # TRIO115
-    trio.sleep(m_e)  # TRIO115
-
 
 def func():
-    import trio
-
     trio.run(trio.sleep(0))  # TRIO115
 
 
@@ -57,10 +33,3 @@ def func():
 
 async def func():
     await sleep(seconds=0)  # TRIO115
-
-
-def func():
-    import trio
-
-    if (walrus := 0) == 0:
-        trio.sleep(walrus)  # TRIO115

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

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

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

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

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

@@ -1,7 +0,0 @@
-"""Add `TYPE_CHECKING` to an existing `typing` import. Another member is moved."""
-
-from __future__ import annotations
-
-from typing import Final
-
-Const: Final[dict] = {}

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

@@ -1,7 +0,0 @@
-"""Using `TYPE_CHECKING` from an existing `typing` import. Another member is moved."""
-
-from __future__ import annotations
-
-from typing import Final, TYPE_CHECKING
-
-Const: Final[dict] = {}

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

@@ -1,7 +0,0 @@
-"""Using `TYPE_CHECKING` from an existing `typing` import. Another member is moved."""
-
-from __future__ import annotations
-
-from typing import Final, Mapping
-
-Const: Final[dict] = {}

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

@@ -1,92 +0,0 @@
-def f():
-    from pandas import DataFrame
-
-    def baz() -> DataFrame:
-        ...
-
-
-def f():
-    from pandas import DataFrame
-
-    def baz() -> DataFrame[int]:
-        ...
-
-
-def f():
-    from pandas import DataFrame
-
-    def baz() -> DataFrame["int"]:
-        ...
-
-
-def f():
-    import pandas as pd
-
-    def baz() -> pd.DataFrame:
-        ...
-
-
-def f():
-    import pandas as pd
-
-    def baz() -> pd.DataFrame.Extra:
-        ...
-
-
-def f():
-    import pandas as pd
-
-    def baz() -> pd.DataFrame | int:
-        ...
-
-
-
-def f():
-    from pandas import DataFrame
-
-    def baz() -> DataFrame():
-        ...
-
-
-def f():
-    from typing import Literal
-
-    from pandas import DataFrame
-
-    def baz() -> DataFrame[Literal["int"]]:
-        ...
-
-
-def f():
-    from typing import TYPE_CHECKING
-
-    if TYPE_CHECKING:
-        from pandas import DataFrame
-
-    def func(value: DataFrame):
-        ...
-
-
-def f():
-    from pandas import DataFrame, Series
-
-    def baz() -> DataFrame | Series:
-        ...
-
-
-def f():
-    from pandas import DataFrame, Series
-
-    def baz() -> (
-        DataFrame |
-        Series
-    ):
-        ...
-
-    class C:
-        x: DataFrame[
-            int
-        ] = 1
-
-    def func() -> DataFrame[[DataFrame[_P, _R]], DataFrame[_P, _R]]:
-        ...

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

@@ -1,4 +0,0 @@
-from a import x
-import b
-from c import y
-import d

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

@@ -55,6 +55,3 @@ def model_assign() -> None:
 
     Bad = apps.get_model()  # N806
     Bad = apps.get_model(model_name="Stream")  # N806
-
-    Address: Type = apps.get_model("zerver", variable)  # OK
-    ValidationError = import_string(variable)  # N806

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

@@ -63,8 +63,3 @@ for i in list(foo_tuple):  # Ok
 
 for i in list(foo_set):  # Ok
     foo_set.append(i + 1)
-
-x, y, nested_tuple = (1, 2, (3, 4, 5))
-
-for i in list(nested_tuple):  # PERF101
-    pass

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

@@ -72,15 +72,3 @@ a = 42  #  (Two spaces)
 # EF  Means test is giving error and Failing
 #!   Means test is segfaulting
 # 8   Means test runs forever
-
-#: Colon prefix is okay
-
-###This is a variable ###
-
-# We should strip the space, but preserve the hashes.
-#: E266:1:3
-##  Foo
-
-a = 1  ## Foo
-
-a = 1  #:Foo

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

@@ -60,6 +60,3 @@ def f():
 if (a and
     b):
     pass
-#: Okay
-def f():
-	return 1

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

@@ -19,32 +19,21 @@ if x > 0:
 else:
     import e
 
-import sys
-sys.path.insert(0, "some/path")
+__some__magic = 1
 
 import f
 
-import matplotlib
-
-matplotlib.use("Agg")
-
-import g
-
-__some__magic = 1
-
-import h
-
 
 def foo() -> None:
-    import i
+    import e
 
 
 if __name__ == "__main__":
-    import j
+    import g
 
-import k; import l
+import h; import i
 
 
 if __name__ == "__main__":
-    import m; \
-import n
+    import j; \
+import k

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

@@ -1,9 +0,0 @@
-import a
-
-"""Some other docstring."""
-
-import b
-
-"""Some other docstring."""
-
-import c

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

@@ -713,12 +713,5 @@ def retain_extra_whitespace_not_overindented():
 
     This is not overindented
         This is overindented, but since one line is not overindented this should not raise
-            And so is this, but it we should preserve the extra space on this line relative
-    """
-
-
-def inconsistent_indent_byte_size():
-    """There's a non-breaking space (2-bytes) after 3 spaces (https://github.com/astral-sh/ruff/issues/9080).
-
-       Returns:
+            And so is this, but it we should preserve the extra space on this line relative 
     """

crates/ruff_linter/resources/test/fixtures/pyflakes/F401_20.py

@@ -1,4 +0,0 @@
-import re
-from typing import Annotated
-
-type X = Annotated[int, lambda: re.compile("x")]

crates/ruff_linter/resources/test/fixtures/pyflakes/F404_1.py

@@ -1,5 +0,0 @@
-"""Docstring"""
-
-"""Non-docstring"""
-
-from __future__ import absolute_import

crates/ruff_linter/resources/test/fixtures/pyflakes/F821_24.py

@@ -1,8 +0,0 @@
-"""Test for accessing class members within a generator."""
-
-
-class Class:
-    items = []
-
-    if len(replacements := {item[1] for item in items}) > 1:
-        pass

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

@@ -3,11 +3,6 @@ import subprocess
 # Errors.
 subprocess.run("ls")
 subprocess.run("ls", shell=True)
-subprocess.run(
-    ["ls"],
-    shell=False,
-)
-subprocess.run(["ls"], **kwargs)
 
 # Non-errors.
 subprocess.run("ls", check=True)

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

@@ -1,36 +0,0 @@
-def func() -> None:  # OK
-    # 15 is max default
-    first = 1
-    second = 2
-    third = 3
-    fourth = 4
-    fifth = 5
-    sixth = 6
-    seventh = 7
-    eighth = 8
-    ninth = 9
-    tenth = 10
-    eleventh = 11
-    twelveth = 12
-    thirteenth = 13
-    fourteenth = 14
-    fifteenth = 15
-
-
-def func() -> None:  # PLR0914
-    first = 1
-    second = 2
-    third = 3
-    fourth = 4
-    fifth = 5
-    sixth = 6
-    seventh = 7
-    eighth = 8
-    ninth = 9
-    tenth = 10
-    eleventh = 11
-    twelfth = 12
-    thirteenth = 13
-    fourteenth = 14
-    fifteenth = 15
-    sixteenth = 16

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP025.py

@@ -1,28 +1,30 @@
-u"Hello"
+# These should change
+x = u"Hello"
 
-x = u"Hello"  # UP025
+u'world'
 
-u'world'  # UP025
+print(u"Hello")
 
-print(u"Hello")  # UP025
-
-print(u'world')  # UP025
+print(u'world')
 
 import foo
 
-foo(u"Hello", U"world", a=u"Hello", b=u"world")  # UP025
+foo(u"Hello", U"world", a=u"Hello", b=u"world")
 
-# Retain quotes when fixing.
-x = u'hello'  # UP025
-x = u"""hello"""  # UP025
-x = u'''hello'''  # UP025
-x = u'Hello "World"'  # UP025
+# These should stay quoted they way they are
 
-u = "Hello"  # OK
-u = u  # OK
+x = u'hello'
+x = u"""hello"""
+x = u'''hello'''
+x = u'Hello "World"'
+
+# These should not change
+u = "Hello"
+
+u = u
 
 def hello():
-    return"Hello"  # OK
+    return"Hello"
 
-f"foo"u"bar"  # OK
-f"foo" u"bar"  # OK
+f"foo"u"bar"
+f"foo" u"bar"

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP032_0.py

@@ -243,12 +243,3 @@ raise ValueError(
 ).format(a, b)
 
 ("{}" "{{{}}}").format(a, b)
-
-# The dictionary should be parenthesized.
-"{}".format({0: 1}[0])
-
-# The dictionary should be parenthesized.
-"{}".format({0: 1}.bar)
-
-# The dictionary should be parenthesized.
-"{}".format({0: 1}())

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

@@ -1,61 +0,0 @@
-# Errors.
-op_bitnot = lambda x: ~x
-op_not = lambda x: not x
-op_pos = lambda x: +x
-op_neg = lambda x: -x
-
-op_add = lambda x, y: x + y
-op_sub = lambda x, y: x - y
-op_mult = lambda x, y: x * y
-op_matmutl = lambda x, y: x @ y
-op_truediv = lambda x, y: x / y
-op_mod = lambda x, y: x % y
-op_pow = lambda x, y: x ** y
-op_lshift = lambda x, y: x << y
-op_rshift = lambda x, y: x >> y
-op_bitor = lambda x, y: x | y
-op_xor = lambda x, y: x ^ y
-op_bitand = lambda x, y: x & y
-op_floordiv = lambda x, y: x // y
-
-op_eq = lambda x, y: x == y
-op_ne = lambda x, y: x != y
-op_lt = lambda x, y: x < y
-op_lte = lambda x, y: x <= y
-op_gt = lambda x, y: x > y
-op_gte = lambda x, y: x >= y
-op_is = lambda x, y: x is y
-op_isnot = lambda x, y: x is not y
-op_in = lambda x, y: y in x
-
-
-def op_not2(x):
-    return not x
-
-
-def op_add2(x, y):
-    return x + y
-
-
-class Adder:
-    def add(x, y):
-        return x + y
-
-# OK.
-op_add3 = lambda x, y = 1: x + y
-op_neg2 = lambda x, y: y - x
-op_notin = lambda x, y: y not in x
-op_and = lambda x, y: y and x
-op_or = lambda x, y: y or x
-op_in = lambda x, y: x in y
-
-
-def op_neg3(x, y):
-    return y - x
-
-def op_add4(x, y = 1):
-    return x + y
-
-def op_add5(x, y):
-    print("op_add5")
-    return x + y

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

@@ -5,11 +5,3 @@ A = 3.14 * r ** 2  # FURB152
 C = 6.28 * r  # FURB152
 
 e = 2.71  # FURB152
-
-r = 3.15  # OK
-
-r = 3.141  # FURB152
-
-r = 3.1415  # FURB152
-
-e = 2.7 # OK

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

@@ -16,8 +16,6 @@ special_log(1, 2)
 special_log(1, 10)
 special_log(1, math.e)
 special_log(1, special_e)
-math.log(1, 2.0)
-math.log(1, 10.0)
 
 # Ok.
 math.log2(1)
@@ -47,6 +45,3 @@ def log(*args):
 log(1, 2)
 log(1, 10)
 log(1, math.e)
-
-math.log(1, 2.0001)
-math.log(1, 10.0001)

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

@@ -1,57 +0,0 @@
-import hashlib
-from hashlib import (
-    blake2b,
-    blake2s,
-    md5,
-    sha1,
-    sha3_224,
-    sha3_256,
-    sha3_384,
-    sha3_512,
-    sha224,
-)
-from hashlib import sha256
-from hashlib import sha256 as hash_algo
-from hashlib import sha384, sha512, shake_128, shake_256
-
-# these will match
-
-blake2b().digest().hex()
-blake2s().digest().hex()
-md5().digest().hex()
-sha1().digest().hex()
-sha224().digest().hex()
-sha256().digest().hex()
-sha384().digest().hex()
-sha3_224().digest().hex()
-sha3_256().digest().hex()
-sha3_384().digest().hex()
-sha3_512().digest().hex()
-sha512().digest().hex()
-shake_128().digest(10).hex()
-shake_256().digest(10).hex()
-
-hashlib.sha256().digest().hex()
-
-sha256(b"text").digest().hex()
-
-hash_algo().digest().hex()
-
-# not yet supported
-h = sha256()
-h.digest().hex()
-
-
-# these will not
-
-sha256().digest()
-sha256().digest().hex("_")
-sha256().digest().hex(bytes_per_sep=4)
-sha256().hexdigest()
-
-class Hash:
-    def digest(self) -> bytes:
-        return b""
-
-
-Hash().digest().hex()

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

@@ -63,29 +63,11 @@ def f():
     tasks = [asyncio.create_task(task) for task in tasks]
 
 
-# Error
+# OK (false negative)
 def f():
     task = asyncio.create_task(coordinator.ws_connect())
 
 
-# Error
-def f():
-    loop = asyncio.get_running_loop()
-    task: asyncio.Task = loop.create_task(coordinator.ws_connect())
-
-
-# OK (potential false negative)
-def f():
-    task = asyncio.create_task(coordinator.ws_connect())
-    background_tasks.add(task)
-
-
-# OK
-async def f():
-    task = asyncio.create_task(coordinator.ws_connect())
-    await task
-
-
 # OK (potential false negative)
 def f():
     do_nothing_with_the_task(asyncio.create_task(coordinator.ws_connect()))
@@ -106,59 +88,3 @@ def f():
 def f():
     loop = asyncio.get_running_loop()
     loop.do_thing(coordinator.ws_connect())
-
-
-# OK
-async def f():
-    task = unused = asyncio.create_task(coordinator.ws_connect())
-    await task
-
-
-# OK (false negative)
-async def f():
-    task = unused = asyncio.create_task(coordinator.ws_connect())
-
-
-# OK
-async def f():
-    task[i] = asyncio.create_task(coordinator.ws_connect())
-
-
-# OK
-async def f(x: int):
-    if x > 0:
-        task = asyncio.create_task(make_request())
-    else:
-        task = asyncio.create_task(make_request())
-    await task
-
-
-# OK
-async def f(x: bool):
-    if x:
-        t = asyncio.create_task(asyncio.sleep(1))
-    else:
-        t = None
-    try:
-        await asyncio.sleep(1)
-    finally:
-        if t:
-            await t
-
-
-# Error
-async def f(x: bool):
-    if x:
-        t = asyncio.create_task(asyncio.sleep(1))
-    else:
-        t = None
-
-
-# OK
-async def f(x: bool):
-    global T
-
-    if x:
-        T = asyncio.create_task(asyncio.sleep(1))
-    else:
-        T = None

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

@@ -59,11 +59,3 @@ class F(BaseSettings):
     without_annotation = []
     class_variable: ClassVar[list[int]] = []
     final_variable: Final[list[int]] = []
-
-
-class G(F):
-    mutable_default: list[int] = []
-    immutable_annotation: Sequence[int] = []
-    without_annotation = []
-    class_variable: ClassVar[list[int]] = []
-    final_variable: Final[list[int]] = []

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

@@ -1,8 +0,0 @@
-from typing import Never, NoReturn, Union
-
-Union[Never, int]
-Union[NoReturn, int]
-Never | int
-NoReturn | int
-Union[Union[Never, int], Union[NoReturn, int]]
-Union[NoReturn, int, float]

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

@@ -2,7 +2,7 @@ use ruff_python_ast::Expr;
 
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
-use crate::rules::{flake8_pie, pylint, refurb};
+use crate::rules::{flake8_pie, pylint};
 
 /// Run lint rules over all deferred lambdas in the [`SemanticModel`].
 pub(crate) fn deferred_lambdas(checker: &mut Checker) {
@@ -21,9 +21,6 @@ pub(crate) fn deferred_lambdas(checker: &mut Checker) {
             if checker.enabled(Rule::ReimplementedContainerBuiltin) {
                 flake8_pie::rules::reimplemented_container_builtin(checker, lambda);
             }
-            if checker.enabled(Rule::ReimplementedOperator) {
-                refurb::rules::reimplemented_operator(checker, &lambda.into());
-            }
         }
     }
 }

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

@@ -5,21 +5,16 @@ use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
-use crate::rules::{
-    flake8_pyi, flake8_type_checking, flake8_unused_arguments, pyflakes, pylint, ruff,
-};
+use crate::rules::{flake8_pyi, flake8_type_checking, flake8_unused_arguments, pyflakes, pylint};
 
 /// Run lint rules over all deferred scopes in the [`SemanticModel`].
 pub(crate) fn deferred_scopes(checker: &mut Checker) {
     if !checker.any_enabled(&[
-        Rule::AsyncioDanglingTask,
         Rule::GlobalVariableNotAssigned,
         Rule::ImportShadowedByLoopVar,
-        Rule::NoSelfUse,
         Rule::RedefinedArgumentFromLocal,
         Rule::RedefinedWhileUnused,
         Rule::RuntimeImportInTypeCheckingBlock,
-        Rule::TooManyLocals,
         Rule::TypingOnlyFirstPartyImport,
         Rule::TypingOnlyStandardLibraryImport,
         Rule::TypingOnlyThirdPartyImport,
@@ -36,6 +31,7 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
         Rule::UnusedPrivateTypedDict,
         Rule::UnusedStaticMethodArgument,
         Rule::UnusedVariable,
+        Rule::NoSelfUse,
     ]) {
         return;
     }
@@ -63,7 +59,6 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
                         flake8_type_checking::helpers::is_valid_runtime_import(
                             binding,
                             &checker.semantic,
-                            &checker.settings.flake8_type_checking,
                         )
                     })
                     .collect()
@@ -273,10 +268,6 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
             flake8_pyi::rules::unused_private_typed_dict(checker, scope, &mut diagnostics);
         }
 
-        if checker.enabled(Rule::AsyncioDanglingTask) {
-            ruff::rules::asyncio_dangling_binding(scope, &checker.semantic, &mut diagnostics);
-        }
-
         if matches!(scope.kind, ScopeKind::Function(_) | ScopeKind::Lambda(_)) {
             if checker.enabled(Rule::UnusedVariable) {
                 pyflakes::rules::unused_variable(checker, scope, &mut diagnostics);
@@ -344,10 +335,6 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
             if checker.enabled(Rule::NoSelfUse) {
                 pylint::rules::no_self_use(checker, scope_id, scope, &mut diagnostics);
             }
-
-            if checker.enabled(Rule::TooManyLocals) {
-                pylint::rules::too_many_locals(checker, scope, &mut diagnostics);
-            }
         }
     }
     checker.diagnostics.extend(diagnostics);

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

@@ -15,9 +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_type_checking, flake8_use_pathlib,
-    flynt, numpy, pandas_vet, pep8_naming, pycodestyle, pyflakes, pygrep_hooks, pylint, pyupgrade,
-    refurb, ruff,
+    flake8_simplify, flake8_tidy_imports, flake8_trio, flake8_use_pathlib, flynt, numpy,
+    pandas_vet, pep8_naming, pycodestyle, pyflakes, pygrep_hooks, pylint, pyupgrade, refurb, ruff,
 };
 use crate::settings::types::PythonVersion;
 
@@ -81,7 +80,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 Rule::DuplicateUnionMember,
                 Rule::RedundantLiteralUnion,
                 Rule::UnnecessaryTypeUnion,
-                Rule::NeverUnion,
             ]) {
                 // Avoid duplicate checks if the parent is a union, since these rules already
                 // traverse nested unions.
@@ -101,10 +99,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 }
             }
 
-            if checker.enabled(Rule::NeverUnion) {
-                ruff::rules::never_union(checker, expr);
-            }
-
             if checker.any_enabled(&[
                 Rule::SysVersionSlice3,
                 Rule::SysVersion2,
@@ -362,8 +356,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 Rule::FString,
                 // flynt
                 Rule::StaticJoinToFString,
-                // refurb
-                Rule::HashlibDigestHex,
             ]) {
                 if let Expr::Attribute(ast::ExprAttribute { value, attr, .. }) = func.as_ref() {
                     let attr = attr.as_str();
@@ -589,9 +581,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::HashlibInsecureHashFunction) {
                 flake8_bandit::rules::hashlib_insecure_hash_functions(checker, call);
             }
-            if checker.enabled(Rule::HashlibDigestHex) {
-                refurb::rules::hashlib_digest_hex(checker, call);
-            }
             if checker.enabled(Rule::RequestWithoutTimeout) {
                 flake8_bandit::rules::request_without_timeout(checker, call);
             }
@@ -1159,10 +1148,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 }
             }
 
-            if checker.enabled(Rule::NeverUnion) {
-                ruff::rules::never_union(checker, expr);
-            }
-
             // Avoid duplicate checks if the parent is a union, since these rules already
             // traverse nested unions.
             if !checker.semantic.in_nested_union() {
@@ -1180,9 +1165,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 if checker.enabled(Rule::UnnecessaryTypeUnion) {
                     flake8_pyi::rules::unnecessary_type_union(checker, expr);
                 }
-                if checker.enabled(Rule::RuntimeStringUnion) {
-                    flake8_type_checking::rules::runtime_string_union(checker, expr);
-                }
             }
         }
         Expr::UnaryOp(
@@ -1288,12 +1270,32 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 refurb::rules::math_constant(checker, number_literal);
             }
         }
-        Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => {
+        Expr::BytesLiteral(_) => {
+            if checker.source_type.is_stub() && checker.enabled(Rule::StringOrBytesTooLong) {
+                flake8_pyi::rules::string_or_bytes_too_long(checker, expr);
+            }
+        }
+        Expr::StringLiteral(string) => {
+            if checker.enabled(Rule::HardcodedBindAllInterfaces) {
+                if let Some(diagnostic) =
+                    flake8_bandit::rules::hardcoded_bind_all_interfaces(string)
+                {
+                    checker.diagnostics.push(diagnostic);
+                }
+            }
+            if checker.enabled(Rule::HardcodedTempFile) {
+                flake8_bandit::rules::hardcoded_tmp_directory(checker, string);
+            }
             if checker.enabled(Rule::UnicodeKindPrefix) {
-                for string_part in value {
+                for string_part in string.value.parts() {
                     pyupgrade::rules::unicode_kind_prefix(checker, string_part);
                 }
             }
+            if checker.source_type.is_stub() {
+                if checker.enabled(Rule::StringOrBytesTooLong) {
+                    flake8_pyi::rules::string_or_bytes_too_long(checker, expr);
+                }
+            }
         }
         Expr::IfExp(
             if_exp @ ast::ExprIfExp {

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

@@ -10,7 +10,6 @@ pub(super) use module::module;
 pub(super) use parameter::parameter;
 pub(super) use parameters::parameters;
 pub(super) use statement::statement;
-pub(super) use string_like::string_like;
 pub(super) use suite::suite;
 pub(super) use unresolved_references::unresolved_references;
 
@@ -26,6 +25,5 @@ mod module;
 mod parameter;
 mod parameters;
 mod statement;
-mod string_like;
 mod suite;
 mod unresolved_references;

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

@@ -368,9 +368,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     .diagnostics
                     .extend(ruff::rules::unreachable::in_function(name, body));
             }
-            if checker.enabled(Rule::ReimplementedOperator) {
-                refurb::rules::reimplemented_operator(checker, &function_def.into());
-            }
         }
         Stmt::Return(_) => {
             if checker.enabled(Rule::ReturnOutsideFunction) {
@@ -400,13 +397,27 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 flake8_django::rules::nullable_model_string_field(checker, body);
             }
             if checker.enabled(Rule::DjangoExcludeWithModelForm) {
-                flake8_django::rules::exclude_with_model_form(checker, class_def);
+                if let Some(diagnostic) = flake8_django::rules::exclude_with_model_form(
+                    checker,
+                    arguments.as_deref(),
+                    body,
+                ) {
+                    checker.diagnostics.push(diagnostic);
+                }
             }
             if checker.enabled(Rule::DjangoAllWithModelForm) {
-                flake8_django::rules::all_with_model_form(checker, class_def);
+                if let Some(diagnostic) =
+                    flake8_django::rules::all_with_model_form(checker, arguments.as_deref(), body)
+                {
+                    checker.diagnostics.push(diagnostic);
+                }
             }
             if checker.enabled(Rule::DjangoUnorderedBodyContentInModel) {
-                flake8_django::rules::unordered_body_content_in_model(checker, class_def);
+                flake8_django::rules::unordered_body_content_in_model(
+                    checker,
+                    arguments.as_deref(),
+                    body,
+                );
             }
             if !checker.source_type.is_stub() {
                 if checker.enabled(Rule::DjangoModelWithoutDunderStr) {
@@ -1560,11 +1571,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::named_expr_without_context(checker, value);
             }
             if checker.enabled(Rule::AsyncioDanglingTask) {
-                if let Some(diagnostic) =
-                    ruff::rules::asyncio_dangling_task(value, checker.semantic())
-                {
-                    checker.diagnostics.push(diagnostic);
-                }
+                ruff::rules::asyncio_dangling_task(checker, value);
             }
             if checker.enabled(Rule::RepeatedAppend) {
                 refurb::rules::repeated_append(checker, stmt);

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

@@ -1,20 +0,0 @@
-use ruff_python_ast::StringLike;
-
-use crate::checkers::ast::Checker;
-use crate::codes::Rule;
-use crate::rules::{flake8_bandit, flake8_pyi};
-
-/// Run lint rules over a [`StringLike`] syntax nodes.
-pub(crate) fn string_like(string_like: StringLike, checker: &mut Checker) {
-    if checker.enabled(Rule::HardcodedBindAllInterfaces) {
-        flake8_bandit::rules::hardcoded_bind_all_interfaces(checker, string_like);
-    }
-    if checker.enabled(Rule::HardcodedTempFile) {
-        flake8_bandit::rules::hardcoded_tmp_directory(checker, string_like);
-    }
-    if checker.source_type.is_stub() {
-        if checker.enabled(Rule::StringOrBytesTooLong) {
-            flake8_pyi::rules::string_or_bytes_too_long(checker, string_like);
-        }
-    }
-}

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

@@ -1,66 +0,0 @@
-use ruff_python_semantic::{ScopeKind, SemanticModel};
-
-use crate::rules::flake8_type_checking;
-use crate::settings::LinterSettings;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(super) enum AnnotationContext {
-    /// Python will evaluate the annotation at runtime, but it's not _required_ and, as such, could
-    /// be quoted to convert it into a typing-only annotation.
-    ///
-    /// For example:
-    /// ```python
-    /// from pandas import DataFrame
-    ///
-    /// def foo() -> DataFrame:
-    ///    ...
-    /// ```
-    ///
-    /// Above, Python will evaluate `DataFrame` at runtime in order to add it to `__annotations__`.
-    RuntimeEvaluated,
-    /// Python will evaluate the annotation at runtime, and it's required to be available at
-    /// runtime, as a library (like Pydantic) needs access to it.
-    RuntimeRequired,
-    /// The annotation is only evaluated at type-checking time.
-    TypingOnly,
-}
-
-impl AnnotationContext {
-    pub(super) fn from_model(semantic: &SemanticModel, settings: &LinterSettings) -> Self {
-        // If the annotation is in a class scope (e.g., an annotated assignment for a
-        // class field), and that class is marked as annotation as runtime-required.
-        if semantic
-            .current_scope()
-            .kind
-            .as_class()
-            .is_some_and(|class_def| {
-                flake8_type_checking::helpers::runtime_required_class(
-                    class_def,
-                    &settings.flake8_type_checking.runtime_required_base_classes,
-                    &settings.flake8_type_checking.runtime_required_decorators,
-                    semantic,
-                )
-            })
-        {
-            return Self::RuntimeRequired;
-        }
-
-        // If `__future__` annotations are enabled, then annotations are never evaluated
-        // at runtime, so we can treat them as typing-only.
-        if semantic.future_annotations() {
-            return Self::TypingOnly;
-        }
-
-        // Otherwise, if we're in a class or module scope, then the annotation needs to
-        // be available at runtime.
-        // See: https://docs.python.org/3/reference/simple_stmts.html#annotated-assignment-statements
-        if matches!(
-            semantic.current_scope().kind,
-            ScopeKind::Class(_) | ScopeKind::Module
-        ) {
-            return Self::RuntimeEvaluated;
-        }
-
-        Self::TypingOnly
-    }
-}

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

@@ -44,12 +44,12 @@ use ruff_python_ast::helpers::{
 };
 use ruff_python_ast::identifier::Identifier;
 use ruff_python_ast::str::trailing_quote;
-use ruff_python_ast::visitor::{walk_except_handler, walk_f_string_element, walk_pattern, Visitor};
+use ruff_python_ast::visitor::{walk_except_handler, walk_pattern, Visitor};
 use ruff_python_ast::{helpers, str, visitor, PySourceType};
 use ruff_python_codegen::{Generator, Quote, Stylist};
 use ruff_python_index::Indexer;
 use ruff_python_parser::typing::{parse_type_annotation, AnnotationKind};
-use ruff_python_semantic::analyze::{imports, typing, visibility};
+use ruff_python_semantic::analyze::{typing, visibility};
 use ruff_python_semantic::{
     BindingFlags, BindingId, BindingKind, Exceptions, Export, FromImport, Globals, Import, Module,
     ModuleKind, NodeId, ScopeId, ScopeKind, SemanticModel, SemanticModelFlags, Snapshot,
@@ -58,7 +58,6 @@ use ruff_python_semantic::{
 use ruff_python_stdlib::builtins::{IPYTHON_BUILTINS, MAGIC_GLOBALS, PYTHON_BUILTINS};
 use ruff_source_file::Locator;
 
-use crate::checkers::ast::annotation::AnnotationContext;
 use crate::checkers::ast::deferred::Deferred;
 use crate::docstrings::extraction::ExtractionTarget;
 use crate::importer::Importer;
@@ -69,7 +68,6 @@ use crate::settings::{flags, LinterSettings};
 use crate::{docstrings, noqa};
 
 mod analyze;
-mod annotation;
 mod deferred;
 
 pub(crate) struct Checker<'a> {
@@ -287,18 +285,7 @@ where
 
         // Track whether we've seen docstrings, non-imports, etc.
         match stmt {
-            Stmt::Expr(ast::StmtExpr { value, .. })
-                if !self
-                    .semantic
-                    .flags
-                    .intersects(SemanticModelFlags::MODULE_DOCSTRING)
-                    && value.is_string_literal_expr() =>
-            {
-                self.semantic.flags |= SemanticModelFlags::MODULE_DOCSTRING;
-            }
             Stmt::ImportFrom(ast::StmtImportFrom { module, names, .. }) => {
-                self.semantic.flags |= SemanticModelFlags::MODULE_DOCSTRING;
-
                 // Allow __future__ imports until we see a non-__future__ import.
                 if let Some("__future__") = module.as_deref() {
                     if names
@@ -312,18 +299,13 @@ where
                 }
             }
             Stmt::Import(_) => {
-                self.semantic.flags |= SemanticModelFlags::MODULE_DOCSTRING;
                 self.semantic.flags |= SemanticModelFlags::FUTURES_BOUNDARY;
             }
             _ => {
-                self.semantic.flags |= SemanticModelFlags::MODULE_DOCSTRING;
                 self.semantic.flags |= SemanticModelFlags::FUTURES_BOUNDARY;
-                if !(self.semantic.seen_import_boundary()
-                    || helpers::is_assignment_to_a_dunder(stmt)
-                    || helpers::in_nested_block(self.semantic.current_statements())
-                    || imports::is_matplotlib_activation(stmt, self.semantic())
-                    || self.settings.preview.is_enabled()
-                        && imports::is_sys_path_modification(stmt, self.semantic()))
+                if !self.semantic.seen_import_boundary()
+                    && !helpers::is_assignment_to_a_dunder(stmt)
+                    && !helpers::in_nested_block(self.semantic.current_statements())
                 {
                     self.semantic.flags |= SemanticModelFlags::IMPORT_BOUNDARY;
                 }
@@ -530,10 +512,8 @@ where
                     .chain(&parameters.kwonlyargs)
                 {
                     if let Some(expr) = &parameter_with_default.parameter.annotation {
-                        if singledispatch {
-                            self.visit_runtime_required_annotation(expr);
-                        } else if runtime_annotation {
-                            self.visit_runtime_evaluated_annotation(expr);
+                        if runtime_annotation || singledispatch {
+                            self.visit_runtime_annotation(expr);
                         } else {
                             self.visit_annotation(expr);
                         };
@@ -546,7 +526,7 @@ where
                 if let Some(arg) = &parameters.vararg {
                     if let Some(expr) = &arg.annotation {
                         if runtime_annotation {
-                            self.visit_runtime_evaluated_annotation(expr);
+                            self.visit_runtime_annotation(expr);
                         } else {
                             self.visit_annotation(expr);
                         };
@@ -555,7 +535,7 @@ where
                 if let Some(arg) = &parameters.kwarg {
                     if let Some(expr) = &arg.annotation {
                         if runtime_annotation {
-                            self.visit_runtime_evaluated_annotation(expr);
+                            self.visit_runtime_annotation(expr);
                         } else {
                             self.visit_annotation(expr);
                         };
@@ -563,7 +543,7 @@ where
                 }
                 for expr in returns {
                     if runtime_annotation {
-                        self.visit_runtime_evaluated_annotation(expr);
+                        self.visit_runtime_annotation(expr);
                     } else {
                         self.visit_annotation(expr);
                     };
@@ -694,16 +674,40 @@ where
                 value,
                 ..
             }) => {
-                match AnnotationContext::from_model(&self.semantic, self.settings) {
-                    AnnotationContext::RuntimeRequired => {
-                        self.visit_runtime_required_annotation(annotation);
-                    }
-                    AnnotationContext::RuntimeEvaluated => {
-                        self.visit_runtime_evaluated_annotation(annotation);
-                    }
-                    AnnotationContext::TypingOnly => self.visit_annotation(annotation),
-                }
+                // If we're in a class or module scope, then the annotation needs to be
+                // available at runtime.
+                // See: https://docs.python.org/3/reference/simple_stmts.html#annotated-assignment-statements
+                let runtime_annotation = if self.semantic.future_annotations() {
+                    self.semantic
+                        .current_scope()
+                        .kind
+                        .as_class()
+                        .is_some_and(|class_def| {
+                            flake8_type_checking::helpers::runtime_evaluated_class(
+                                class_def,
+                                &self
+                                    .settings
+                                    .flake8_type_checking
+                                    .runtime_evaluated_base_classes,
+                                &self
+                                    .settings
+                                    .flake8_type_checking
+                                    .runtime_evaluated_decorators,
+                                &self.semantic,
+                            )
+                        })
+                } else {
+                    matches!(
+                        self.semantic.current_scope().kind,
+                        ScopeKind::Class(_) | ScopeKind::Module
+                    )
+                };
 
+                if runtime_annotation {
+                    self.visit_runtime_annotation(annotation);
+                } else {
+                    self.visit_annotation(annotation);
+                }
                 if let Some(expr) = value {
                     if self.semantic.match_typing_expr(annotation, "TypeAlias") {
                         self.visit_type_definition(expr);
@@ -811,7 +815,8 @@ where
 
     fn visit_expr(&mut self, expr: &'b Expr) {
         // Step 0: Pre-processing
-        if !self.semantic.in_typing_literal()
+        if !self.semantic.in_f_string()
+            && !self.semantic.in_typing_literal()
             && !self.semantic.in_deferred_type_definition()
             && self.semantic.in_type_definition()
             && self.semantic.future_annotations()
@@ -1233,7 +1238,10 @@ where
                 }
             }
             Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => {
-                if self.semantic.in_type_definition() && !self.semantic.in_typing_literal() {
+                if self.semantic.in_type_definition()
+                    && !self.semantic.in_typing_literal()
+                    && !self.semantic.in_f_string()
+                {
                     self.deferred.string_type_definitions.push((
                         expr.range(),
                         value.to_str(),
@@ -1263,13 +1271,6 @@ where
 
         // Step 4: Analysis
         analyze::expression(expr, self);
-        match expr {
-            Expr::StringLiteral(string_literal) => {
-                analyze::string_like(string_literal.into(), self);
-            }
-            Expr::BytesLiteral(bytes_literal) => analyze::string_like(bytes_literal.into(), self),
-            _ => {}
-        }
 
         self.semantic.flags = flags_snapshot;
         self.semantic.pop_node();
@@ -1325,6 +1326,17 @@ where
         self.semantic.flags = flags_snapshot;
     }
 
+    fn visit_format_spec(&mut self, format_spec: &'b Expr) {
+        match format_spec {
+            Expr::FString(ast::ExprFString { value, .. }) => {
+                for expr in value.elements() {
+                    self.visit_expr(expr);
+                }
+            }
+            _ => unreachable!("Unexpected expression for format_spec"),
+        }
+    }
+
     fn visit_parameters(&mut self, parameters: &'b Parameters) {
         // Step 1: Binding.
         // Bind, but intentionally avoid walking default expressions, as we handle them
@@ -1434,22 +1446,15 @@ where
                 .push((bound, self.semantic.snapshot()));
         }
     }
-
-    fn visit_f_string_element(&mut self, f_string_element: &'b ast::FStringElement) {
-        // Step 2: Traversal
-        walk_f_string_element(self, f_string_element);
-
-        // Step 4: Analysis
-        if let Some(literal) = f_string_element.as_literal() {
-            analyze::string_like(literal.into(), self);
-        }
-    }
 }
 
 impl<'a> Checker<'a> {
     /// Visit a [`Module`]. Returns `true` if the module contains a module-level docstring.
-    fn visit_module(&mut self, python_ast: &'a Suite) {
+    fn visit_module(&mut self, python_ast: &'a Suite) -> bool {
         analyze::module(python_ast, self);
+
+        let docstring = docstrings::extraction::docstring_from(python_ast);
+        docstring.is_some()
     }
 
     /// Visit a list of [`Comprehension`] nodes, assumed to be the comprehensions that compose a
@@ -1517,18 +1522,10 @@ impl<'a> Checker<'a> {
         self.semantic.flags = snapshot;
     }
 
-    /// Visit an [`Expr`], and treat it as a runtime-evaluated type annotation.
-    fn visit_runtime_evaluated_annotation(&mut self, expr: &'a Expr) {
-        let snapshot = self.semantic.flags;
-        self.semantic.flags |= SemanticModelFlags::RUNTIME_EVALUATED_ANNOTATION;
-        self.visit_type_definition(expr);
-        self.semantic.flags = snapshot;
-    }
-
     /// Visit an [`Expr`], and treat it as a runtime-required type annotation.
-    fn visit_runtime_required_annotation(&mut self, expr: &'a Expr) {
+    fn visit_runtime_annotation(&mut self, expr: &'a Expr) {
         let snapshot = self.semantic.flags;
-        self.semantic.flags |= SemanticModelFlags::RUNTIME_REQUIRED_ANNOTATION;
+        self.semantic.flags |= SemanticModelFlags::RUNTIME_ANNOTATION;
         self.visit_type_definition(expr);
         self.semantic.flags = snapshot;
     }
@@ -1755,13 +1752,10 @@ impl<'a> Checker<'a> {
             return;
         }
 
-        // If the expression is the left-hand side of a walrus operator, then it's a named
-        // expression assignment.
         if self
             .semantic
             .current_expressions()
-            .filter_map(Expr::as_named_expr_expr)
-            .any(|parent| parent.target.as_ref() == expr)
+            .any(Expr::is_named_expr_expr)
         {
             self.add_binding(id, expr.range(), BindingKind::NamedExprAssignment, flags);
             return;
@@ -2016,19 +2010,23 @@ pub(crate) fn check_ast(
     );
     checker.bind_builtins();
 
+    // Check for module docstring.
+    let python_ast = if checker.visit_module(python_ast) {
+        &python_ast[1..]
+    } else {
+        python_ast
+    };
+
     // Iterate over the AST.
-    checker.visit_module(python_ast);
     checker.visit_body(python_ast);
 
-    // Visit any deferred syntax nodes. Take care to visit in order, such that we avoid adding
-    // new deferred nodes after visiting nodes of that kind. For example, visiting a deferred
-    // function can add a deferred lambda, but the opposite is not true.
+    // Visit any deferred syntax nodes.
     checker.visit_deferred_functions();
-    checker.visit_deferred_type_param_definitions();
+    checker.visit_deferred_lambdas();
     checker.visit_deferred_future_type_definitions();
+    checker.visit_deferred_type_param_definitions();
     let allocator = typed_arena::Arena::new();
     checker.visit_deferred_string_type_definitions(&allocator);
-    checker.visit_deferred_lambdas();
     checker.visit_exports();
 
     // Check docstrings, bindings, and unresolved references.

crates/ruff_linter/src/checkers/logical_lines.rs

@@ -1,4 +1,4 @@
-use ruff_diagnostics::Diagnostic;
+use ruff_diagnostics::{Diagnostic, DiagnosticKind};
 use ruff_python_codegen::Stylist;
 use ruff_python_parser::lexer::LexResult;
 use ruff_python_parser::TokenKind;
@@ -97,7 +97,7 @@ pub(crate) fn check_logical_lines(
             indent_size,
         ) {
             if settings.rules.enabled(kind.rule()) {
-                context.push_diagnostic(Diagnostic::new(kind, range));
+                context.push(kind, range);
             }
         }
 
@@ -123,6 +123,18 @@ impl<'a> LogicalLinesContext<'a> {
         }
     }
 
+    pub(crate) fn push<K: Into<DiagnosticKind>>(&mut self, kind: K, range: TextRange) {
+        let kind = kind.into();
+        if self.settings.rules.enabled(kind.rule()) {
+            self.diagnostics.push(Diagnostic {
+                kind,
+                range,
+                fix: None,
+                parent: None,
+            });
+        }
+    }
+
     pub(crate) fn push_diagnostic(&mut self, diagnostic: Diagnostic) {
         if self.settings.rules.enabled(diagnostic.kind.rule()) {
             self.diagnostics.push(diagnostic);

crates/ruff_linter/src/codes.rs

@@ -252,7 +252,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pylint, "R0911") => (RuleGroup::Stable, rules::pylint::rules::TooManyReturnStatements),
         (Pylint, "R0912") => (RuleGroup::Stable, rules::pylint::rules::TooManyBranches),
         (Pylint, "R0913") => (RuleGroup::Stable, rules::pylint::rules::TooManyArguments),
-        (Pylint, "R0914") => (RuleGroup::Preview, rules::pylint::rules::TooManyLocals),
         (Pylint, "R0915") => (RuleGroup::Stable, rules::pylint::rules::TooManyStatements),
         (Pylint, "R0916") => (RuleGroup::Preview, rules::pylint::rules::TooManyBooleanExpressions),
         (Pylint, "R0917") => (RuleGroup::Preview, rules::pylint::rules::TooManyPositional),
@@ -808,7 +807,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8TypeChecking, "003") => (RuleGroup::Stable, rules::flake8_type_checking::rules::TypingOnlyStandardLibraryImport),
         (Flake8TypeChecking, "004") => (RuleGroup::Stable, rules::flake8_type_checking::rules::RuntimeImportInTypeCheckingBlock),
         (Flake8TypeChecking, "005") => (RuleGroup::Stable, rules::flake8_type_checking::rules::EmptyTypeCheckingBlock),
-        (Flake8TypeChecking, "006") => (RuleGroup::Preview, rules::flake8_type_checking::rules::RuntimeStringUnion),
 
         // tryceratops
         (Tryceratops, "002") => (RuleGroup::Stable, rules::tryceratops::rules::RaiseVanillaClass),
@@ -901,7 +899,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Ruff, "017") => (RuleGroup::Nursery, rules::ruff::rules::QuadraticListSummation),
         (Ruff, "018") => (RuleGroup::Preview, rules::ruff::rules::AssignmentInAssert),
         (Ruff, "019") => (RuleGroup::Preview, rules::ruff::rules::UnnecessaryKeyCheck),
-        (Ruff, "020") => (RuleGroup::Preview, rules::ruff::rules::NeverUnion),
         (Ruff, "100") => (RuleGroup::Stable, rules::ruff::rules::UnusedNOQA),
         (Ruff, "200") => (RuleGroup::Stable, rules::ruff::rules::InvalidPyprojectToml),
 
@@ -954,7 +951,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Refurb, "105") => (RuleGroup::Preview, rules::refurb::rules::PrintEmptyString),
         #[allow(deprecated)]
         (Refurb, "113") => (RuleGroup::Nursery, rules::refurb::rules::RepeatedAppend),
-        (Refurb, "118") => (RuleGroup::Preview, rules::refurb::rules::ReimplementedOperator),
         #[allow(deprecated)]
         (Refurb, "131") => (RuleGroup::Nursery, rules::refurb::rules::DeleteFullSlice),
         #[allow(deprecated)]
@@ -969,7 +965,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Refurb, "169") => (RuleGroup::Preview, rules::refurb::rules::TypeNoneComparison),
         (Refurb, "171") => (RuleGroup::Preview, rules::refurb::rules::SingleItemMembershipTest),
         (Refurb, "177") => (RuleGroup::Preview, rules::refurb::rules::ImplicitCwd),
-        (Refurb, "181") => (RuleGroup::Preview, rules::refurb::rules::HashlibDigestHex),
 
         // flake8-logging
         (Flake8Logging, "001") => (RuleGroup::Preview, rules::flake8_logging::rules::DirectLoggerInstantiation),

crates/ruff_linter/src/importer/mod.rs

@@ -13,7 +13,7 @@ use ruff_text_size::{Ranged, TextSize};
 use ruff_diagnostics::Edit;
 use ruff_python_ast::imports::{AnyImport, Import, ImportFrom};
 use ruff_python_codegen::Stylist;
-use ruff_python_semantic::{ImportedName, SemanticModel};
+use ruff_python_semantic::SemanticModel;
 use ruff_python_trivia::textwrap::indent;
 use ruff_source_file::Locator;
 
@@ -132,48 +132,7 @@ impl<'a> Importer<'a> {
         )?;
 
         // Import the `TYPE_CHECKING` symbol from the typing module.
-        let (type_checking_edit, type_checking) =
-            if let Some(type_checking) = Self::find_type_checking(at, semantic)? {
-                // Special-case: if the `TYPE_CHECKING` symbol is imported as part of the same
-                // statement that we're modifying, avoid adding a no-op edit. For example, here,
-                // the `TYPE_CHECKING` no-op edit would overlap with the edit to remove `Final`
-                // from the import:
-                // ```python
-                // from __future__ import annotations
-                //
-                // from typing import Final, TYPE_CHECKING
-                //
-                // Const: Final[dict] = {}
-                // ```
-                let edit = if type_checking.statement(semantic) == import.statement {
-                    None
-                } else {
-                    Some(Edit::range_replacement(
-                        self.locator.slice(type_checking.range()).to_string(),
-                        type_checking.range(),
-                    ))
-                };
-                (edit, type_checking.into_name())
-            } else {
-                // Special-case: if the `TYPE_CHECKING` symbol would be added to the same import
-                // we're modifying, import it as a separate import statement. For example, here,
-                // we're concurrently removing `Final` and adding `TYPE_CHECKING`, so it's easier to
-                // use a separate import statement:
-                // ```python
-                // from __future__ import annotations
-                //
-                // from typing import Final
-                //
-                // Const: Final[dict] = {}
-                // ```
-                let (edit, name) = self.import_symbol(
-                    &ImportRequest::import_from("typing", "TYPE_CHECKING"),
-                    at,
-                    Some(import.statement),
-                    semantic,
-                )?;
-                (Some(edit), name)
-            };
+        let (type_checking_edit, type_checking) = self.get_or_import_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) {
@@ -198,21 +157,28 @@ impl<'a> Importer<'a> {
         })
     }
 
-    /// Find a reference to `typing.TYPE_CHECKING`.
-    fn find_type_checking(
+    /// 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<Option<ImportedName>, ResolutionError> {
+    ) -> Result<(Edit, String), ResolutionError> {
         for module in semantic.typing_modules() {
-            if let Some(imported_name) = Self::find_symbol(
+            if let Some((edit, name)) = self.get_symbol(
                 &ImportRequest::import_from(module, "TYPE_CHECKING"),
                 at,
                 semantic,
             )? {
-                return Ok(Some(imported_name));
+                return Ok((edit, name));
             }
         }
-        Ok(None)
+
+        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
@@ -226,15 +192,16 @@ impl<'a> Importer<'a> {
         semantic: &SemanticModel,
     ) -> Result<(Edit, String), ResolutionError> {
         self.get_symbol(symbol, at, semantic)?
-            .map_or_else(|| self.import_symbol(symbol, at, None, semantic), Ok)
+            .map_or_else(|| self.import_symbol(symbol, at, semantic), Ok)
     }
 
-    /// Return the [`ImportedName`] to for existing symbol, if it's present in the given [`SemanticModel`].
-    fn find_symbol(
+    /// Return an [`Edit`] to reference an existing symbol, if it's present in the given [`SemanticModel`].
+    fn get_symbol(
+        &self,
         symbol: &ImportRequest,
         at: TextSize,
         semantic: &SemanticModel,
-    ) -> Result<Option<ImportedName>, ResolutionError> {
+    ) -> Result<Option<(Edit, String)>, ResolutionError> {
         // If the symbol is already available in the current scope, use it.
         let Some(imported_name) =
             semantic.resolve_qualified_import_name(symbol.module, symbol.member)
@@ -259,21 +226,6 @@ impl<'a> Importer<'a> {
             return Err(ResolutionError::IncompatibleContext);
         }
 
-        Ok(Some(imported_name))
-    }
-
-    /// Return an [`Edit`] to reference an existing symbol, if it's present in the given [`SemanticModel`].
-    fn get_symbol(
-        &self,
-        symbol: &ImportRequest,
-        at: TextSize,
-        semantic: &SemanticModel,
-    ) -> Result<Option<(Edit, String)>, ResolutionError> {
-        // Find the symbol in the current scope.
-        let Some(imported_name) = Self::find_symbol(symbol, at, semantic)? else {
-            return Ok(None);
-        };
-
         // We also add a no-op edit to force conflicts with any other fixes that might try to
         // remove the import. Consider:
         //
@@ -307,13 +259,9 @@ impl<'a> Importer<'a> {
         &self,
         symbol: &ImportRequest,
         at: TextSize,
-        except: Option<&Stmt>,
         semantic: &SemanticModel,
     ) -> Result<(Edit, String), ResolutionError> {
-        if let Some(stmt) = self
-            .find_import_from(symbol.module, at)
-            .filter(|stmt| except != Some(stmt))
-        {
+        if let Some(stmt) = self.find_import_from(symbol.module, at) {
             // Case 1: `from functools import lru_cache` is in scope, and we're trying to reference
             // `functools.cache`; thus, we add `cache` to the import, and return `"cache"` as the
             // bound name.
@@ -475,18 +423,14 @@ impl RuntimeImportEdit {
 #[derive(Debug)]
 pub(crate) struct TypingImportEdit {
     /// The edit to add the `TYPE_CHECKING` symbol to the module.
-    type_checking_edit: Option<Edit>,
+    type_checking_edit: Edit,
     /// The edit to add the import to a `TYPE_CHECKING` block.
     add_import_edit: Edit,
 }
 
 impl TypingImportEdit {
-    pub(crate) fn into_edits(self) -> (Edit, Option<Edit>) {
-        if let Some(type_checking_edit) = self.type_checking_edit {
-            (type_checking_edit, Some(self.add_import_edit))
-        } else {
-            (self.add_import_edit, None)
-        }
+    pub(crate) fn into_edits(self) -> Vec<Edit> {
+        vec![self.type_checking_edit, self.add_import_edit]
     }
 }
 

crates/ruff_linter/src/linter.rs

@@ -11,7 +11,7 @@ use rustc_hash::FxHashMap;
 use ruff_diagnostics::Diagnostic;
 use ruff_notebook::Notebook;
 use ruff_python_ast::imports::ImportMap;
-use ruff_python_ast::{PySourceType, Suite};
+use ruff_python_ast::PySourceType;
 use ruff_python_codegen::Stylist;
 use ruff_python_index::Indexer;
 use ruff_python_parser::lexer::LexResult;
@@ -73,6 +73,7 @@ pub struct FixerResult<'a> {
 pub fn check_path(
     path: &Path,
     package: Option<&Path>,
+    tokens: Vec<LexResult>,
     locator: &Locator,
     stylist: &Stylist,
     indexer: &Indexer,
@@ -81,7 +82,6 @@ pub fn check_path(
     noqa: flags::Noqa,
     source_kind: &SourceKind,
     source_type: PySourceType,
-    tokens: TokenSource,
 ) -> LinterResult<(Vec<Diagnostic>, Option<ImportMap>)> {
     // Aggregate all diagnostics.
     let mut diagnostics = vec![];
@@ -144,8 +144,12 @@ pub fn check_path(
             .iter_enabled()
             .any(|rule_code| rule_code.lint_source().is_imports());
     if use_ast || use_imports || use_doc_lines {
-        // Parse, if the AST wasn't pre-provided provided.
-        match tokens.into_ast_source(source_kind, source_type, path) {
+        match ruff_python_parser::parse_program_tokens(
+            tokens,
+            source_kind.source_code(),
+            &path.to_string_lossy(),
+            source_type.is_ipynb(),
+        ) {
             Ok(python_ast) => {
                 let cell_offsets = source_kind.as_ipy_notebook().map(Notebook::cell_offsets);
                 if use_ast {
@@ -321,6 +325,7 @@ pub fn add_noqa_to_path(
     } = check_path(
         path,
         package,
+        tokens,
         &locator,
         &stylist,
         &indexer,
@@ -329,7 +334,6 @@ pub fn add_noqa_to_path(
         flags::Noqa::Disabled,
         source_kind,
         source_type,
-        TokenSource::Tokens(tokens),
     );
 
     // Log any parse errors.
@@ -361,10 +365,10 @@ pub fn lint_only(
     noqa: flags::Noqa,
     source_kind: &SourceKind,
     source_type: PySourceType,
-    data: ParseSource,
 ) -> LinterResult<(Vec<Message>, Option<ImportMap>)> {
     // Tokenize once.
-    let tokens = data.into_token_source(source_kind, source_type);
+    let tokens: Vec<LexResult> =
+        ruff_python_parser::tokenize(source_kind.source_code(), source_type.as_mode());
 
     // Map row and column locations to byte slices (lazily).
     let locator = Locator::new(source_kind.source_code());
@@ -387,6 +391,7 @@ pub fn lint_only(
     let result = check_path(
         path,
         package,
+        tokens,
         &locator,
         &stylist,
         &indexer,
@@ -395,7 +400,6 @@ pub fn lint_only(
         noqa,
         source_kind,
         source_type,
-        tokens,
     );
 
     result.map(|(diagnostics, imports)| {
@@ -483,6 +487,7 @@ pub fn lint_fix<'a>(
         let result = check_path(
             path,
             package,
+            tokens,
             &locator,
             &stylist,
             &indexer,
@@ -491,7 +496,6 @@ pub fn lint_fix<'a>(
             noqa,
             &transformed,
             source_type,
-            TokenSource::Tokens(tokens),
         );
 
         if iterations == 0 {
@@ -628,95 +632,6 @@ This indicates a bug in Ruff. If you could open an issue at:
     }
 }
 
-#[derive(Debug, Clone)]
-pub enum ParseSource<'a> {
-    /// Extract the tokens and AST from the given source code.
-    None,
-    /// Use the precomputed tokens and AST.
-    Precomputed {
-        tokens: &'a [LexResult],
-        ast: &'a Suite,
-    },
-}
-
-impl<'a> ParseSource<'a> {
-    /// Convert to a [`TokenSource`], tokenizing if necessary.
-    fn into_token_source(
-        self,
-        source_kind: &SourceKind,
-        source_type: PySourceType,
-    ) -> TokenSource<'a> {
-        match self {
-            Self::None => TokenSource::Tokens(ruff_python_parser::tokenize(
-                source_kind.source_code(),
-                source_type.as_mode(),
-            )),
-            Self::Precomputed { tokens, ast } => TokenSource::Precomputed { tokens, ast },
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum TokenSource<'a> {
-    /// Use the precomputed tokens to generate the AST.
-    Tokens(Vec<LexResult>),
-    /// Use the precomputed tokens and AST.
-    Precomputed {
-        tokens: &'a [LexResult],
-        ast: &'a Suite,
-    },
-}
-
-impl Deref for TokenSource<'_> {
-    type Target = [LexResult];
-
-    fn deref(&self) -> &Self::Target {
-        match self {
-            Self::Tokens(tokens) => tokens,
-            Self::Precomputed { tokens, .. } => tokens,
-        }
-    }
-}
-
-impl<'a> TokenSource<'a> {
-    /// Convert to an [`AstSource`], parsing if necessary.
-    fn into_ast_source(
-        self,
-        source_kind: &SourceKind,
-        source_type: PySourceType,
-        path: &Path,
-    ) -> Result<AstSource<'a>, ParseError> {
-        match self {
-            Self::Tokens(tokens) => Ok(AstSource::Ast(ruff_python_parser::parse_program_tokens(
-                tokens,
-                source_kind.source_code(),
-                &path.to_string_lossy(),
-                source_type.is_ipynb(),
-            )?)),
-            Self::Precomputed { ast, .. } => Ok(AstSource::Precomputed(ast)),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum AstSource<'a> {
-    /// Extract the AST from the given source code.
-    Ast(Suite),
-    /// Use the precomputed AST.
-    Precomputed(&'a Suite),
-}
-
-impl Deref for AstSource<'_> {
-    type Target = Suite;
-
-    fn deref(&self) -> &Self::Target {
-        match self {
-            Self::Ast(ast) => ast,
-            Self::Precomputed(ast) => ast,
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use std::path::Path;

crates/ruff_linter/src/message/mod.rs

@@ -17,7 +17,6 @@ use ruff_diagnostics::{Diagnostic, DiagnosticKind, Fix};
 use ruff_notebook::NotebookIndex;
 use ruff_source_file::{SourceFile, SourceLocation};
 use ruff_text_size::{Ranged, TextRange, TextSize};
-pub use sarif::SarifEmitter;
 pub use text::TextEmitter;
 
 mod azure;
@@ -29,7 +28,6 @@ mod json;
 mod json_lines;
 mod junit;
 mod pylint;
-mod sarif;
 mod text;
 
 #[derive(Debug, PartialEq, Eq)]

crates/ruff_linter/src/message/sarif.rs

@@ -1,212 +0,0 @@
-use std::io::Write;
-
-use anyhow::Result;
-use serde::{Serialize, Serializer};
-use serde_json::json;
-
-use ruff_source_file::OneIndexed;
-
-use crate::codes::Rule;
-use crate::fs::normalize_path;
-use crate::message::{Emitter, EmitterContext, Message};
-use crate::registry::{AsRule, Linter, RuleNamespace};
-use crate::VERSION;
-
-use strum::IntoEnumIterator;
-
-pub struct SarifEmitter;
-
-impl Emitter for SarifEmitter {
-    fn emit(
-        &mut self,
-        writer: &mut dyn Write,
-        messages: &[Message],
-        _context: &EmitterContext,
-    ) -> Result<()> {
-        let results = messages
-            .iter()
-            .map(SarifResult::from_message)
-            .collect::<Result<Vec<_>>>()?;
-
-        let output = json!({
-            "$schema": "https://json.schemastore.org/sarif-2.1.0.json",
-            "version": "2.1.0",
-            "runs": [{
-                "tool": {
-                    "driver": {
-                        "name": "ruff",
-                        "informationUri": "https://github.com/astral-sh/ruff",
-                        "rules": Rule::iter().map(SarifRule::from).collect::<Vec<_>>(),
-                        "version": VERSION.to_string(),
-                    }
-                },
-                "results": results,
-            }],
-        });
-        serde_json::to_writer_pretty(writer, &output)?;
-        Ok(())
-    }
-}
-
-#[derive(Debug, Clone)]
-struct SarifRule<'a> {
-    name: &'a str,
-    code: String,
-    linter: &'a str,
-    summary: &'a str,
-    explanation: Option<&'a str>,
-    url: Option<String>,
-}
-
-impl From<Rule> for SarifRule<'_> {
-    fn from(rule: Rule) -> Self {
-        let code = rule.noqa_code().to_string();
-        let (linter, _) = Linter::parse_code(&code).unwrap();
-        Self {
-            name: rule.into(),
-            code,
-            linter: linter.name(),
-            summary: rule.message_formats()[0],
-            explanation: rule.explanation(),
-            url: rule.url(),
-        }
-    }
-}
-
-impl Serialize for SarifRule<'_> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        json!({
-            "id": self.code,
-            "shortDescription": {
-                "text": self.summary,
-            },
-            "fullDescription": {
-                "text": self.explanation,
-            },
-            "help": {
-                "text": self.summary,
-            },
-            "helpUri": self.url,
-            "properties": {
-                "id": self.code,
-                "kind": self.linter,
-                "name": self.name,
-                "problem.severity": "error".to_string(),
-            },
-        })
-        .serialize(serializer)
-    }
-}
-
-#[derive(Debug)]
-struct SarifResult {
-    rule: Rule,
-    level: String,
-    message: String,
-    uri: String,
-    start_line: OneIndexed,
-    start_column: OneIndexed,
-    end_line: OneIndexed,
-    end_column: OneIndexed,
-}
-
-impl SarifResult {
-    #[cfg(not(target_arch = "wasm32"))]
-    fn from_message(message: &Message) -> Result<Self> {
-        let start_location = message.compute_start_location();
-        let end_location = message.compute_end_location();
-        let path = normalize_path(message.filename());
-        Ok(Self {
-            rule: message.kind.rule(),
-            level: "error".to_string(),
-            message: message.kind.name.clone(),
-            uri: url::Url::from_file_path(&path)
-                .map_err(|()| anyhow::anyhow!("Failed to convert path to URL: {}", path.display()))?
-                .to_string(),
-            start_line: start_location.row,
-            start_column: start_location.column,
-            end_line: end_location.row,
-            end_column: end_location.column,
-        })
-    }
-
-    #[cfg(target_arch = "wasm32")]
-    #[allow(clippy::unnecessary_wraps)]
-    fn from_message(message: &Message) -> Result<Self> {
-        let start_location = message.compute_start_location();
-        let end_location = message.compute_end_location();
-        let path = normalize_path(message.filename());
-        Ok(Self {
-            rule: message.kind.rule(),
-            level: "error".to_string(),
-            message: message.kind.name.clone(),
-            uri: path.display().to_string(),
-            start_line: start_location.row,
-            start_column: start_location.column,
-            end_line: end_location.row,
-            end_column: end_location.column,
-        })
-    }
-}
-
-impl Serialize for SarifResult {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        json!({
-            "level": self.level,
-            "message": {
-                "text": self.message,
-            },
-            "locations": [{
-                "physicalLocation": {
-                    "artifactLocation": {
-                        "uri": self.uri,
-                    },
-                    "region": {
-                        "startLine": self.start_line,
-                        "startColumn": self.start_column,
-                        "endLine": self.end_line,
-                        "endColumn": self.end_column,
-                    }
-                }
-            }],
-            "ruleId": self.rule.noqa_code().to_string(),
-        })
-        .serialize(serializer)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::message::tests::{capture_emitter_output, create_messages};
-    use crate::message::SarifEmitter;
-
-    fn get_output() -> String {
-        let mut emitter = SarifEmitter {};
-        capture_emitter_output(&mut emitter, &create_messages())
-    }
-
-    #[test]
-    fn valid_json() {
-        let content = get_output();
-        serde_json::from_str::<serde_json::Value>(&content).unwrap();
-    }
-
-    #[test]
-    fn test_results() {
-        let content = get_output();
-        let sarif = serde_json::from_str::<serde_json::Value>(content.as_str()).unwrap();
-        let rules = sarif["runs"][0]["tool"]["driver"]["rules"]
-            .as_array()
-            .unwrap();
-        let results = sarif["runs"][0]["results"].as_array().unwrap();
-        assert_eq!(results.len(), 3);
-        assert!(rules.len() > 3);
-    }
-}

crates/ruff_linter/src/rule_selector.rs

@@ -243,17 +243,6 @@ pub struct PreviewOptions {
     pub require_explicit: bool,
 }
 
-impl PreviewOptions {
-    /// Return a copy with the same preview mode setting but require explicit disabled.
-    #[must_use]
-    pub fn without_require_explicit(&self) -> Self {
-        Self {
-            mode: self.mode,
-            require_explicit: false,
-        }
-    }
-}
-
 #[cfg(feature = "schemars")]
 mod schema {
     use itertools::Itertools;

crates/ruff_linter/src/rules/flake8_annotations/helpers.rs

@@ -3,7 +3,7 @@ use rustc_hash::FxHashSet;
 
 use ruff_diagnostics::Edit;
 use ruff_python_ast::helpers::{
-    pep_604_union, typing_optional, typing_union, ReturnStatementVisitor, Terminal,
+    implicit_return, pep_604_union, typing_optional, typing_union, ReturnStatementVisitor,
 };
 use ruff_python_ast::visitor::Visitor;
 use ruff_python_ast::{self as ast, Expr, ExprContext};
@@ -57,14 +57,6 @@ pub(crate) fn auto_return_type(function: &ast::StmtFunctionDef) -> Option<AutoPy
         visitor.returns
     };
 
-    // Determine the terminal behavior (i.e., implicit return, no return, etc.).
-    let terminal = Terminal::from_function(function);
-
-    // If every control flow path raises an exception, return `NoReturn`.
-    if terminal == Some(Terminal::Raise) {
-        return Some(AutoPythonType::Never);
-    }
-
     // Determine the return type of the first `return` statement.
     let Some((return_statement, returns)) = returns.split_first() else {
         return Some(AutoPythonType::Atom(PythonType::None));
@@ -88,7 +80,7 @@ pub(crate) fn auto_return_type(function: &ast::StmtFunctionDef) -> Option<AutoPy
     //     if x > 0:
     //         return 1
     // ```
-    if terminal.is_none() {
+    if implicit_return(function) {
         return_type = return_type.union(ResolvedPythonType::Atom(PythonType::None));
     }
 
@@ -102,7 +94,6 @@ pub(crate) fn auto_return_type(function: &ast::StmtFunctionDef) -> Option<AutoPy
 
 #[derive(Debug)]
 pub(crate) enum AutoPythonType {
-    Never,
     Atom(PythonType),
     Union(FxHashSet<PythonType>),
 }
@@ -120,28 +111,6 @@ impl AutoPythonType {
         target_version: PythonVersion,
     ) -> Option<(Expr, Vec<Edit>)> {
         match self {
-            AutoPythonType::Never => {
-                let (no_return_edit, binding) = importer
-                    .get_or_import_symbol(
-                        &ImportRequest::import_from(
-                            "typing",
-                            if target_version >= PythonVersion::Py311 {
-                                "Never"
-                            } else {
-                                "NoReturn"
-                            },
-                        ),
-                        at,
-                        semantic,
-                    )
-                    .ok()?;
-                let expr = Expr::Name(ast::ExprName {
-                    id: binding,
-                    range: TextRange::default(),
-                    ctx: ExprContext::Load,
-                });
-                Some((expr, vec![no_return_edit]))
-            }
             AutoPythonType::Atom(python_type) => {
                 let expr = type_expr(python_type)?;
                 Some((expr, vec![]))

crates/ruff_linter/src/rules/flake8_annotations/rules/definition.rs

@@ -482,6 +482,7 @@ impl Violation for AnyType {
         format!("Dynamically typed expressions (typing.Any) are disallowed in `{name}`")
     }
 }
+
 fn is_none_returning(body: &[Stmt]) -> bool {
     let mut visitor = ReturnStatementVisitor::default();
     visitor.visit_body(body);
@@ -536,41 +537,17 @@ fn check_dynamically_typed<F>(
     }
 }
 
-/// Return `true` if a function appears to be a stub.
-fn is_stub_function(function_def: &ast::StmtFunctionDef, checker: &Checker) -> bool {
-    /// Returns `true` if a function has an empty body.
-    fn is_empty_body(function_def: &ast::StmtFunctionDef) -> bool {
-        function_def.body.iter().all(|stmt| match stmt {
-            Stmt::Pass(_) => true,
-            Stmt::Expr(ast::StmtExpr { value, range: _ }) => {
-                matches!(
-                    value.as_ref(),
-                    Expr::StringLiteral(_) | Expr::EllipsisLiteral(_)
-                )
-            }
-            _ => false,
-        })
-    }
-
-    // Ignore functions with empty bodies in...
-    if is_empty_body(function_def) {
-        // Stub definitions (.pyi files)...
-        if checker.source_type.is_stub() {
-            return true;
+fn is_empty_body(body: &[Stmt]) -> bool {
+    body.iter().all(|stmt| match stmt {
+        Stmt::Pass(_) => true,
+        Stmt::Expr(ast::StmtExpr { value, range: _ }) => {
+            matches!(
+                value.as_ref(),
+                Expr::StringLiteral(_) | Expr::EllipsisLiteral(_)
+            )
         }
-
-        // Abstract methods...
-        if visibility::is_abstract(&function_def.decorator_list, checker.semantic()) {
-            return true;
-        }
-
-        // Overload definitions...
-        if visibility::is_overload(&function_def.decorator_list, checker.semantic()) {
-            return true;
-        }
-    }
-
-    false
+        _ => false,
+    })
 }
 
 /// Generate flake8-annotation checks for a given `Definition`.
@@ -761,7 +738,9 @@ pub(crate) fn definition(
     ) {
         if is_method && visibility::is_classmethod(decorator_list, checker.semantic()) {
             if checker.enabled(Rule::MissingReturnTypeClassMethod) {
-                let return_type = if is_stub_function(function, checker) {
+                let return_type = if visibility::is_abstract(decorator_list, checker.semantic())
+                    && is_empty_body(body)
+                {
                     None
                 } else {
                     auto_return_type(function)
@@ -792,7 +771,9 @@ pub(crate) fn definition(
             }
         } else if is_method && visibility::is_staticmethod(decorator_list, checker.semantic()) {
             if checker.enabled(Rule::MissingReturnTypeStaticMethod) {
-                let return_type = if is_stub_function(function, checker) {
+                let return_type = if visibility::is_abstract(decorator_list, checker.semantic())
+                    && is_empty_body(body)
+                {
                     None
                 } else {
                     auto_return_type(function)
@@ -862,22 +843,25 @@ pub(crate) fn definition(
             match visibility {
                 visibility::Visibility::Public => {
                     if checker.enabled(Rule::MissingReturnTypeUndocumentedPublicFunction) {
-                        let return_type = if is_stub_function(function, checker) {
-                            None
-                        } else {
-                            auto_return_type(function)
-                                .and_then(|return_type| {
-                                    return_type.into_expression(
-                                        checker.importer(),
-                                        function.parameters.start(),
-                                        checker.semantic(),
-                                        checker.settings.target_version,
-                                    )
-                                })
-                                .map(|(return_type, edits)| {
-                                    (checker.generator().expr(&return_type), edits)
-                                })
-                        };
+                        let return_type =
+                            if visibility::is_abstract(decorator_list, checker.semantic())
+                                && is_empty_body(body)
+                            {
+                                None
+                            } else {
+                                auto_return_type(function)
+                                    .and_then(|return_type| {
+                                        return_type.into_expression(
+                                            checker.importer(),
+                                            function.parameters.start(),
+                                            checker.semantic(),
+                                            checker.settings.target_version,
+                                        )
+                                    })
+                                    .map(|(return_type, edits)| {
+                                        (checker.generator().expr(&return_type), edits)
+                                    })
+                            };
                         let mut diagnostic = Diagnostic::new(
                             MissingReturnTypeUndocumentedPublicFunction {
                                 name: name.to_string(),
@@ -901,22 +885,25 @@ pub(crate) fn definition(
                 }
                 visibility::Visibility::Private => {
                     if checker.enabled(Rule::MissingReturnTypePrivateFunction) {
-                        let return_type = if is_stub_function(function, checker) {
-                            None
-                        } else {
-                            auto_return_type(function)
-                                .and_then(|return_type| {
-                                    return_type.into_expression(
-                                        checker.importer(),
-                                        function.parameters.start(),
-                                        checker.semantic(),
-                                        checker.settings.target_version,
-                                    )
-                                })
-                                .map(|(return_type, edits)| {
-                                    (checker.generator().expr(&return_type), edits)
-                                })
-                        };
+                        let return_type =
+                            if visibility::is_abstract(decorator_list, checker.semantic())
+                                && is_empty_body(body)
+                            {
+                                None
+                            } else {
+                                auto_return_type(function)
+                                    .and_then(|return_type| {
+                                        return_type.into_expression(
+                                            checker.importer(),
+                                            function.parameters.start(),
+                                            checker.semantic(),
+                                            checker.settings.target_version,
+                                        )
+                                    })
+                                    .map(|(return_type, edits)| {
+                                        (checker.generator().expr(&return_type), edits)
+                                    })
+                            };
                         let mut diagnostic = Diagnostic::new(
                             MissingReturnTypePrivateFunction {
                                 name: name.to_string(),

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

@@ -495,88 +495,4 @@ auto_return_type.py:180:9: ANN201 [*] Missing return type annotation for public
 182 182 |             return 1
 183 183 |         else:
 
-auto_return_type.py:187:5: ANN201 [*] Missing return type annotation for public function `func`
-    |
-187 | def func(x: int):
-    |     ^^^^ ANN201
-188 |     try:
-189 |         pass
-    |
-    = help: Add return type annotation: `int | None`
-
-ℹ Unsafe fix
-184 184 |             return 1.5
-185 185 | 
-186 186 | 
-187     |-def func(x: int):
-    187 |+def func(x: int) -> int | None:
-188 188 |     try:
-189 189 |         pass
-190 190 |     except:
-
-auto_return_type.py:194:5: ANN201 [*] Missing return type annotation for public function `func`
-    |
-194 | def func(x: int):
-    |     ^^^^ ANN201
-195 |     try:
-196 |         pass
-    |
-    = help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-191 191 |         return 2
-192 192 | 
-193 193 | 
-194     |-def func(x: int):
-    194 |+def func(x: int) -> int:
-195 195 |     try:
-196 196 |         pass
-197 197 |     except:
-
-auto_return_type.py:203:5: ANN201 [*] Missing return type annotation for public function `func`
-    |
-203 | def func(x: int):
-    |     ^^^^ ANN201
-204 |     if not x:
-205 |         raise ValueError
-    |
-    = help: Add return type annotation: `Never`
-
-ℹ Unsafe fix
-151 151 | 
-152 152 | import abc
-153 153 | from abc import abstractmethod
-    154 |+from typing import Never
-154 155 | 
-155 156 | 
-156 157 | class Foo(abc.ABC):
---------------------------------------------------------------------------------
-200 201 |         return 3
-201 202 | 
-202 203 | 
-203     |-def func(x: int):
-    204 |+def func(x: int) -> Never:
-204 205 |     if not x:
-205 206 |         raise ValueError
-206 207 |     else:
-
-auto_return_type.py:210:5: ANN201 [*] Missing return type annotation for public function `func`
-    |
-210 | def func(x: int):
-    |     ^^^^ ANN201
-211 |     if not x:
-212 |         raise ValueError
-    |
-    = help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-207 207 |         raise TypeError
-208 208 | 
-209 209 | 
-210     |-def func(x: int):
-    210 |+def func(x: int) -> int:
-211 211 |     if not x:
-212 212 |         raise ValueError
-213 213 |     else:
-
 

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

@@ -550,96 +550,4 @@ auto_return_type.py:180:9: ANN201 [*] Missing return type annotation for public
 182 182 |             return 1
 183 183 |         else:
 
-auto_return_type.py:187:5: ANN201 [*] Missing return type annotation for public function `func`
-    |
-187 | def func(x: int):
-    |     ^^^^ ANN201
-188 |     try:
-189 |         pass
-    |
-    = help: Add return type annotation: `Optional[int]`
-
-ℹ Unsafe fix
-151 151 | 
-152 152 | import abc
-153 153 | from abc import abstractmethod
-    154 |+from typing import Optional
-154 155 | 
-155 156 | 
-156 157 | class Foo(abc.ABC):
---------------------------------------------------------------------------------
-184 185 |             return 1.5
-185 186 | 
-186 187 | 
-187     |-def func(x: int):
-    188 |+def func(x: int) -> Optional[int]:
-188 189 |     try:
-189 190 |         pass
-190 191 |     except:
-
-auto_return_type.py:194:5: ANN201 [*] Missing return type annotation for public function `func`
-    |
-194 | def func(x: int):
-    |     ^^^^ ANN201
-195 |     try:
-196 |         pass
-    |
-    = help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-191 191 |         return 2
-192 192 | 
-193 193 | 
-194     |-def func(x: int):
-    194 |+def func(x: int) -> int:
-195 195 |     try:
-196 196 |         pass
-197 197 |     except:
-
-auto_return_type.py:203:5: ANN201 [*] Missing return type annotation for public function `func`
-    |
-203 | def func(x: int):
-    |     ^^^^ ANN201
-204 |     if not x:
-205 |         raise ValueError
-    |
-    = help: Add return type annotation: `NoReturn`
-
-ℹ Unsafe fix
-151 151 | 
-152 152 | import abc
-153 153 | from abc import abstractmethod
-    154 |+from typing import NoReturn
-154 155 | 
-155 156 | 
-156 157 | class Foo(abc.ABC):
---------------------------------------------------------------------------------
-200 201 |         return 3
-201 202 | 
-202 203 | 
-203     |-def func(x: int):
-    204 |+def func(x: int) -> NoReturn:
-204 205 |     if not x:
-205 206 |         raise ValueError
-206 207 |     else:
-
-auto_return_type.py:210:5: ANN201 [*] Missing return type annotation for public function `func`
-    |
-210 | def func(x: int):
-    |     ^^^^ ANN201
-211 |     if not x:
-212 |         raise ValueError
-    |
-    = help: Add return type annotation: `int`
-
-ℹ Unsafe fix
-207 207 |         raise TypeError
-208 208 | 
-209 209 | 
-210     |-def func(x: int):
-    210 |+def func(x: int) -> int:
-211 211 |     if not x:
-212 212 |         raise ValueError
-213 213 |     else:
-
 

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

@@ -1,9 +1,6 @@
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::{self as ast, StringLike};
-use ruff_text_size::Ranged;
-
-use crate::checkers::ast::Checker;
+use ruff_python_ast::ExprStringLiteral;
 
 /// ## What it does
 /// Checks for hardcoded bindings to all network interfaces (`0.0.0.0`).
@@ -37,16 +34,10 @@ impl Violation for HardcodedBindAllInterfaces {
 }
 
 /// S104
-pub(crate) fn hardcoded_bind_all_interfaces(checker: &mut Checker, string: StringLike) {
-    let is_bind_all_interface = match string {
-        StringLike::StringLiteral(ast::ExprStringLiteral { value, .. }) => value == "0.0.0.0",
-        StringLike::FStringLiteral(ast::FStringLiteralElement { value, .. }) => value == "0.0.0.0",
-        StringLike::BytesLiteral(_) => return,
-    };
-
-    if is_bind_all_interface {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(HardcodedBindAllInterfaces, string.range()));
+pub(crate) fn hardcoded_bind_all_interfaces(string: &ExprStringLiteral) -> Option<Diagnostic> {
+    if string.value.to_str() == "0.0.0.0" {
+        Some(Diagnostic::new(HardcodedBindAllInterfaces, string.range))
+    } else {
+        None
     }
 }

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

@@ -57,7 +57,7 @@ impl Violation for HardcodedSQLExpression {
 /// becomes `foobar {x}baz`.
 fn concatenated_f_string(expr: &ast::ExprFString, locator: &Locator) -> String {
     expr.value
-        .iter()
+        .parts()
         .filter_map(|part| {
             raw_contents(locator.slice(part)).map(|s| s.escape_default().to_string())
         })

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

@@ -1,5 +1,4 @@
-use ruff_python_ast::{self as ast, Expr, StringLike};
-use ruff_text_size::Ranged;
+use ruff_python_ast::{self as ast, Expr};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -52,19 +51,13 @@ impl Violation for HardcodedTempFile {
 }
 
 /// S108
-pub(crate) fn hardcoded_tmp_directory(checker: &mut Checker, string: StringLike) {
-    let value = match string {
-        StringLike::StringLiteral(ast::ExprStringLiteral { value, .. }) => value.to_str(),
-        StringLike::FStringLiteral(ast::FStringLiteralElement { value, .. }) => value,
-        StringLike::BytesLiteral(_) => return,
-    };
-
+pub(crate) fn hardcoded_tmp_directory(checker: &mut Checker, string: &ast::ExprStringLiteral) {
     if !checker
         .settings
         .flake8_bandit
         .hardcoded_tmp_directory
         .iter()
-        .any(|prefix| value.starts_with(prefix))
+        .any(|prefix| string.value.to_str().starts_with(prefix))
     {
         return;
     }
@@ -83,8 +76,8 @@ pub(crate) fn hardcoded_tmp_directory(checker: &mut Checker, string: StringLike)
 
     checker.diagnostics.push(Diagnostic::new(
         HardcodedTempFile {
-            string: value.to_string(),
+            string: string.value.to_string(),
         },
-        string.range(),
+        string.range,
     ));
 }

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

@@ -7,7 +7,6 @@ S104.py:9:1: S104 Possible binding to all interfaces
  9 | "0.0.0.0"
    | ^^^^^^^^^ S104
 10 | '0.0.0.0'
-11 | f"0.0.0.0"
    |
 
 S104.py:10:1: S104 Possible binding to all interfaces
@@ -16,30 +15,21 @@ S104.py:10:1: S104 Possible binding to all interfaces
  9 | "0.0.0.0"
 10 | '0.0.0.0'
    | ^^^^^^^^^ S104
-11 | f"0.0.0.0"
    |
 
-S104.py:11:3: S104 Possible binding to all interfaces
+S104.py:14:6: S104 Possible binding to all interfaces
    |
- 9 | "0.0.0.0"
-10 | '0.0.0.0'
-11 | f"0.0.0.0"
-   |   ^^^^^^^ S104
-   |
-
-S104.py:15:6: S104 Possible binding to all interfaces
-   |
-14 | # Error
-15 | func("0.0.0.0")
+13 | # Error
+14 | func("0.0.0.0")
    |      ^^^^^^^^^ S104
    |
 
-S104.py:19:9: S104 Possible binding to all interfaces
+S104.py:18:9: S104 Possible binding to all interfaces
    |
-18 | def my_func():
-19 |     x = "0.0.0.0"
+17 | def my_func():
+18 |     x = "0.0.0.0"
    |         ^^^^^^^^^ S104
-20 |     print(x)
+19 |     print(x)
    |
 
 

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

@@ -10,31 +10,22 @@ S108.py:5:11: S108 Probable insecure usage of temporary file or directory: "/tmp
 6 |     f.write("def")
   |
 
-S108.py:8:13: S108 Probable insecure usage of temporary file or directory: "/tmp/abc"
+S108.py:8:11: S108 Probable insecure usage of temporary file or directory: "/var/tmp/123"
   |
 6 |     f.write("def")
 7 | 
-8 | with open(f"/tmp/abc", "w") as f:
-  |             ^^^^^^^^ S108
+8 | with open("/var/tmp/123", "w") as f:
+  |           ^^^^^^^^^^^^^^ S108
 9 |     f.write("def")
   |
 
-S108.py:11:11: S108 Probable insecure usage of temporary file or directory: "/var/tmp/123"
+S108.py:11:11: S108 Probable insecure usage of temporary file or directory: "/dev/shm/unit/test"
    |
  9 |     f.write("def")
 10 | 
-11 | with open("/var/tmp/123", "w") as f:
-   |           ^^^^^^^^^^^^^^ S108
-12 |     f.write("def")
-   |
-
-S108.py:14:11: S108 Probable insecure usage of temporary file or directory: "/dev/shm/unit/test"
-   |
-12 |     f.write("def")
-13 | 
-14 | with open("/dev/shm/unit/test", "w") as f:
+11 | with open("/dev/shm/unit/test", "w") as f:
    |           ^^^^^^^^^^^^^^^^^^^^ S108
-15 |     f.write("def")
+12 |     f.write("def")
    |
 
 

crates/ruff_linter/src/rules/flake8_bandit/snapshots/ruff_linter__rules__flake8_bandit__tests__S108_extend.snap

@@ -10,39 +10,30 @@ S108.py:5:11: S108 Probable insecure usage of temporary file or directory: "/tmp
 6 |     f.write("def")
   |
 
-S108.py:8:13: S108 Probable insecure usage of temporary file or directory: "/tmp/abc"
+S108.py:8:11: S108 Probable insecure usage of temporary file or directory: "/var/tmp/123"
   |
 6 |     f.write("def")
 7 | 
-8 | with open(f"/tmp/abc", "w") as f:
-  |             ^^^^^^^^ S108
+8 | with open("/var/tmp/123", "w") as f:
+  |           ^^^^^^^^^^^^^^ S108
 9 |     f.write("def")
   |
 
-S108.py:11:11: S108 Probable insecure usage of temporary file or directory: "/var/tmp/123"
+S108.py:11:11: S108 Probable insecure usage of temporary file or directory: "/dev/shm/unit/test"
    |
  9 |     f.write("def")
 10 | 
-11 | with open("/var/tmp/123", "w") as f:
-   |           ^^^^^^^^^^^^^^ S108
-12 |     f.write("def")
-   |
-
-S108.py:14:11: S108 Probable insecure usage of temporary file or directory: "/dev/shm/unit/test"
-   |
-12 |     f.write("def")
-13 | 
-14 | with open("/dev/shm/unit/test", "w") as f:
+11 | with open("/dev/shm/unit/test", "w") as f:
    |           ^^^^^^^^^^^^^^^^^^^^ S108
-15 |     f.write("def")
+12 |     f.write("def")
    |
 
-S108.py:18:11: S108 Probable insecure usage of temporary file or directory: "/foo/bar"
+S108.py:15:11: S108 Probable insecure usage of temporary file or directory: "/foo/bar"
    |
-17 | # not ok by config
-18 | with open("/foo/bar", "w") as f:
+14 | # not ok by config
+15 | with open("/foo/bar", "w") as f:
    |           ^^^^^^^^^^ S108
-19 |     f.write("def")
+16 |     f.write("def")
    |
 
 

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

@@ -1,4 +1,4 @@
-use ruff_diagnostics::{AlwaysFixableViolation, Applicability, Diagnostic, Fix};
+use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 
 use ruff_python_ast::{self as ast, Arguments, Expr};
@@ -6,7 +6,6 @@ use ruff_python_semantic::SemanticModel;
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
-use crate::fix::edits::add_argument;
 
 /// ## What it does
 /// Checks for `zip` calls without an explicit `strict` parameter.
@@ -29,25 +28,16 @@ use crate::fix::edits::add_argument;
 /// zip(a, b, strict=True)
 /// ```
 ///
-/// ## Fix safety
-/// This rule's fix is marked as unsafe for `zip` calls that contain
-/// `**kwargs`, as adding a `check` keyword argument to such a call may lead
-/// to a duplicate keyword argument error.
-///
 /// ## References
 /// - [Python documentation: `zip`](https://docs.python.org/3/library/functions.html#zip)
 #[violation]
 pub struct ZipWithoutExplicitStrict;
 
-impl AlwaysFixableViolation for ZipWithoutExplicitStrict {
+impl Violation for ZipWithoutExplicitStrict {
     #[derive_message_formats]
     fn message(&self) -> String {
         format!("`zip()` without an explicit `strict=` parameter")
     }
-
-    fn fix_title(&self) -> String {
-        "Add explicit `strict=False`".to_string()
-    }
 }
 
 /// B905
@@ -62,27 +52,9 @@ pub(crate) fn zip_without_explicit_strict(checker: &mut Checker, call: &ast::Exp
                 .iter()
                 .any(|arg| is_infinite_iterator(arg, checker.semantic()))
         {
-            let mut diagnostic = Diagnostic::new(ZipWithoutExplicitStrict, call.range());
-            diagnostic.set_fix(Fix::applicable_edit(
-                add_argument(
-                    "strict=False",
-                    &call.arguments,
-                    checker.indexer().comment_ranges(),
-                    checker.locator().contents(),
-                ),
-                // If the function call contains `**kwargs`, mark the fix as unsafe.
-                if call
-                    .arguments
-                    .keywords
-                    .iter()
-                    .any(|keyword| keyword.arg.is_none())
-                {
-                    Applicability::Unsafe
-                } else {
-                    Applicability::Safe
-                },
-            ));
-            checker.diagnostics.push(diagnostic);
+            checker
+                .diagnostics
+                .push(Diagnostic::new(ZipWithoutExplicitStrict, call.range()));
         }
     }
 }

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

@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
 ---
-B905.py:4:1: B905 [*] `zip()` without an explicit `strict=` parameter
+B905.py:4:1: B905 `zip()` without an explicit `strict=` parameter
   |
 3 | # Errors
 4 | zip()
@@ -9,19 +9,8 @@ B905.py:4:1: B905 [*] `zip()` without an explicit `strict=` parameter
 5 | zip(range(3))
 6 | zip("a", "b")
   |
-  = help: Add explicit `strict=False`
 
-ℹ Safe fix
-1 1 | from itertools import count, cycle, repeat
-2 2 | 
-3 3 | # Errors
-4   |-zip()
-  4 |+zip(strict=False)
-5 5 | zip(range(3))
-6 6 | zip("a", "b")
-7 7 | zip("a", "b", *zip("c"))
-
-B905.py:5:1: B905 [*] `zip()` without an explicit `strict=` parameter
+B905.py:5:1: B905 `zip()` without an explicit `strict=` parameter
   |
 3 | # Errors
 4 | zip()
@@ -30,19 +19,8 @@ B905.py:5:1: B905 [*] `zip()` without an explicit `strict=` parameter
 6 | zip("a", "b")
 7 | zip("a", "b", *zip("c"))
   |
-  = help: Add explicit `strict=False`
 
-ℹ Safe fix
-2 2 | 
-3 3 | # Errors
-4 4 | zip()
-5   |-zip(range(3))
-  5 |+zip(range(3), strict=False)
-6 6 | zip("a", "b")
-7 7 | zip("a", "b", *zip("c"))
-8 8 | zip(zip("a"), strict=False)
-
-B905.py:6:1: B905 [*] `zip()` without an explicit `strict=` parameter
+B905.py:6:1: B905 `zip()` without an explicit `strict=` parameter
   |
 4 | zip()
 5 | zip(range(3))
@@ -51,19 +29,8 @@ B905.py:6:1: B905 [*] `zip()` without an explicit `strict=` parameter
 7 | zip("a", "b", *zip("c"))
 8 | zip(zip("a"), strict=False)
   |
-  = help: Add explicit `strict=False`
 
-ℹ Safe fix
-3 3 | # Errors
-4 4 | zip()
-5 5 | zip(range(3))
-6   |-zip("a", "b")
-  6 |+zip("a", "b", strict=False)
-7 7 | zip("a", "b", *zip("c"))
-8 8 | zip(zip("a"), strict=False)
-9 9 | zip(zip("a", strict=True))
-
-B905.py:7:1: B905 [*] `zip()` without an explicit `strict=` parameter
+B905.py:7:1: B905 `zip()` without an explicit `strict=` parameter
   |
 5 | zip(range(3))
 6 | zip("a", "b")
@@ -72,19 +39,8 @@ B905.py:7:1: B905 [*] `zip()` without an explicit `strict=` parameter
 8 | zip(zip("a"), strict=False)
 9 | zip(zip("a", strict=True))
   |
-  = help: Add explicit `strict=False`
 
-ℹ Safe fix
-4 4 | zip()
-5 5 | zip(range(3))
-6 6 | zip("a", "b")
-7   |-zip("a", "b", *zip("c"))
-  7 |+zip("a", "b", *zip("c"), strict=False)
-8 8 | zip(zip("a"), strict=False)
-9 9 | zip(zip("a", strict=True))
-10 10 | 
-
-B905.py:7:16: B905 [*] `zip()` without an explicit `strict=` parameter
+B905.py:7:16: B905 `zip()` without an explicit `strict=` parameter
   |
 5 | zip(range(3))
 6 | zip("a", "b")
@@ -93,19 +49,8 @@ B905.py:7:16: B905 [*] `zip()` without an explicit `strict=` parameter
 8 | zip(zip("a"), strict=False)
 9 | zip(zip("a", strict=True))
   |
-  = help: Add explicit `strict=False`
 
-ℹ Safe fix
-4 4 | zip()
-5 5 | zip(range(3))
-6 6 | zip("a", "b")
-7   |-zip("a", "b", *zip("c"))
-  7 |+zip("a", "b", *zip("c", strict=False))
-8 8 | zip(zip("a"), strict=False)
-9 9 | zip(zip("a", strict=True))
-10 10 | 
-
-B905.py:8:5: B905 [*] `zip()` without an explicit `strict=` parameter
+B905.py:8:5: B905 `zip()` without an explicit `strict=` parameter
   |
 6 | zip("a", "b")
 7 | zip("a", "b", *zip("c"))
@@ -113,19 +58,8 @@ B905.py:8:5: B905 [*] `zip()` without an explicit `strict=` parameter
   |     ^^^^^^^^ B905
 9 | zip(zip("a", strict=True))
   |
-  = help: Add explicit `strict=False`
 
-ℹ Safe fix
-5 5 | zip(range(3))
-6 6 | zip("a", "b")
-7 7 | zip("a", "b", *zip("c"))
-8   |-zip(zip("a"), strict=False)
-  8 |+zip(zip("a", strict=False), strict=False)
-9 9 | zip(zip("a", strict=True))
-10 10 | 
-11 11 | # OK
-
-B905.py:9:1: B905 [*] `zip()` without an explicit `strict=` parameter
+B905.py:9:1: B905 `zip()` without an explicit `strict=` parameter
    |
  7 | zip("a", "b", *zip("c"))
  8 | zip(zip("a"), strict=False)
@@ -134,49 +68,21 @@ B905.py:9:1: B905 [*] `zip()` without an explicit `strict=` parameter
 10 | 
 11 | # OK
    |
-   = help: Add explicit `strict=False`
 
-ℹ Safe fix
-6  6  | zip("a", "b")
-7  7  | zip("a", "b", *zip("c"))
-8  8  | zip(zip("a"), strict=False)
-9     |-zip(zip("a", strict=True))
-   9  |+zip(zip("a", strict=True), strict=False)
-10 10 | 
-11 11 | # OK
-12 12 | zip(range(3), strict=True)
-
-B905.py:24:1: B905 [*] `zip()` without an explicit `strict=` parameter
+B905.py:24:1: B905 `zip()` without an explicit `strict=` parameter
    |
 23 | # Errors (limited iterators).
 24 | zip([1, 2, 3], repeat(1, 1))
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B905
 25 | zip([1, 2, 3], repeat(1, times=4))
    |
-   = help: Add explicit `strict=False`
 
-ℹ Safe fix
-21 21 | zip([1, 2, 3], repeat(1, times=None))
-22 22 | 
-23 23 | # Errors (limited iterators).
-24    |-zip([1, 2, 3], repeat(1, 1))
-   24 |+zip([1, 2, 3], repeat(1, 1), strict=False)
-25 25 | zip([1, 2, 3], repeat(1, times=4))
-
-B905.py:25:1: B905 [*] `zip()` without an explicit `strict=` parameter
+B905.py:25:1: B905 `zip()` without an explicit `strict=` parameter
    |
 23 | # Errors (limited iterators).
 24 | zip([1, 2, 3], repeat(1, 1))
 25 | zip([1, 2, 3], repeat(1, times=4))
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B905
    |
-   = help: Add explicit `strict=False`
-
-ℹ Safe fix
-22 22 | 
-23 23 | # Errors (limited iterators).
-24 24 | zip([1, 2, 3], repeat(1, 1))
-25    |-zip([1, 2, 3], repeat(1, times=4))
-   25 |+zip([1, 2, 3], repeat(1, times=4), strict=False)
 
 

crates/ruff_linter/src/rules/flake8_comprehensions/fixes.rs

@@ -1083,7 +1083,7 @@ pub(crate) fn fix_unnecessary_map(
     // If the expression is embedded in an f-string, surround it with spaces to avoid
     // syntax errors.
     if matches!(object_type, ObjectType::Set | ObjectType::Dict) {
-        if parent.is_some_and(Expr::is_f_string_expr) {
+        if parent.is_some_and(Expr::is_formatted_value_expr) {
             content = format!(" {content} ");
         }
     }

crates/ruff_linter/src/rules/flake8_django/rules/all_with_model_form.rs

@@ -1,6 +1,7 @@
+use ruff_python_ast::{self as ast, Arguments, Expr, Stmt};
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::{self as ast, Expr, Stmt};
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
@@ -47,12 +48,21 @@ impl Violation for DjangoAllWithModelForm {
 }
 
 /// DJ007
-pub(crate) fn all_with_model_form(checker: &mut Checker, class_def: &ast::StmtClassDef) {
-    if !is_model_form(class_def, checker.semantic()) {
-        return;
+pub(crate) fn all_with_model_form(
+    checker: &Checker,
+    arguments: Option<&Arguments>,
+    body: &[Stmt],
+) -> Option<Diagnostic> {
+    if !arguments.is_some_and(|arguments| {
+        arguments
+            .args
+            .iter()
+            .any(|base| is_model_form(base, checker.semantic()))
+    }) {
+        return None;
     }
 
-    for element in &class_def.body {
+    for element in body {
         let Stmt::ClassDef(ast::StmtClassDef { name, body, .. }) = element else {
             continue;
         };
@@ -73,18 +83,12 @@ pub(crate) fn all_with_model_form(checker: &mut Checker, class_def: &ast::StmtCl
                 match value.as_ref() {
                     Expr::StringLiteral(ast::ExprStringLiteral { value, .. }) => {
                         if value == "__all__" {
-                            checker
-                                .diagnostics
-                                .push(Diagnostic::new(DjangoAllWithModelForm, element.range()));
-                            return;
+                            return Some(Diagnostic::new(DjangoAllWithModelForm, element.range()));
                         }
                     }
                     Expr::BytesLiteral(ast::ExprBytesLiteral { value, .. }) => {
                         if value == "__all__".as_bytes() {
-                            checker
-                                .diagnostics
-                                .push(Diagnostic::new(DjangoAllWithModelForm, element.range()));
-                            return;
+                            return Some(Diagnostic::new(DjangoAllWithModelForm, element.range()));
                         }
                     }
                     _ => (),
@@ -92,4 +96,5 @@ pub(crate) fn all_with_model_form(checker: &mut Checker, class_def: &ast::StmtCl
             }
         }
     }
+    None
 }

crates/ruff_linter/src/rules/flake8_django/rules/exclude_with_model_form.rs

@@ -1,6 +1,7 @@
+use ruff_python_ast::{self as ast, Arguments, Expr, Stmt};
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::{self as ast, Expr, Stmt};
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
@@ -45,12 +46,21 @@ impl Violation for DjangoExcludeWithModelForm {
 }
 
 /// DJ006
-pub(crate) fn exclude_with_model_form(checker: &mut Checker, class_def: &ast::StmtClassDef) {
-    if !is_model_form(class_def, checker.semantic()) {
-        return;
+pub(crate) fn exclude_with_model_form(
+    checker: &Checker,
+    arguments: Option<&Arguments>,
+    body: &[Stmt],
+) -> Option<Diagnostic> {
+    if !arguments.is_some_and(|arguments| {
+        arguments
+            .args
+            .iter()
+            .any(|base| is_model_form(base, checker.semantic()))
+    }) {
+        return None;
     }
 
-    for element in &class_def.body {
+    for element in body {
         let Stmt::ClassDef(ast::StmtClassDef { name, body, .. }) = element else {
             continue;
         };
@@ -66,12 +76,10 @@ pub(crate) fn exclude_with_model_form(checker: &mut Checker, class_def: &ast::St
                     continue;
                 };
                 if id == "exclude" {
-                    checker
-                        .diagnostics
-                        .push(Diagnostic::new(DjangoExcludeWithModelForm, target.range()));
-                    return;
+                    return Some(Diagnostic::new(DjangoExcludeWithModelForm, target.range()));
                 }
             }
         }
     }
+    None
 }

crates/ruff_linter/src/rules/flake8_django/rules/helpers.rs

@@ -1,17 +1,17 @@
-use ruff_python_ast::{self as ast, Expr};
+use ruff_python_ast::Expr;
 
-use ruff_python_semantic::{analyze, SemanticModel};
+use ruff_python_semantic::SemanticModel;
 
 /// Return `true` if a Python class appears to be a Django model, based on its base classes.
-pub(super) fn is_model(class_def: &ast::StmtClassDef, semantic: &SemanticModel) -> bool {
-    analyze::class::any_over_body(class_def, semantic, &|call_path| {
+pub(super) fn is_model(base: &Expr, semantic: &SemanticModel) -> bool {
+    semantic.resolve_call_path(base).is_some_and(|call_path| {
         matches!(call_path.as_slice(), ["django", "db", "models", "Model"])
     })
 }
 
 /// Return `true` if a Python class appears to be a Django model form, based on its base classes.
-pub(super) fn is_model_form(class_def: &ast::StmtClassDef, semantic: &SemanticModel) -> bool {
-    analyze::class::any_over_body(class_def, semantic, &|call_path| {
+pub(super) fn is_model_form(base: &Expr, semantic: &SemanticModel) -> bool {
+    semantic.resolve_call_path(base).is_some_and(|call_path| {
         matches!(
             call_path.as_slice(),
             ["django", "forms", "ModelForm"] | ["django", "forms", "models", "ModelForm"]

crates/ruff_linter/src/rules/flake8_django/rules/model_without_dunder_str.rs

@@ -1,9 +1,10 @@
+use ruff_python_ast::{self as ast, Arguments, Expr, Stmt};
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::is_const_true;
-use ruff_python_ast::identifier::Identifier;
-use ruff_python_ast::{self as ast, Expr, Stmt};
 use ruff_python_semantic::SemanticModel;
+use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
 
@@ -51,39 +52,57 @@ impl Violation for DjangoModelWithoutDunderStr {
 }
 
 /// DJ008
-pub(crate) fn model_without_dunder_str(checker: &mut Checker, class_def: &ast::StmtClassDef) {
-    if !is_non_abstract_model(class_def, checker.semantic()) {
+pub(crate) fn model_without_dunder_str(
+    checker: &mut Checker,
+    ast::StmtClassDef {
+        name,
+        arguments,
+        body,
+        ..
+    }: &ast::StmtClassDef,
+) {
+    if !is_non_abstract_model(arguments.as_deref(), body, checker.semantic()) {
         return;
     }
-    if has_dunder_method(class_def) {
+    if has_dunder_method(body) {
         return;
     }
-    checker.diagnostics.push(Diagnostic::new(
-        DjangoModelWithoutDunderStr,
-        class_def.identifier(),
-    ));
+    checker
+        .diagnostics
+        .push(Diagnostic::new(DjangoModelWithoutDunderStr, name.range()));
 }
 
-/// Returns `true` if the class has `__str__` method.
-fn has_dunder_method(class_def: &ast::StmtClassDef) -> bool {
-    class_def.body.iter().any(|val| match val {
-        Stmt::FunctionDef(ast::StmtFunctionDef { name, .. }) => name == "__str__",
+fn has_dunder_method(body: &[Stmt]) -> bool {
+    body.iter().any(|val| match val {
+        Stmt::FunctionDef(ast::StmtFunctionDef { name, .. }) => {
+            if name == "__str__" {
+                return true;
+            }
+            false
+        }
         _ => false,
     })
 }
 
-/// Returns `true` if the class is a non-abstract Django model.
-fn is_non_abstract_model(class_def: &ast::StmtClassDef, semantic: &SemanticModel) -> bool {
-    if class_def.bases().is_empty() || is_model_abstract(class_def) {
-        false
-    } else {
-        helpers::is_model(class_def, semantic)
+fn is_non_abstract_model(
+    arguments: Option<&Arguments>,
+    body: &[Stmt],
+    semantic: &SemanticModel,
+) -> bool {
+    let Some(Arguments { args: bases, .. }) = arguments else {
+        return false;
+    };
+
+    if is_model_abstract(body) {
+        return false;
     }
+
+    bases.iter().any(|base| helpers::is_model(base, semantic))
 }
 
 /// Check if class is abstract, in terms of Django model inheritance.
-fn is_model_abstract(class_def: &ast::StmtClassDef) -> bool {
-    for element in &class_def.body {
+fn is_model_abstract(body: &[Stmt]) -> bool {
+    for element in body {
         let Stmt::ClassDef(ast::StmtClassDef { name, body, .. }) = element else {
             continue;
         };

crates/ruff_linter/src/rules/flake8_django/rules/unordered_body_content_in_model.rs

@@ -1,8 +1,9 @@
 use std::fmt;
 
+use ruff_python_ast::{self as ast, Arguments, Expr, Stmt};
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::{self as ast, Expr, Stmt};
 use ruff_python_semantic::SemanticModel;
 use ruff_text_size::Ranged;
 
@@ -78,50 +79,6 @@ impl Violation for DjangoUnorderedBodyContentInModel {
     }
 }
 
-/// DJ012
-pub(crate) fn unordered_body_content_in_model(
-    checker: &mut Checker,
-    class_def: &ast::StmtClassDef,
-) {
-    if !helpers::is_model(class_def, checker.semantic()) {
-        return;
-    }
-
-    // Track all the element types we've seen so far.
-    let mut element_types = Vec::new();
-    let mut prev_element_type = None;
-    for element in &class_def.body {
-        let Some(element_type) = get_element_type(element, checker.semantic()) else {
-            continue;
-        };
-
-        // Skip consecutive elements of the same type. It's less noisy to only report
-        // violations at type boundaries (e.g., avoid raising a violation for _every_
-        // field declaration that's out of order).
-        if prev_element_type == Some(element_type) {
-            continue;
-        }
-
-        prev_element_type = Some(element_type);
-
-        if let Some(&prev_element_type) = element_types
-            .iter()
-            .find(|&&prev_element_type| prev_element_type > element_type)
-        {
-            let diagnostic = Diagnostic::new(
-                DjangoUnorderedBodyContentInModel {
-                    element_type,
-                    prev_element_type,
-                },
-                element.range(),
-            );
-            checker.diagnostics.push(diagnostic);
-        } else {
-            element_types.push(element_type);
-        }
-    }
-}
-
 #[derive(Debug, Clone, Copy, PartialOrd, Ord, PartialEq, Eq)]
 enum ContentType {
     FieldDeclaration,
@@ -183,3 +140,53 @@ fn get_element_type(element: &Stmt, semantic: &SemanticModel) -> Option<ContentT
         _ => None,
     }
 }
+
+/// DJ012
+pub(crate) fn unordered_body_content_in_model(
+    checker: &mut Checker,
+    arguments: Option<&Arguments>,
+    body: &[Stmt],
+) {
+    if !arguments.is_some_and(|arguments| {
+        arguments
+            .args
+            .iter()
+            .any(|base| helpers::is_model(base, checker.semantic()))
+    }) {
+        return;
+    }
+
+    // Track all the element types we've seen so far.
+    let mut element_types = Vec::new();
+    let mut prev_element_type = None;
+    for element in body {
+        let Some(element_type) = get_element_type(element, checker.semantic()) else {
+            continue;
+        };
+
+        // Skip consecutive elements of the same type. It's less noisy to only report
+        // violations at type boundaries (e.g., avoid raising a violation for _every_
+        // field declaration that's out of order).
+        if prev_element_type == Some(element_type) {
+            continue;
+        }
+
+        prev_element_type = Some(element_type);
+
+        if let Some(&prev_element_type) = element_types
+            .iter()
+            .find(|&&prev_element_type| prev_element_type > element_type)
+        {
+            let diagnostic = Diagnostic::new(
+                DjangoUnorderedBodyContentInModel {
+                    element_type,
+                    prev_element_type,
+                },
+                element.range(),
+            );
+            checker.diagnostics.push(diagnostic);
+        } else {
+            element_types.push(element_type);
+        }
+    }
+}

crates/ruff_linter/src/rules/flake8_django/snapshots/ruff_linter__rules__flake8_django__tests__DJ012_DJ012.py.snap

@@ -54,12 +54,4 @@ DJ012.py:129:5: DJ012 Order of model's inner classes, methods, and fields does n
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ DJ012
     |
 
-DJ012.py:146:5: DJ012 Order of model's inner classes, methods, and fields does not follow the Django Style Guide: field declaration should come before `Meta` class
-    |
-144 |         return "foobar"
-145 | 
-146 |     first_name = models.CharField(max_length=32)
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ DJ012
-    |
-
 

crates/ruff_linter/src/rules/flake8_errmsg/rules/string_in_exception.rs

@@ -191,13 +191,15 @@ pub(crate) fn string_in_exception(checker: &mut Checker, stmt: &Stmt, exc: &Expr
                             if let Some(indentation) =
                                 whitespace::indentation(checker.locator(), stmt)
                             {
-                                diagnostic.set_fix(generate_fix(
-                                    stmt,
-                                    first,
-                                    indentation,
-                                    checker.stylist(),
-                                    checker.locator(),
-                                ));
+                                if checker.semantic().is_available("msg") {
+                                    diagnostic.set_fix(generate_fix(
+                                        stmt,
+                                        first,
+                                        indentation,
+                                        checker.stylist(),
+                                        checker.locator(),
+                                    ));
+                                }
                             }
                             checker.diagnostics.push(diagnostic);
                         }
@@ -209,13 +211,15 @@ pub(crate) fn string_in_exception(checker: &mut Checker, stmt: &Stmt, exc: &Expr
                         let mut diagnostic = Diagnostic::new(FStringInException, first.range());
                         if let Some(indentation) = whitespace::indentation(checker.locator(), stmt)
                         {
-                            diagnostic.set_fix(generate_fix(
-                                stmt,
-                                first,
-                                indentation,
-                                checker.stylist(),
-                                checker.locator(),
-                            ));
+                            if checker.semantic().is_available("msg") {
+                                diagnostic.set_fix(generate_fix(
+                                    stmt,
+                                    first,
+                                    indentation,
+                                    checker.stylist(),
+                                    checker.locator(),
+                                ));
+                            }
                         }
                         checker.diagnostics.push(diagnostic);
                     }
@@ -232,13 +236,15 @@ pub(crate) fn string_in_exception(checker: &mut Checker, stmt: &Stmt, exc: &Expr
                                 if let Some(indentation) =
                                     whitespace::indentation(checker.locator(), stmt)
                                 {
-                                    diagnostic.set_fix(generate_fix(
-                                        stmt,
-                                        first,
-                                        indentation,
-                                        checker.stylist(),
-                                        checker.locator(),
-                                    ));
+                                    if checker.semantic().is_available("msg") {
+                                        diagnostic.set_fix(generate_fix(
+                                            stmt,
+                                            first,
+                                            indentation,
+                                            checker.stylist(),
+                                            checker.locator(),
+                                        ));
+                                    }
                                 }
                                 checker.diagnostics.push(diagnostic);
                             }

crates/ruff_linter/src/rules/flake8_errmsg/snapshots/ruff_linter__rules__flake8_errmsg__tests__custom.snap

@@ -59,26 +59,15 @@ EM.py:22:24: EM103 [*] Exception must not use a `.format()` string directly, ass
 24 25 | 
 25 26 | def f_ok():
 
-EM.py:32:24: EM101 [*] Exception must not use a string literal, assign to variable first
+EM.py:32:24: EM101 Exception must not use a string literal, assign to variable first
    |
-30 | def f_msg_defined():
+30 | def f_unfixable():
 31 |     msg = "hello"
 32 |     raise RuntimeError("This is an example exception")
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM101
    |
    = help: Assign to variable; remove string literal
 
-ℹ Unsafe fix
-29 29 | 
-30 30 | def f_msg_defined():
-31 31 |     msg = "hello"
-32    |-    raise RuntimeError("This is an example exception")
-   32 |+    msg = "This is an example exception"
-   33 |+    raise RuntimeError(msg)
-33 34 | 
-34 35 | 
-35 36 | def f_msg_in_nested_scope():
-
 EM.py:39:24: EM101 [*] Exception must not use a string literal, assign to variable first
    |
 37 |         msg = "hello"
@@ -99,7 +88,7 @@ EM.py:39:24: EM101 [*] Exception must not use a string literal, assign to variab
 41 42 | 
 42 43 | def f_msg_in_parent_scope():
 
-EM.py:46:28: EM101 [*] Exception must not use a string literal, assign to variable first
+EM.py:46:28: EM101 Exception must not use a string literal, assign to variable first
    |
 45 |     def nested():
 46 |         raise RuntimeError("This is an example exception")
@@ -107,17 +96,6 @@ EM.py:46:28: EM101 [*] Exception must not use a string literal, assign to variab
    |
    = help: Assign to variable; remove string literal
 
-ℹ Unsafe fix
-43 43 |     msg = "hello"
-44 44 | 
-45 45 |     def nested():
-46    |-        raise RuntimeError("This is an example exception")
-   46 |+        msg = "This is an example exception"
-   47 |+        raise RuntimeError(msg)
-47 48 | 
-48 49 | 
-49 50 | def f_fix_indentation_check(foo):
-
 EM.py:51:28: EM101 [*] Exception must not use a string literal, assign to variable first
    |
 49 | def f_fix_indentation_check(foo):