Remove output-file and target-version from formatter CLI

.editorconfig

@@ -10,7 +10,7 @@ indent_style = space
 insert_final_newline = true
 indent_size = 2
 
-[*.{rs,py,pyi}]
+[*.{rs,py}]
 indent_size = 4
 
 [*.snap]

.github/release.yml

@@ -20,9 +20,6 @@ changelog:
     - title: Bug Fixes
       labels:
         - bug
-    - title: Preview
-      labels:
-        - preview
     - title: Other Changes
       labels:
         - "*"

.github/workflows/ci.yaml

@@ -26,11 +26,11 @@ jobs:
       linter: ${{ steps.changed.outputs.linter_any_changed }}
       formatter: ${{ steps.changed.outputs.formatter_any_changed }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - uses: tj-actions/changed-files@v39
+      - uses: tj-actions/changed-files@v38
         id: changed
         with:
           files_yaml: |
@@ -62,7 +62,7 @@ jobs:
     name: "cargo fmt"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup component add rustfmt
       - run: cargo fmt --all --check
@@ -71,7 +71,7 @@ jobs:
     name: "cargo clippy"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: |
           rustup component add clippy
@@ -89,7 +89,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     name: "cargo test | ${{ matrix.os }}"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install cargo insta"
@@ -125,7 +125,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "cargo fuzz"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - uses: Swatinem/rust-cache@v2
@@ -141,7 +141,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "cargo test (wasm)"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
       - uses: actions/setup-node@v3
@@ -160,7 +160,7 @@ jobs:
     name: "test scripts"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup component add rustfmt
       - uses: Swatinem/rust-cache@v2
@@ -182,7 +182,7 @@ jobs:
     # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
     if: github.event_name == 'pull_request' && needs.determine_changes.outputs.linter == 'true'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -227,7 +227,7 @@ jobs:
     name: "cargo udeps"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install nightly Rust toolchain"
         # Only pinned to make caching work, update freely
         run: rustup toolchain install nightly-2023-06-08
@@ -241,7 +241,7 @@ jobs:
     name: "python package"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -265,7 +265,7 @@ jobs:
     name: "pre-commit"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -295,7 +295,7 @@ jobs:
     env:
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
@@ -330,7 +330,7 @@ jobs:
     needs: determine_changes
     if: needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Cache rust"
@@ -346,7 +346,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Branch"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: "Install Rust toolchain"
         run: rustup show

.github/workflows/docs.yaml

@@ -2,11 +2,6 @@ name: mkdocs
 
 on:
   workflow_dispatch:
-    inputs:
-      ref:
-        description: "The commit SHA, tag, or branch to publish. Uses the default branch if not specified."
-        default: ""
-        type: string
   release:
     types: [published]
 
@@ -17,9 +12,7 @@ jobs:
       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.ref }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
@@ -51,5 +44,4 @@ jobs:
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          # `github.head_ref` is only set during pull requests and for manual runs or tags we use `main` to deploy to production
-          command: pages deploy site --project-name=astral-docs --branch ${{ github.head_ref || 'main' }} --commit-hash ${GITHUB_SHA}
+          command: pages publish site --project-name=ruff-docs --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}

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

@@ -19,7 +19,7 @@ jobs:
   macos-x86_64:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -42,7 +42,7 @@ jobs:
   macos-universal:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -68,7 +68,7 @@ jobs:
       matrix:
         target: [x64, x86]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -96,7 +96,7 @@ jobs:
       matrix:
         target: [x86_64, i686]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -123,7 +123,7 @@ jobs:
       matrix:
         target: [aarch64, armv7, s390x, ppc64le, ppc64]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -160,7 +160,7 @@ jobs:
           - x86_64-unknown-linux-musl
           - i686-unknown-linux-musl
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -196,7 +196,7 @@ jobs:
           - target: armv7-unknown-linux-musleabihf
             arch: armv7
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}

.github/workflows/playground.yaml

@@ -17,7 +17,7 @@ jobs:
     env:
       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
       - uses: actions/setup-node@v3
@@ -44,4 +44,4 @@ jobs:
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          command: pages deploy playground/dist --project-name=ruff-playground --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}
+          command: pages publish playground/dist --project-name=ruff --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}

.github/workflows/release.yaml

@@ -7,15 +7,12 @@ on:
         description: "The version to tag, without the leading 'v'. If omitted, will initiate a dry run (no uploads)."
         type: string
       sha:
-        description: "The full sha of the commit to be released. If omitted, the latest commit on the default branch will be used."
-        default: ""
+        description: "Optionally, the full sha of the commit to be released"
         type: string
   pull_request:
     paths:
       # When we change pyproject.toml, we want to ensure that the maturin builds still work
       - pyproject.toml
-      # And when we change this workflow itself...
-      - .github/workflows/release.yaml
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -33,9 +30,7 @@ jobs:
   sdist:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -61,9 +56,7 @@ jobs:
   macos-x86_64:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -101,9 +94,7 @@ jobs:
   macos-universal:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -149,9 +140,7 @@ jobs:
           - target: aarch64-pc-windows-msvc
             arch: x64
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -197,9 +186,7 @@ jobs:
           - x86_64-unknown-linux-gnu
           - i686-unknown-linux-gnu
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -256,9 +243,7 @@ jobs:
             arch: ppc64
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -311,9 +296,7 @@ jobs:
           - x86_64-unknown-linux-musl
           - i686-unknown-linux-musl
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -367,9 +350,7 @@ jobs:
             arch: armv7
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -417,22 +398,9 @@ jobs:
     # If you don't set an input tag, it's a dry run (no uploads).
     if: ${{ inputs.tag }}
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: main # We checkout the main branch to check for the commit
-      - name: Check main branch
-        if: ${{ inputs.sha }}
-        run: |
-          # Fetch the main branch since a shallow checkout is used by default
-          git fetch origin main --unshallow
-          if ! git branch --contains ${{ inputs.sha }} | grep -E '(^|\s)main$'; then
-            echo "The specified sha is not on the main branch" >&2
-            exit 1
-          fi
+      - uses: actions/checkout@v3
       - name: Check tag consistency
         run: |
-          # Switch to the commit we want to release
-          git checkout ${{ inputs.sha }}
           version=$(grep "version = " pyproject.toml | sed -e 's/version = "\(.*\)"/\1/g')
           if [ "${{ inputs.tag }}" != "${version}" ]; then
             echo "The input tag does not match the version from pyproject.toml:" >&2
@@ -442,6 +410,18 @@ jobs:
           else
             echo "Releasing ${version}"
           fi
+      - name: Check SHA consistency
+        if: ${{ inputs.sha }}
+        run: |
+          git_sha=$(git rev-parse HEAD)
+          if [ "${{ inputs.sha }}" != "${git_sha}" ]; then
+            echo "The specified sha does not match the git checkout" >&2
+            echo "${{ inputs.sha }}" >&2
+            echo "${git_sha}" >&2
+            exit 1
+          else
+            echo "Releasing ${git_sha}"
+          fi
 
   upload-release:
     name: Upload to PyPI
@@ -484,9 +464,7 @@ jobs:
       # For git tag
       contents: write
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - name: git tag
         run: |
           git config user.email "hey@astral.sh"

.pre-commit-config.yaml

@@ -23,6 +23,8 @@ repos:
       - id: mdformat
         additional_dependencies:
           - mdformat-mkdocs
+          - mdformat-black
+          - black==23.1.0 # Must be the latest version of Black
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.33.0

BREAKING_CHANGES.md

@@ -1,20 +1,5 @@
 # Breaking Changes
 
-## 0.0.288
-
-### Remove support for emoji identifiers ([#7212](https://github.com/astral-sh/ruff/pull/7212))
-
-Previously, Ruff supported the non-standard compliant emoji identifiers e.g. `📦 = 1`.
-We decided to remove this non-standard language extension, and Ruff now reports syntax errors for emoji identifiers in your code, the same as CPython.
-
-### Improved GitLab fingerprints ([#7203](https://github.com/astral-sh/ruff/pull/7203))
-
-GitLab uses fingerprints to identify new, existing, or fixed violations. Previously, Ruff included the violation's position in the fingerprint. Using the location has the downside that changing any code before the violation causes the fingerprint to change, resulting in GitLab reporting one fixed and one new violation even though it is a pre-existing violation.
-
-Ruff now uses a more stable location-agnostic fingerprint to minimize that existing violations incorrectly get marked as fixed and re-reported as new violations.
-
-Expect GitLab to report each pre-existing violation in your project as fixed and a new violation in your Ruff upgrade PR.
-
 ## 0.0.283 / 0.284
 
 ### The target Python version now defaults to 3.8 instead of 3.10 ([#6397](https://github.com/astral-sh/ruff/pull/6397))
@@ -299,4 +284,4 @@ default.
 `pyproject.toml` files are now resolved hierarchically, such that for each Python file, we find
 the first `pyproject.toml` file in its path, and use that to determine its lint settings.
 
-See the [documentation](https://docs.astral.sh/ruff/configuration/#python-file-discovery) for more.
+See the [documentation](https://beta.ruff.rs/docs/configuration/#python-file-discovery) for more.

CONTRIBUTING.md

@@ -719,8 +719,8 @@ Module {
 - `cargo dev generate-cli-help`, `cargo dev generate-docs` and `cargo dev generate-json-schema`:
     Update just `docs/configuration.md`, `docs/rules` and `ruff.schema.json` respectively.
 - `cargo dev generate-options`: Generate a markdown-compatible table of all `pyproject.toml`
-    options. Used for <https://docs.astral.sh/ruff/settings/>.
-- `cargo dev generate-rules-table`: Generate a markdown-compatible table of all rules. Used for <https://docs.astral.sh/ruff/rules/>.
+    options. Used for <https://beta.ruff.rs/docs/settings/>
+- `cargo dev generate-rules-table`: Generate a markdown-compatible table of all rules. Used for <https://beta.ruff.rs/docs/rules/>
 - `cargo dev round-trip <python file or jupyter notebook>`: Read a Python file or Jupyter Notebook,
     parse it, serialize the parsed representation and write it back. Used to check how good our
     representation is so that fixes don't rewrite irrelevant parts of a file.
@@ -778,7 +778,7 @@ To understand Ruff's import categorization system, we first need to define two c
 - "Package root": The top-most directory defining the Python package that includes a given Python
     file. To find the package root for a given Python file, traverse up its parent directories until
     you reach a parent directory that doesn't contain an `__init__.py` file (and isn't marked as
-    a [namespace package](https://docs.astral.sh/ruff/settings/#namespace-packages)); take the directory
+    a [namespace package](https://beta.ruff.rs/docs/settings/#namespace-packages)); take the directory
     just before that, i.e., the first directory in the package.
 
 For example, given:
@@ -867,7 +867,7 @@ There are three ways in which an import can be categorized as "first-party":
     package (e.g., `from foo import bar` or `import foo.bar`), they'll be classified as first-party
     automatically. This check is as simple as comparing the first segment of the current file's
     module path to the first segment of the import.
-1. **Source roots**: Ruff supports a `[src](https://docs.astral.sh/ruff/settings/#src)` setting, which
+1. **Source roots**: Ruff supports a `[src](https://beta.ruff.rs/docs/settings/#src)` setting, which
     sets the directories to scan when identifying first-party imports. The algorithm is
     straightforward: given an import, like `import foo`, iterate over the directories enumerated in
     the `src` setting and, for each directory, check for the existence of a subdirectory `foo` or a

Cargo.toml

@@ -5,8 +5,8 @@ resolver = "2"
 [workspace.package]
 edition = "2021"
 rust-version = "1.71"
-homepage = "https://docs.astral.sh/ruff"
-documentation = "https://docs.astral.sh/ruff"
+homepage = "https://beta.ruff.rs/docs"
+documentation = "https://beta.ruff.rs/docs"
 repository = "https://github.com/astral-sh/ruff"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 license = "MIT"
@@ -14,49 +14,47 @@ license = "MIT"
 [workspace.dependencies]
 anyhow = { version = "1.0.69" }
 bitflags = { version = "2.3.1" }
-chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
-clap = { version = "4.4.4", features = ["derive"] }
+chrono = { version = "0.4.23", default-features = false, features = ["clock"] }
+clap = { version = "4.1.8", features = ["derive"] }
 colored = { version = "2.0.0" }
 filetime = { version = "0.2.20" }
 glob = { version = "0.3.1" }
 globset = { version = "0.4.10" }
 ignore = { version = "0.4.20" }
 insta = { version = "1.31.0", feature = ["filters", "glob"] }
-is-macro = { version = "0.3.0" }
-itertools = { version = "0.11.0" }
+is-macro = { version = "0.2.2" }
+itertools = { version = "0.10.5" }
 log = { version = "0.4.17" }
-malachite = { version = "0.4.0", default-features = false, features = ["naturals_and_integers"] }
-memchr = "2.6.3"
+memchr = "2.5.0"
+num-bigint = { version = "0.4.3" }
 num-traits = { version = "0.2.15" }
 once_cell = { version = "1.17.1" }
-path-absolutize = { version = "3.1.1" }
-proc-macro2 = { version = "1.0.67" }
+path-absolutize = { version = "3.0.14" }
+proc-macro2 = { version = "1.0.51" }
 quote = { version = "1.0.23" }
-regex = { version = "1.9.5" }
+regex = { version = "1.7.1" }
 rustc-hash = { version = "1.1.0" }
-schemars = { version = "0.8.15" }
+schemars = { version = "0.8.12" }
 serde = { version = "1.0.152", features = ["derive"] }
-serde_json = { version = "1.0.107" }
+serde_json = { version = "1.0.93" }
 shellexpand = { version = "3.0.0" }
 similar = { version = "2.2.1", features = ["inline"] }
 smallvec = { version = "1.10.0" }
-static_assertions = "1.1.0"
-strum = { version = "0.25.0", features = ["strum_macros"] }
-strum_macros = { version = "0.25.2" }
-syn = { version = "2.0.37" }
-test-case = { version = "3.2.1" }
-thiserror = { version = "1.0.48" }
-toml = { version = "0.7.8" }
+strum = { version = "0.24.1", features = ["strum_macros"] }
+strum_macros = { version = "0.24.3" }
+syn = { version = "2.0.15" }
+test-case = { version = "3.0.0" }
+thiserror = { version = "1.0.43" }
+toml = { version = "0.7.2" }
 tracing = "0.1.37"
 tracing-indicatif = "0.3.4"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-unicode-ident = "1.0.12"
 unicode-width = "0.1.10"
 uuid = { version = "1.4.1", features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
 wsl = { version = "0.1.0" }
 
 # v1.0.1
-libcst = { version = "0.1.0", default-features = false }
+libcst = { git = "https://github.com/Instagram/LibCST.git", rev = "9c263aa8977962a870ce2770d2aa18ee0dacb344", default-features = false }
 
 [profile.release]
 lto = "fat"

LICENSE

@@ -1224,31 +1224,6 @@ are:
     SOFTWARE.
   """
 
-- flake8-logging, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2023 Adam Johnson
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
-  """
-
 - Pyright, licensed as follows:
   """
     MIT License

README.md

@@ -8,7 +8,7 @@
 [![image](https://img.shields.io/pypi/pyversions/ruff.svg)](https://pypi.python.org/pypi/ruff)
 [![Actions status](https://github.com/astral-sh/ruff/workflows/CI/badge.svg)](https://github.com/astral-sh/ruff/actions)
 
-[**Discord**](https://discord.gg/c9MhzV8aU5) | [**Docs**](https://docs.astral.sh/ruff/) | [**Playground**](https://play.ruff.rs/)
+[**Discord**](https://discord.gg/c9MhzV8aU5) | [**Docs**](https://beta.ruff.rs/docs/) | [**Playground**](https://play.ruff.rs/)
 
 An extremely fast Python linter, written in Rust.
 
@@ -30,13 +30,13 @@ An extremely fast Python linter, written in Rust.
 - 🤝 Python 3.11 compatibility
 - 📦 Built-in caching, to avoid re-analyzing unchanged files
 - 🔧 Autofix support, for automatic error correction (e.g., automatically remove unused imports)
-- 📏 Over [600 built-in rules](https://docs.astral.sh/ruff/rules/)
-- ⚖️ [Near-parity](https://docs.astral.sh/ruff/faq/#how-does-ruff-compare-to-flake8) with the
+- 📏 Over [600 built-in rules](https://beta.ruff.rs/docs/rules/)
+- ⚖️ [Near-parity](https://beta.ruff.rs/docs/faq/#how-does-ruff-compare-to-flake8) with the
     built-in Flake8 rule set
 - 🔌 Native re-implementations of dozens of Flake8 plugins, like flake8-bugbear
-- ⌨️ First-party [editor integrations](https://docs.astral.sh/ruff/editor-integrations/) for
+- ⌨️ First-party [editor integrations](https://beta.ruff.rs/docs/editor-integrations/) for
     [VS Code](https://github.com/astral-sh/ruff-vscode) and [more](https://github.com/astral-sh/ruff-lsp)
-- 🌎 Monorepo-friendly, with [hierarchical and cascading configuration](https://docs.astral.sh/ruff/configuration/#pyprojecttoml-discovery)
+- 🌎 Monorepo-friendly, with [hierarchical and cascading configuration](https://beta.ruff.rs/docs/configuration/#pyprojecttoml-discovery)
 
 Ruff aims to be orders of magnitude faster than alternative tools while integrating more
 functionality behind a single, common interface.
@@ -98,7 +98,7 @@ developer of [Zulip](https://github.com/zulip/zulip):
 
 ## Table of Contents
 
-For more, see the [documentation](https://docs.astral.sh/ruff/).
+For more, see the [documentation](https://beta.ruff.rs/docs/).
 
 1. [Getting Started](#getting-started)
 1. [Configuration](#configuration)
@@ -111,7 +111,7 @@ For more, see the [documentation](https://docs.astral.sh/ruff/).
 
 ## Getting Started
 
-For more, see the [documentation](https://docs.astral.sh/ruff/).
+For more, see the [documentation](https://beta.ruff.rs/docs/).
 
 ### Installation
 
@@ -122,7 +122,7 @@ pip install ruff
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
-and with [a variety of other package managers](https://docs.astral.sh/ruff/installation/).
+and with [a variety of other package managers](https://beta.ruff.rs/docs/installation/).
 
 ### Usage
 
@@ -140,7 +140,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.0.290
+  rev: v0.0.287
   hooks:
     - id: ruff
 ```
@@ -165,7 +165,7 @@ jobs:
 ### Configuration
 
 Ruff can be configured through a `pyproject.toml`, `ruff.toml`, or `.ruff.toml` file (see:
-[_Configuration_](https://docs.astral.sh/ruff/configuration/), or [_Settings_](https://docs.astral.sh/ruff/settings/)
+[_Configuration_](https://beta.ruff.rs/docs/configuration/), or [_Settings_](https://beta.ruff.rs/docs/settings/)
 for a complete list of all configuration options).
 
 If left unspecified, the default configuration is equivalent to:
@@ -238,7 +238,7 @@ isort, pyupgrade, and others. Regardless of the rule's origin, Ruff re-implement
 Rust as a first-party feature.
 
 By default, Ruff enables Flake8's `E` and `F` rules. Ruff supports all rules from the `F` category,
-and a [subset](https://docs.astral.sh/ruff/rules/#error-e) of the `E` category, omitting those
+and a [subset](https://beta.ruff.rs/docs/rules/#error-e) of the `E` category, omitting those
 stylistic rules made obsolete by the use of an autoformatter, like
 [Black](https://github.com/psf/black).
 
@@ -274,7 +274,6 @@ quality tools, including:
 - [flake8-gettext](https://pypi.org/project/flake8-gettext/)
 - [flake8-implicit-str-concat](https://pypi.org/project/flake8-implicit-str-concat/)
 - [flake8-import-conventions](https://github.com/joaopalmeiro/flake8-import-conventions)
-- [flake8-logging](https://pypi.org/project/flake8-logging/)
 - [flake8-logging-format](https://pypi.org/project/flake8-logging-format/)
 - [flake8-no-pep420](https://pypi.org/project/flake8-no-pep420)
 - [flake8-pie](https://pypi.org/project/flake8-pie/)
@@ -304,12 +303,12 @@ quality tools, including:
 - [tryceratops](https://pypi.org/project/tryceratops/)
 - [yesqa](https://pypi.org/project/yesqa/)
 
-For a complete enumeration of the supported rules, see [_Rules_](https://docs.astral.sh/ruff/rules/).
+For a complete enumeration of the supported rules, see [_Rules_](https://beta.ruff.rs/docs/rules/).
 
 ## Contributing
 
 Contributions are welcome and highly appreciated. To get started, check out the
-[**contributing guidelines**](https://docs.astral.sh/ruff/contributing/).
+[**contributing guidelines**](https://beta.ruff.rs/docs/contributing/).
 
 You can also join us on [**Discord**](https://discord.gg/c9MhzV8aU5).
 

crates/flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.290"
+version = "0.0.287"
 description = """
 Convert Flake8 configuration files to Ruff configuration files.
 """

crates/flake8_to_ruff/README.md

@@ -86,7 +86,7 @@ flake8-to-ruff path/to/.flake8 --plugin flake8-builtins --plugin flake8-quotes
     configuration options that don't exist in Flake8.)
 1. Ruff will omit any rule codes that are unimplemented or unsupported by Ruff, including rule
     codes from unsupported plugins. (See the
-    [documentation](https://docs.astral.sh/ruff/faq/#how-does-ruff-compare-to-flake8) for the complete
+    [documentation](https://beta.ruff.rs/docs/faq/#how-does-ruff-compare-to-flake8) for the complete
     list of supported plugins.)
 
 ## License

crates/flake8_to_ruff/src/plugin.rs

@@ -4,7 +4,6 @@ use std::str::FromStr;
 
 use anyhow::anyhow;
 use ruff::registry::Linter;
-use ruff::settings::types::PreviewMode;
 use ruff::RuleSelector;
 
 #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq)]
@@ -332,7 +331,7 @@ pub(crate) fn infer_plugins_from_codes(selectors: &HashSet<RuleSelector>) -> Vec
     .filter(|plugin| {
         for selector in selectors {
             if selector
-                .rules(PreviewMode::Disabled)
+                .into_iter()
                 .any(|rule| Linter::from(plugin).rules().any(|r| r == rule))
             {
                 return true;

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.0.290"
+version = "0.0.287"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -45,9 +45,9 @@ is-macro = { workspace = true }
 itertools = { workspace = true }
 libcst = { workspace = true }
 log = { workspace = true }
-malachite = { workspace = true }
 memchr = { workspace = true }
 natord = { version = "1.0.9" }
+num-bigint = { workspace = true }
 num-traits = { workspace = true }
 once_cell = { workspace = true }
 path-absolutize = { workspace = true, features = [
@@ -56,7 +56,7 @@ path-absolutize = { workspace = true, features = [
 ] }
 pathdiff = { version = "0.2.1" }
 pep440_rs = { version = "0.3.1", features = ["serde"] }
-pyproject-toml = { version = "0.7.0" }
+pyproject-toml = { version = "0.6.0" }
 quick-junit = { version = "0.3.2" }
 regex = { workspace = true }
 result-like = { version = "0.4.6" }

crates/ruff/resources/test/fixtures/flake8_bandit/S201.py

@@ -1,22 +0,0 @@
-from flask import Flask
-
-app = Flask(__name__)
-
-@app.route('/')
-def main():
-    raise
-
-# OK
-app.run(debug=True)
-
-# Errors
-app.run()
-app.run(debug=False)
-
-# Unrelated
-run()
-run(debug=True)
-run(debug)
-foo.run(debug=True)
-app = 1
-app.run(debug=True)

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_1.py

@@ -1,5 +0,0 @@
-# Docstring followed by a newline
-
-def foobar(foor, bar={}):    
-    """
-    """

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_2.py

@@ -1,6 +0,0 @@
-# Docstring followed by whitespace with no newline
-# Regression test for https://github.com/astral-sh/ruff/issues/7155
-
-def foobar(foor, bar={}):    
-    """
-    """                    

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_3.py

@@ -1,6 +0,0 @@
-# Docstring with no newline
-
-
-def foobar(foor, bar={}):    
-    """
-    """

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_4.py

@@ -1,9 +0,0 @@
-# formfeed indent
-# https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458825
-# This is technically a stylist bug (and has a test there), but it surfaced in B006
-
-
-class FormFeedIndent:
-   def __init__(self, a=[]):
-        print(a)
-

crates/ruff/resources/test/fixtures/flake8_bugbear/B009_B010.py

@@ -53,6 +53,3 @@ setattr(foo, "__123abc__", None)
 setattr(foo, "abc123", None)
 setattr(foo, r"abc123", None)
 setattr(foo.bar, r"baz", None)
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
-assert getattr(func, '_rpc')is True

crates/ruff/resources/test/fixtures/flake8_bugbear/B013.py

@@ -10,5 +10,3 @@ except (ImportError, TypeError):
     pass
 except (*retriable_exceptions,):
     pass
-except(ValueError,):
-    pass

crates/ruff/resources/test/fixtures/flake8_comprehensions/C402.py

@@ -16,9 +16,3 @@ def f(x):
     return x
 
 print(f'Hello {dict((x,f(x)) for x in "abc")} World')
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7086
-dict((k,v)for k,v in d.iteritems() if k in only_args)
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458940
-dict((*v, k) for k, v in enumerate(calendar.month_abbr))

crates/ruff/resources/test/fixtures/flake8_comprehensions/C404.py

@@ -11,6 +11,3 @@ f"{dict([(s,f(s)) for s in 'ab'])}"
 
 f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
 f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7087
-saved.append(dict([(k, v)for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]]))

crates/ruff/resources/test/fixtures/flake8_comprehensions/C413.py

@@ -7,13 +7,6 @@ reversed(sorted(x, reverse=True))
 reversed(sorted(x, key=lambda e: e, reverse=True))
 reversed(sorted(x, reverse=True, key=lambda e: e))
 reversed(sorted(x, reverse=False))
-reversed(sorted(x, reverse=x))
-reversed(sorted(x, reverse=not x))
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7289
-reversed(sorted(i for i in range(42)))
-reversed(sorted((i for i in range(42)), reverse=True))
-
 
 def reversed(*args, **kwargs):
     return None

crates/ruff/resources/test/fixtures/flake8_comprehensions/C416.py

@@ -7,8 +7,6 @@ d = {"a": 1, "b": 2, "c": 3}
 {i for i in x}
 {k: v for k, v in y}
 {k: v for k, v in d.items()}
-[(k, v) for k, v in d.items()]
-{k: (a, b) for k, (a, b) in d.items()}
 
 [i for i, in z]
 [i for i, j in y]
@@ -19,6 +17,3 @@ d = {"a": 1, "b": 2, "c": 3}
 {k.foo: k for k in y}
 {k["foo"]: k for k in y}
 {k: v if v else None for k, v in y}
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7196
-any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in[t for t in SymbolType])

crates/ruff/resources/test/fixtures/flake8_comprehensions/C417.py

@@ -11,7 +11,6 @@ map(lambda _: 3.0, nums)
 _ = "".join(map(lambda x: x in nums and "1" or "0", range(123)))
 all(map(lambda v: isinstance(v, dict), nums))
 filter(func, map(lambda v: v, nums))
-list(map(lambda x, y: x * y, nums))
 
 # When inside f-string, then the fix should be surrounded by whitespace
 _ = f"{set(map(lambda x: x % 2 == 0, nums))}"
@@ -42,8 +41,3 @@ map(lambda **kwargs: len(kwargs), range(4))
 
 # Ok because multiple arguments are allowed.
 dict(map(lambda k, v: (k, v), keys, values))
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7121
-map(lambda x: x, y if y else z)
-map(lambda x: x, (y if y else z))
-map(lambda x: x, (x, y, z))

crates/ruff/resources/test/fixtures/flake8_logging/LOG001.py

@@ -1,5 +0,0 @@
-import logging
-
-logging.Logger(__name__)
-logging.Logger()
-logging.getLogger(__name__)

crates/ruff/resources/test/fixtures/flake8_logging/LOG002.py

@@ -1,24 +0,0 @@
-import logging
-from logging import getLogger
-
-# Ok
-logging.getLogger(__name__)
-logging.getLogger(name=__name__)
-logging.getLogger("custom")
-logging.getLogger(name="custom")
-
-# LOG002
-getLogger(__file__)
-logging.getLogger(name=__file__)
-
-logging.getLogger(__cached__)
-getLogger(name=__cached__)
-
-
-# Override `logging.getLogger`
-class logging:
-    def getLogger(self):
-        pass
-
-
-logging.getLogger(__file__)

crates/ruff/resources/test/fixtures/flake8_logging/LOG007.py

@@ -1,16 +0,0 @@
-import logging
-
-logger = logging.getLogger(__name__)
-
-logging.exception("foo")  # OK
-logging.exception("foo", exc_info=False)  # LOG007
-logging.exception("foo", exc_info=[])  # LOG007
-logger.exception("foo")  # OK
-logger.exception("foo", exc_info=False)  # LOG007
-logger.exception("foo", exc_info=[])  # LOG007
-
-
-from logging import exception
-
-exception("foo", exc_info=False)  # LOG007
-exception("foo", exc_info=True)  # OK

crates/ruff/resources/test/fixtures/flake8_logging/LOG009.py

@@ -1,9 +0,0 @@
-import logging
-
-logging.WARN  # LOG009
-logging.WARNING  # OK
-
-from logging import WARN, WARNING
-
-WARN  # LOG009
-WARNING  # OK

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT009.py

@@ -92,9 +92,3 @@ class Test(unittest.TestCase):
 
     def test_fail_if_equal(self):
         self.failIfEqual(1, 2)  # Error
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459517
-(self.assertTrue(
-    "piAx_piAy_beta[r][x][y] = {17}".format(
-        self.model.piAx_piAy_beta[r][x][y])))

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT018.py

@@ -52,21 +52,3 @@ def test_multiline():
 
     x = 1; \
         assert something and something_else
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7143
-def test_parenthesized_not():
-    assert not (
-        self.find_graph_output(node.output[0])
-        or self.find_graph_input(node.input[0])
-        or self.find_graph_output(node.input[0])
-    )
-
-    assert (not (
-        self.find_graph_output(node.output[0])
-        or self.find_graph_input(node.input[0])
-        or self.find_graph_output(node.input[0])
-    ))
-
-    assert (not self.find_graph_output(node.output[0]) or
-            self.find_graph_input(node.input[0]))

crates/ruff/resources/test/fixtures/flake8_self/SLF001_extended.py

@@ -1,10 +0,0 @@
-def foo(obj):
-    obj._meta  # OK
-
-
-def foo(obj):
-    obj._asdict  # SLF001
-
-
-def foo(obj):
-    obj._bar  # SLF001

crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_0.py

@@ -8,7 +8,6 @@ try:
 except ValueError:
     pass
 
-
 # SIM105
 try:
     foo()
@@ -111,20 +110,3 @@ try:
     print()
 except "not an exception":
     pass
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7123
-def write_models(directory, Models):
-    try:
-        os.makedirs(model_dir);
-    except OSError:
-        pass;
-
-    try: os.makedirs(model_dir);
-    except OSError:
-        pass;
-
-    try: os.makedirs(model_dir);
-    except OSError:
-        pass; \
-            \
-            #

crates/ruff/resources/test/fixtures/flake8_simplify/SIM118.py

@@ -42,17 +42,3 @@ class Foo:
 
     def __contains__(self, key: object) -> bool:
         return key in self.keys()  # OK
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7124
-key in obj.keys()and foo
-(key in obj.keys())and foo
-key in (obj.keys())and foo
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7200
-for key in (
-    self.experiment.surveys[0]
-        .stations[0]
-        .keys()
-):
-    continue

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

@@ -14,8 +14,6 @@ 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]
 
 # OK
 compare == "yoda"

crates/ruff/resources/test/fixtures/flynt/FLY002.py

@@ -16,8 +16,3 @@ nok4 = "a".join([a, a, *a])  # Not OK (not a static length)
 nok5 = "a".join([choice("flarp")])  # Not OK (not a simple call)
 nok6 = "a".join(x for x in "feefoofum")  # Not OK (generator)
 nok7 = "a".join([f"foo{8}", "bar"])  # Not OK (contains an f-string)
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7197
-def create_file_public_url(url, filename):
-    return''.join([url, filename])

crates/ruff/resources/test/fixtures/numpy/NPY001.py

@@ -18,8 +18,3 @@ pdf = pd.DataFrame(
 )
 
 _ = arr.astype(np.int)
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/6952
-from numpy import float
-
-float(1)

crates/ruff/resources/test/fixtures/pep8_naming/N802.py

@@ -41,13 +41,9 @@ class Test(unittest.TestCase):
         assert True
 
 
-from typing import override, overload
+from typing import override
 
 
 @override
 def BAD_FUNC():
     pass
-
-@overload
-def BAD_FUNC():
-    pass

crates/ruff/resources/test/fixtures/perflint/PERF403.py

@@ -1,83 +0,0 @@
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = {}
-    for idx, name in enumerate(fruit):
-        result[idx] = name  # PERF403
-
-
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = {}
-    for idx, name in enumerate(fruit):
-        if idx % 2:
-            result[idx] = name  # PERF403
-
-
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = {}
-    for idx, name in enumerate(fruit):
-        if idx % 2:
-            result[idx] = name  # Ok (false negative: edge case where `else` is same as `if`)
-        else:
-            result[idx] = name
-
-
-def foo():
-    result = {}
-    fruit = ["apple", "pear", "orange"]
-    for idx, name in enumerate(fruit):
-        if idx % 2:
-            result[idx] = name  # PERF403
-
-
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = []
-    for idx, name in enumerate(fruit):
-        if idx % 2:
-            result[idx] = name  # OK (result is not a dictionary)
-        else:
-            result[idx] = name
-
-
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = {}
-    for idx, name in enumerate(fruit):
-        if idx % 2:
-            result[idx] = name  # OK (if/elif/else isn't replaceable)
-        elif idx % 3:
-            result[idx] = name
-        else:
-            result[idx] = name
-
-
-def foo():
-    result = {1: "banana"}
-    fruit = ["apple", "pear", "orange"]
-    for idx, name in enumerate(fruit):
-        if idx % 2:
-            result[idx] = name  # PERF403
-
-
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = {}
-    for idx, name in enumerate(fruit):
-        if idx in result:
-            result[idx] = name  # PERF403
-
-
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = {}
-    for name in fruit:
-        result[name] = name  # PERF403
-
-
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = {}
-    for idx, name in enumerate(fruit):
-        result[name] = idx  # PERF403

crates/ruff/resources/test/fixtures/pycodestyle/E713.py

@@ -37,4 +37,3 @@ assert (not foo) in bar
 assert {"x": not foo} in bar
 assert [42, not foo] in bar
 assert not (re.search(r"^.:\\Users\\[^\\]*\\Downloads\\.*") is None)
-assert not('name' in request)or not request['name']

crates/ruff/resources/test/fixtures/pycodestyle/E731.py

@@ -138,12 +138,3 @@ def scope():
 class TemperatureScales(Enum):
     CELSIUS = (lambda deg_c: deg_c)
     FAHRENHEIT = (lambda deg_c: deg_c * 9 / 5 + 32)
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7141
-def scope():
-    # E731
-
-    f = lambda: (
-        i := 1,
-    )

crates/ruff/resources/test/fixtures/pycodestyle/W19.py

@@ -1,6 +1,3 @@
-	'''File starts with a tab
-	multiline string with tab in it'''
-
 #: W191
 if False:
 	print  # indented with 1 tab

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

@@ -639,27 +639,3 @@ def starts_with_space_then_this():
 class SameLine: """This is a docstring on the same line"""
 
 def same_line(): """This is a docstring on the same line"""
-
-
-def single_line_docstring_with_an_escaped_backslash():
-    "\
-    "
-
-class StatementOnSameLineAsDocstring:
-    "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1
-    def sort_services(self):
-        pass
-
-class StatementOnSameLineAsDocstring:
-    "After this docstring there's another statement on the same line separated by a semicolon."; priorities=1
-
-
-class CommentAfterDocstring:
-    "After this docstring there's a comment."  # priorities=1
-    def sort_services(self):
-        pass
-
-
-def newline_after_closing_quote(self):
-    "We enforce a newline after the closing quote for a multi-line docstring \
-    but continuations shouldn't be considered multi-line"

crates/ruff/resources/test/fixtures/pydocstyle/D417.py

@@ -128,19 +128,6 @@ def f(x, *, y, z):
     """
     return x, y, z
 
-def f(x):
-    """Do something with valid description.
-
-    Args:
-    ----
-        x: the value
-
-    Returns:
-    -------
-        the value
-    """
-    return x
-
 
 class Test:
     def f(self, /, arg1: int) -> None:

crates/ruff/resources/test/fixtures/pydocstyle/sections.py

@@ -529,16 +529,3 @@ def replace_equals_with_dash2():
     Parameters
     ===========
     """
-
-
-@expect(_D213)
-def non_empty_blank_line_before_section():  # noqa: D416
-    """Toggle the gizmo.
-
-    The function's description.
-    
-    Returns
-    -------
-    A value of some sort.
-
-    """

crates/ruff/resources/test/fixtures/pyflakes/F401_0.py

@@ -112,11 +112,3 @@ match *0, 1, *2:
         import b1
 
         import b2
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7244
-from datameta_client_lib.model_utils import (  # noqa: F401
-noqa )
-
-from datameta_client_lib.model_helpers import (
-noqa )

crates/ruff/resources/test/fixtures/pylint/bad_dunder_method_name.py

@@ -1,6 +1,3 @@
-from typing import override
-
-
 class Apples:
     def _init_(self):  # [bad-dunder-name]
         pass
@@ -24,11 +21,6 @@ class Apples:
         # author likely meant to call the invert dunder method
         pass
 
-    @override
-    def _ignore__(self):  # [bad-dunder-name]
-        # overridden dunder methods should be ignored
-        pass
-
     def hello(self):
         print("hello")
 
@@ -49,20 +41,6 @@ class Apples:
     def __doc__(self):
         return "Docstring"
 
-    # Allow dunder methods recommended by attrs.
-    def __attrs_post_init__(self):
-        pass
-
-    def __attrs_pre_init__(self):
-        pass
-
-    def __attrs_init__(self):
-        pass
-
-    # Allow __html__, used by Jinja2 and Django.
-    def __html__(self):
-        pass
-
 
 def __foo_bar__():  # this is not checked by the [bad-dunder-name] rule
     ...

crates/ruff/resources/test/fixtures/pylint/nested_min_max.py

@@ -36,6 +36,3 @@ tuples_list = [
 
 min(min(tuples_list))
 max(max(tuples_list))
-
-# Starred argument should be copied as it is.
-max(1, max(*a))

crates/ruff/resources/test/fixtures/pylint/repeated_isinstance_calls.py

@@ -36,8 +36,3 @@ def isinstances():
     result = isinstance(var[6], int) or isinstance(var[7], int)
     result = isinstance(var[6], (float, int)) or False
     return result
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722460483
-if(isinstance(self.k, int)) or (isinstance(self.k, float)):
-    ...

crates/ruff/resources/test/fixtures/pylint/too_many_public_methods.py

@@ -1,60 +0,0 @@
-class Everything:
-    foo = 1
-
-    def __init__(self):
-        pass
-
-    def _private(self):
-        pass
-
-    def method1(self):
-        pass
-
-    def method2(self):
-        pass
-
-    def method3(self):
-        pass
-
-    def method4(self):
-        pass
-
-    def method5(self):
-        pass
-
-    def method6(self):
-        pass
-
-    def method7(self):
-        pass
-
-    def method8(self):
-        pass
-
-    def method9(self):
-        pass
-
-class Small:
-    def __init__(self):
-        pass
-
-    def _private(self):
-        pass
-
-    def method1(self):
-        pass
-
-    def method2(self):
-        pass
-
-    def method3(self):
-        pass
-
-    def method4(self):
-        pass
-
-    def method5(self):
-        pass
-
-    def method6(self):
-        pass

crates/ruff/resources/test/fixtures/pyupgrade/UP003.py

@@ -10,5 +10,6 @@ type(arg)(" ")
 # OK
 y = x.dtype.type(0.0)
 
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459841
-assert isinstance(fullname, type("")is not True)
+# OK
+type = lambda *args, **kwargs: None
+type("")

crates/ruff/resources/test/fixtures/pyupgrade/UP007.py

@@ -95,22 +95,3 @@ def f(x: Optional[str, int : float]) -> None:
 
 def f(x: Optional[int, float]) -> None:
     ...
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7131
-class ServiceRefOrValue:
-    service_specification: Optional[
-        list[ServiceSpecificationRef]
-        | list[ServiceSpecification]
-    ] = None
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7201
-class ServiceRefOrValue:
-    service_specification: Optional[str]is not True = None
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7452
-class Collection(Protocol[*_B0]):
-    def __iter__(self) -> Iterator[Union[*_B0]]:
-        ...

crates/ruff/resources/test/fixtures/pyupgrade/UP012.py

@@ -75,8 +75,3 @@ print("foo".encode())  # print(b"foo")
 (f"foo{bar}").encode(encoding="utf-8")
 ("unicode text©").encode("utf-8")
 ("unicode text©").encode(encoding="utf-8")
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459882
-def _match_ignore(line):
-	input=stdin and'\n'.encode()or None

crates/ruff/resources/test/fixtures/pyupgrade/UP022.py

@@ -43,11 +43,7 @@ output = subprocess.run(
     ["foo"], stdout=subprocess.PIPE, capture_output=False, stderr=subprocess.PIPE
 )
 
-output = subprocess.run(
-    ["foo"], capture_output=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-)
-
-# OK
+# Examples that should NOT trigger the rule
 from foo import PIPE
 subprocess.run(["foo"], stdout=PIPE, stderr=PIPE)
 run(["foo"], stdout=None, stderr=PIPE)

crates/ruff/resources/test/fixtures/pyupgrade/UP024_0.py

@@ -96,11 +96,3 @@ try:
     pass
 except (OSError, KeyError):
     pass
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7101
-def get_owner_id_from_mac_address():
-    try:
-        mac_address = get_primary_mac_address()
-    except(IOError, OSError) as ex:
-        msg = 'Unable to query URL to get Owner ID: {u}\n{e}'.format(u=owner_id_url, e=ex)

crates/ruff/resources/test/fixtures/pyupgrade/UP035.py

@@ -74,8 +74,6 @@ from typing import Collection
 from typing import AsyncGenerator
 from typing import Reversible
 from typing import Generator
-from typing import Callable
-from typing import cast
 
 # OK
 from a import b

crates/ruff/resources/test/fixtures/pyupgrade/UP036_0.py

@@ -178,9 +178,3 @@ if True:
 if True:
     if sys.version_info > (3, 0): \
     expected_error = []
-
-if sys.version_info < (3,12):
-    print("py3")
-
-if sys.version_info <= (3,12):
-    print("py3")

crates/ruff/resources/test/fixtures/pyupgrade/UP040.py

@@ -13,19 +13,18 @@ x: typing.TypeAlias = list[T]
 T = typing.TypeVar("T")
 x: typing.TypeAlias = list[T]
 
-# UP040 bounded generic
+# UP040 bounded generic (todo)
 T = typing.TypeVar("T", bound=int)
 x: typing.TypeAlias = list[T]
 
-# UP040 constrained generic
 T = typing.TypeVar("T", int, str)
 x: typing.TypeAlias = list[T]
 
-# UP040 contravariant generic
+# UP040 contravariant generic (todo)
 T = typing.TypeVar("T", contravariant=True)
 x: typing.TypeAlias = list[T]
 
-# UP040 covariant generic
+# UP040 covariant generic (todo)
 T = typing.TypeVar("T", covariant=True)
 x: typing.TypeAlias = list[T]
 

crates/ruff/resources/test/fixtures/refurb/FURB140.py

@@ -1,43 +0,0 @@
-def zipped():
-    return zip([1, 2, 3], "ABC")
-
-# Errors.
-
-# FURB140
-[print(x, y) for x, y in zipped()]
-
-# FURB140
-(print(x, y) for x, y in zipped())
-
-# FURB140
-{print(x, y) for x, y in zipped()}
-
-
-from itertools import starmap as sm
-
-# FURB140
-[print(x, y) for x, y in zipped()]
-
-# FURB140
-(print(x, y) for x, y in zipped())
-
-# FURB140
-{print(x, y) for x, y in zipped()}
-
-# Non-errors.
-
-[print(x, int) for x, _ in zipped()]
-
-[print(x, *y) for x, y in zipped()]
-
-[print(x, y, 1) for x, y in zipped()]
-
-[print(y, x) for x, y in zipped()]
-
-[print(x + 1, y) for x, y in zipped()]
-
-[print(x) for x in range(100)]
-
-[print() for x, y in zipped()]
-
-[print(x, end=y) for x, y in zipped()]

crates/ruff/resources/test/fixtures/refurb/FURB145.py

@@ -1,21 +0,0 @@
-l = [1, 2, 3, 4, 5]
-
-# Errors.
-a = l[:]
-b, c = 1, l[:]
-d, e = l[:], 1
-m = l[::]
-l[:]
-print(l[:])
-
-# False negatives.
-aa = a[:]  # Type inference.
-
-# OK.
-t = (1, 2, 3, 4, 5)
-f = t[:]  # t.copy() is not supported.
-g = l[1:3]
-h = l[1:]
-i = l[:3]
-j = l[1:3:2]
-k = l[::2]

crates/ruff/src/autofix/edits.rs

@@ -3,14 +3,14 @@
 use anyhow::{Context, Result};
 
 use ruff_diagnostics::Edit;
-use ruff_python_ast::{self as ast, Arguments, ExceptHandler, Stmt};
+use ruff_python_ast::{self as ast, Arguments, ExceptHandler, Expr, Keyword, Stmt};
 use ruff_python_codegen::Stylist;
 use ruff_python_index::Indexer;
 use ruff_python_trivia::{
     has_leading_content, is_python_whitespace, PythonWhitespace, SimpleTokenKind, SimpleTokenizer,
 };
 use ruff_source_file::{Locator, NewlineWithTrailingNewline};
-use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
+use ruff_text_size::{Ranged, TextLen, TextSize};
 
 use crate::autofix::codemods;
 
@@ -92,8 +92,10 @@ pub(crate) fn remove_argument<T: Ranged>(
 ) -> Result<Edit> {
     // Partition into arguments before and after the argument to remove.
     let (before, after): (Vec<_>, Vec<_>) = arguments
-        .arguments_source_order()
-        .map(|arg| arg.range())
+        .args
+        .iter()
+        .map(Expr::range)
+        .chain(arguments.keywords.iter().map(Keyword::range))
         .filter(|range| argument.range() != *range)
         .partition(|range| range.start() < argument.start());
 
@@ -247,44 +249,6 @@ fn next_stmt_break(semicolon: TextSize, locator: &Locator) -> TextSize {
     locator.line_end(start_location)
 }
 
-/// Add leading whitespace to a snippet, if it's immediately preceded an identifier or keyword.
-pub(crate) fn pad_start(mut content: String, start: TextSize, locator: &Locator) -> String {
-    // Ex) When converting `except(ValueError,)` from a tuple to a single argument, we need to
-    // insert a space before the fix, to achieve `except ValueError`.
-    if locator
-        .up_to(start)
-        .chars()
-        .last()
-        .is_some_and(|char| char.is_ascii_alphabetic())
-    {
-        content.insert(0, ' ');
-    }
-    content
-}
-
-/// Add trailing whitespace to a snippet, if it's immediately followed by an identifier or keyword.
-pub(crate) fn pad_end(mut content: String, end: TextSize, locator: &Locator) -> String {
-    if locator
-        .after(end)
-        .chars()
-        .next()
-        .is_some_and(|char| char.is_ascii_alphabetic())
-    {
-        content.push(' ');
-    }
-    content
-}
-
-/// Add leading or trailing whitespace to a snippet, if it's immediately preceded or followed by
-/// an identifier or keyword.
-pub(crate) fn pad(content: String, range: TextRange, locator: &Locator) -> String {
-    pad_start(
-        pad_end(content, range.end(), locator),
-        range.start(),
-        locator,
-    )
-}
-
 #[cfg(test)]
 mod tests {
     use anyhow::Result;

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

@@ -13,10 +13,10 @@ use crate::registry::Rule;
 use crate::rules::{
     flake8_2020, flake8_async, flake8_bandit, flake8_boolean_trap, flake8_bugbear, flake8_builtins,
     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_use_pathlib, flynt, numpy, pandas_vet,
-    pep8_naming, pycodestyle, pyflakes, pygrep_hooks, pylint, pyupgrade, refurb, ruff,
+    flake8_future_annotations, flake8_gettext, flake8_implicit_str_concat, flake8_logging_format,
+    flake8_pie, flake8_print, flake8_pyi, flake8_pytest_style, flake8_self, flake8_simplify,
+    flake8_tidy_imports, flake8_use_pathlib, flynt, numpy, pandas_vet, pep8_naming, pycodestyle,
+    pyflakes, pygrep_hooks, pylint, pyupgrade, ruff,
 };
 use crate::settings::types::PythonVersion;
 
@@ -113,12 +113,10 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::UnnecessaryIterableAllocationForFirstElement) {
                 ruff::rules::unnecessary_iterable_allocation_for_first_element(checker, subscript);
             }
+
             if checker.enabled(Rule::InvalidIndexType) {
                 ruff::rules::invalid_index_type(checker, subscript);
             }
-            if checker.settings.rules.enabled(Rule::SliceCopy) {
-                refurb::rules::slice_copy(checker, subscript);
-            }
 
             pandas_vet::rules::subscript(checker, value, expr);
         }
@@ -260,9 +258,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::SixPY3) {
                 flake8_2020::rules::name_or_attribute(checker, expr);
             }
-            if checker.enabled(Rule::UndocumentedWarn) {
-                flake8_logging::rules::undocumented_warn(checker, expr);
-            }
             if checker.enabled(Rule::LoadBeforeGlobalDeclaration) {
                 pylint::rules::load_before_global_declaration(checker, id, expr);
             }
@@ -329,9 +324,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::CollectionsNamedTuple) {
                 flake8_pyi::rules::collections_named_tuple(checker, expr);
             }
-            if checker.enabled(Rule::UndocumentedWarn) {
-                flake8_logging::rules::undocumented_warn(checker, expr);
-            }
             pandas_vet::rules::attr(checker, attribute);
         }
         Expr::Call(
@@ -586,9 +578,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::LoggingConfigInsecureListen) {
                 flake8_bandit::rules::logging_config_insecure_listen(checker, call);
             }
-            if checker.enabled(Rule::FlaskDebugTrue) {
-                flake8_bandit::rules::flask_debug_true(checker, call);
-            }
             if checker.any_enabled(&[
                 Rule::SubprocessWithoutShellEqualsTrue,
                 Rule::SubprocessPopenWithShellEqualsTrue,
@@ -895,15 +884,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::QuadraticListSummation) {
                 ruff::rules::quadratic_list_summation(checker, call);
             }
-            if checker.enabled(Rule::DirectLoggerInstantiation) {
-                flake8_logging::rules::direct_logger_instantiation(checker, call);
-            }
-            if checker.enabled(Rule::InvalidGetLoggerArgument) {
-                flake8_logging::rules::invalid_get_logger_argument(checker, call);
-            }
-            if checker.enabled(Rule::ExceptionWithoutExcInfo) {
-                flake8_logging::rules::exception_without_exc_info(checker, call);
-            }
         }
         Expr::Dict(ast::ExprDict {
             keys,
@@ -1215,6 +1195,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
         }
         Expr::Constant(ast::ExprConstant {
             value: Constant::Int(_) | Constant::Float(_) | Constant::Complex { .. },
+            kind: _,
             range: _,
         }) => {
             if checker.source_type.is_stub() && checker.enabled(Rule::NumericLiteralTooLong) {
@@ -1223,6 +1204,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
         }
         Expr::Constant(ast::ExprConstant {
             value: Constant::Bytes(_),
+            kind: _,
             range: _,
         }) => {
             if checker.source_type.is_stub() && checker.enabled(Rule::StringOrBytesTooLong) {
@@ -1231,6 +1213,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
         }
         Expr::Constant(ast::ExprConstant {
             value: Constant::Str(value),
+            kind,
             range: _,
         }) => {
             if checker.enabled(Rule::HardcodedBindAllInterfaces) {
@@ -1244,7 +1227,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 flake8_bandit::rules::hardcoded_tmp_directory(checker, expr, value);
             }
             if checker.enabled(Rule::UnicodeKindPrefix) {
-                pyupgrade::rules::unicode_kind_prefix(checker, expr, value.unicode);
+                pyupgrade::rules::unicode_kind_prefix(checker, expr, kind.as_deref());
             }
             if checker.source_type.is_stub() {
                 if checker.enabled(Rule::StringOrBytesTooLong) {
@@ -1279,13 +1262,16 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 flake8_simplify::rules::twisted_arms_in_ifexpr(checker, expr, test, body, orelse);
             }
         }
-        Expr::ListComp(
-            comp @ ast::ExprListComp {
-                elt,
-                generators,
-                range: _,
-            },
-        ) => {
+        Expr::ListComp(ast::ExprListComp {
+            elt,
+            generators,
+            range: _,
+        })
+        | Expr::SetComp(ast::ExprSetComp {
+            elt,
+            generators,
+            range: _,
+        }) => {
             if checker.enabled(Rule::UnnecessaryComprehension) {
                 flake8_comprehensions::rules::unnecessary_list_set_comprehension(
                     checker, expr, elt, generators,
@@ -1299,33 +1285,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                     pylint::rules::iteration_over_set(checker, &generator.iter);
                 }
             }
-            if checker.enabled(Rule::ReimplementedStarmap) {
-                refurb::rules::reimplemented_starmap(checker, &comp.into());
-            }
-        }
-        Expr::SetComp(
-            comp @ ast::ExprSetComp {
-                elt,
-                generators,
-                range: _,
-            },
-        ) => {
-            if checker.enabled(Rule::UnnecessaryComprehension) {
-                flake8_comprehensions::rules::unnecessary_list_set_comprehension(
-                    checker, expr, elt, generators,
-                );
-            }
-            if checker.enabled(Rule::FunctionUsesLoopVariable) {
-                flake8_bugbear::rules::function_uses_loop_variable(checker, &Node::Expr(expr));
-            }
-            if checker.enabled(Rule::IterationOverSet) {
-                for generator in generators {
-                    pylint::rules::iteration_over_set(checker, &generator.iter);
-                }
-            }
-            if checker.enabled(Rule::ReimplementedStarmap) {
-                refurb::rules::reimplemented_starmap(checker, &comp.into());
-            }
         }
         Expr::DictComp(ast::ExprDictComp {
             key,
@@ -1350,13 +1309,11 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 ruff::rules::static_key_dict_comprehension(checker, key);
             }
         }
-        Expr::GeneratorExp(
-            generator @ ast::ExprGeneratorExp {
-                generators,
-                elt: _,
-                range: _,
-            },
-        ) => {
+        Expr::GeneratorExp(ast::ExprGeneratorExp {
+            generators,
+            elt: _,
+            range: _,
+        }) => {
             if checker.enabled(Rule::FunctionUsesLoopVariable) {
                 flake8_bugbear::rules::function_uses_loop_variable(checker, &Node::Expr(expr));
             }
@@ -1365,9 +1322,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                     pylint::rules::iteration_over_set(checker, &generator.iter);
                 }
             }
-            if checker.enabled(Rule::ReimplementedStarmap) {
-                refurb::rules::reimplemented_starmap(checker, &generator.into());
-            }
         }
         Expr::BoolOp(
             bool_op @ ast::ExprBoolOp {
@@ -1400,8 +1354,8 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::ExprAndFalse) {
                 flake8_simplify::rules::expr_and_false(checker, expr);
             }
-            if checker.enabled(Rule::RepeatedEqualityComparison) {
-                pylint::rules::repeated_equality_comparison(checker, bool_op);
+            if checker.enabled(Rule::RepeatedEqualityComparisonTarget) {
+                pylint::rules::repeated_equality_comparison_target(checker, bool_op);
             }
         }
         _ => {}

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

@@ -411,13 +411,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             if checker.enabled(Rule::EqWithoutHash) {
                 pylint::rules::object_without_hash_method(checker, class_def);
             }
-            if checker.enabled(Rule::TooManyPublicMethods) {
-                pylint::rules::too_many_public_methods(
-                    checker,
-                    class_def,
-                    checker.settings.pylint.max_public_methods,
-                );
-            }
             if checker.enabled(Rule::GlobalStatement) {
                 pylint::rules::global_statement(checker, name);
             }
@@ -1184,7 +1177,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 iter,
                 orelse,
                 is_async,
-                range: _,
+                ..
             },
         ) => {
             if checker.any_enabled(&[
@@ -1218,9 +1211,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             if checker.enabled(Rule::ManualListCopy) {
                 perflint::rules::manual_list_copy(checker, target, body);
             }
-            if checker.enabled(Rule::ManualDictComprehension) {
-                perflint::rules::manual_dict_comprehension(checker, target, body);
-            }
             if checker.enabled(Rule::UnnecessaryListCast) {
                 perflint::rules::unnecessary_list_cast(checker, iter);
             }

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

@@ -528,7 +528,11 @@ where
                     &self.semantic.definitions,
                 );
                 self.semantic.push_definition(definition);
-                self.semantic.push_scope(ScopeKind::Function(function_def));
+
+                self.semantic.push_scope(match &stmt {
+                    Stmt::FunctionDef(stmt) => ScopeKind::Function(stmt),
+                    _ => unreachable!("Expected Stmt::FunctionDef"),
+                });
 
                 self.deferred.functions.push(self.semantic.snapshot());
 
@@ -1188,6 +1192,7 @@ where
             }
             Expr::Constant(ast::ExprConstant {
                 value: Constant::Str(value),
+                kind: _,
                 range: _,
             }) => {
                 if self.semantic.in_type_definition()

crates/ruff/src/checkers/noqa.rs

@@ -6,7 +6,6 @@ use itertools::Itertools;
 use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
 
 use ruff_diagnostics::{Diagnostic, Edit, Fix};
-use ruff_python_trivia::CommentRanges;
 use ruff_source_file::Locator;
 
 use crate::noqa;
@@ -20,7 +19,7 @@ pub(crate) fn check_noqa(
     diagnostics: &mut Vec<Diagnostic>,
     path: &Path,
     locator: &Locator,
-    comment_ranges: &CommentRanges,
+    comment_ranges: &[TextRange],
     noqa_line_for: &NoqaMapping,
     analyze_directives: bool,
     settings: &Settings,

crates/ruff/src/checkers/physical_lines.rs

@@ -9,7 +9,7 @@ use crate::registry::Rule;
 use crate::rules::flake8_copyright::rules::missing_copyright_notice;
 use crate::rules::pycodestyle::rules::{
     doc_line_too_long, line_too_long, mixed_spaces_and_tabs, no_newline_at_end_of_file,
-    trailing_whitespace,
+    tab_indentation, trailing_whitespace,
 };
 use crate::rules::pylint;
 use crate::settings::Settings;
@@ -31,6 +31,7 @@ pub(crate) fn check_physical_lines(
     let enforce_trailing_whitespace = settings.rules.enabled(Rule::TrailingWhitespace);
     let enforce_blank_line_contains_whitespace =
         settings.rules.enabled(Rule::BlankLineWithWhitespace);
+    let enforce_tab_indentation = settings.rules.enabled(Rule::TabIndentation);
     let enforce_copyright_notice = settings.rules.enabled(Rule::MissingCopyrightNotice);
 
     let mut doc_lines_iter = doc_lines.iter().peekable();
@@ -68,6 +69,12 @@ pub(crate) fn check_physical_lines(
                 diagnostics.push(diagnostic);
             }
         }
+
+        if enforce_tab_indentation {
+            if let Some(diagnostic) = tab_indentation(&line, indexer) {
+                diagnostics.push(diagnostic);
+            }
+        }
     }
 
     if enforce_no_newline_at_end_of_file {

crates/ruff/src/checkers/tokens.rs

@@ -86,10 +86,6 @@ pub(crate) fn check_tokens(
         }
     }
 
-    if settings.rules.enabled(Rule::TabIndentation) {
-        pycodestyle::rules::tab_indentation(&mut diagnostics, tokens, locator, indexer);
-    }
-
     if settings.rules.any_enabled(&[
         Rule::InvalidCharacterBackspace,
         Rule::InvalidCharacterSub,

crates/ruff/src/codes.rs

@@ -9,7 +9,6 @@ use strum_macros::{AsRefStr, EnumIter};
 use ruff_diagnostics::Violation;
 
 use crate::registry::{AsRule, Linter};
-use crate::rule_selector::is_single_rule_selector;
 use crate::rules;
 
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
@@ -52,10 +51,7 @@ impl PartialEq<&str> for NoqaCode {
 pub enum RuleGroup {
     /// The rule has not been assigned to any specific group.
     Unspecified,
-    /// The rule is unstable, and preview mode must be enabled for usage.
-    Preview,
-    /// Legacy category for unstable rules, supports backwards compatible selection.
-    #[deprecated(note = "Use `RuleGroup::Preview` for new rules instead")]
+    /// The rule is still under development, and must be enabled explicitly.
     Nursery,
 }
 
@@ -68,71 +64,38 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
     Some(match (linter, code) {
         // pycodestyle errors
         (Pycodestyle, "E101") => (RuleGroup::Unspecified, rules::pycodestyle::rules::MixedSpacesAndTabs),
-        #[allow(deprecated)]
         (Pycodestyle, "E111") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::IndentationWithInvalidMultiple),
-        #[allow(deprecated)]
         (Pycodestyle, "E112") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::NoIndentedBlock),
-        #[allow(deprecated)]
         (Pycodestyle, "E113") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::UnexpectedIndentation),
-        #[allow(deprecated)]
         (Pycodestyle, "E114") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::IndentationWithInvalidMultipleComment),
-        #[allow(deprecated)]
         (Pycodestyle, "E115") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::NoIndentedBlockComment),
-        #[allow(deprecated)]
         (Pycodestyle, "E116") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::UnexpectedIndentationComment),
-        #[allow(deprecated)]
         (Pycodestyle, "E117") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::OverIndented),
-        #[allow(deprecated)]
         (Pycodestyle, "E201") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::WhitespaceAfterOpenBracket),
-        #[allow(deprecated)]
         (Pycodestyle, "E202") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::WhitespaceBeforeCloseBracket),
-        #[allow(deprecated)]
         (Pycodestyle, "E203") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::WhitespaceBeforePunctuation),
-        #[allow(deprecated)]
         (Pycodestyle, "E211") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::WhitespaceBeforeParameters),
-        #[allow(deprecated)]
         (Pycodestyle, "E221") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleSpacesBeforeOperator),
-        #[allow(deprecated)]
         (Pycodestyle, "E222") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterOperator),
-        #[allow(deprecated)]
         (Pycodestyle, "E223") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabBeforeOperator),
-        #[allow(deprecated)]
         (Pycodestyle, "E224") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabAfterOperator),
-        #[allow(deprecated)]
         (Pycodestyle, "E225") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundOperator),
-        #[allow(deprecated)]
         (Pycodestyle, "E226") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundArithmeticOperator),
-        #[allow(deprecated)]
         (Pycodestyle, "E227") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundBitwiseOrShiftOperator),
-        #[allow(deprecated)]
         (Pycodestyle, "E228") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundModuloOperator),
-        #[allow(deprecated)]
         (Pycodestyle, "E231") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespace),
-        #[allow(deprecated)]
         (Pycodestyle, "E241") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterComma),
-        #[allow(deprecated)]
         (Pycodestyle, "E242") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabAfterComma),
-        #[allow(deprecated)]
         (Pycodestyle, "E251") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::UnexpectedSpacesAroundKeywordParameterEquals),
-        #[allow(deprecated)]
         (Pycodestyle, "E252") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundParameterEquals),
-        #[allow(deprecated)]
         (Pycodestyle, "E261") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TooFewSpacesBeforeInlineComment),
-        #[allow(deprecated)]
         (Pycodestyle, "E262") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::NoSpaceAfterInlineComment),
-        #[allow(deprecated)]
         (Pycodestyle, "E265") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::NoSpaceAfterBlockComment),
-        #[allow(deprecated)]
         (Pycodestyle, "E266") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleLeadingHashesForBlockComment),
-        #[allow(deprecated)]
         (Pycodestyle, "E271") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterKeyword),
-        #[allow(deprecated)]
         (Pycodestyle, "E272") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleSpacesBeforeKeyword),
-        #[allow(deprecated)]
         (Pycodestyle, "E273") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabAfterKeyword),
-        #[allow(deprecated)]
         (Pycodestyle, "E274") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabBeforeKeyword),
-        #[allow(deprecated)]
         (Pycodestyle, "E275") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAfterKeyword),
         (Pycodestyle, "E401") => (RuleGroup::Unspecified, rules::pycodestyle::rules::MultipleImportsOnOneLine),
         (Pycodestyle, "E402") => (RuleGroup::Unspecified, rules::pycodestyle::rules::ModuleImportNotAtTopOfFile),
@@ -213,7 +176,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pylint, "C0205") => (RuleGroup::Unspecified, rules::pylint::rules::SingleStringSlots),
         (Pylint, "C0208") => (RuleGroup::Unspecified, rules::pylint::rules::IterationOverSet),
         (Pylint, "C0414") => (RuleGroup::Unspecified, rules::pylint::rules::UselessImportAlias),
-        #[allow(deprecated)]
         (Pylint, "C1901") => (RuleGroup::Nursery, rules::pylint::rules::CompareToEmptyString),
         (Pylint, "C3002") => (RuleGroup::Unspecified, rules::pylint::rules::UnnecessaryDirectLambdaCall),
         (Pylint, "E0100") => (RuleGroup::Unspecified, rules::pylint::rules::YieldInInit),
@@ -250,11 +212,10 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pylint, "R0915") => (RuleGroup::Unspecified, rules::pylint::rules::TooManyStatements),
         (Pylint, "R1701") => (RuleGroup::Unspecified, rules::pylint::rules::RepeatedIsinstanceCalls),
         (Pylint, "R1711") => (RuleGroup::Unspecified, rules::pylint::rules::UselessReturn),
-        (Pylint, "R1714") => (RuleGroup::Unspecified, rules::pylint::rules::RepeatedEqualityComparison),
+        (Pylint, "R1714") => (RuleGroup::Unspecified, rules::pylint::rules::RepeatedEqualityComparisonTarget),
         (Pylint, "R1722") => (RuleGroup::Unspecified, rules::pylint::rules::SysExitAlias),
         (Pylint, "R2004") => (RuleGroup::Unspecified, rules::pylint::rules::MagicValueComparison),
         (Pylint, "R5501") => (RuleGroup::Unspecified, rules::pylint::rules::CollapsibleElseIf),
-        #[allow(deprecated)]
         (Pylint, "R6301") => (RuleGroup::Nursery, rules::pylint::rules::NoSelfUse),
         (Pylint, "W0120") => (RuleGroup::Unspecified, rules::pylint::rules::UselessElseOnLoop),
         (Pylint, "W0127") => (RuleGroup::Unspecified, rules::pylint::rules::SelfAssigningVariable),
@@ -267,11 +228,8 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pylint, "W1508") => (RuleGroup::Unspecified, rules::pylint::rules::InvalidEnvvarDefault),
         (Pylint, "W1509") => (RuleGroup::Unspecified, rules::pylint::rules::SubprocessPopenPreexecFn),
         (Pylint, "W1510") => (RuleGroup::Unspecified, rules::pylint::rules::SubprocessRunWithoutCheck),
-        #[allow(deprecated)]
         (Pylint, "W1641") => (RuleGroup::Nursery, rules::pylint::rules::EqWithoutHash),
-        (Pylint, "R0904") => (RuleGroup::Preview, rules::pylint::rules::TooManyPublicMethods),
         (Pylint, "W2901") => (RuleGroup::Unspecified, rules::pylint::rules::RedefinedLoopName),
-        #[allow(deprecated)]
         (Pylint, "W3201") => (RuleGroup::Nursery, rules::pylint::rules::BadDunderMethodName),
         (Pylint, "W3301") => (RuleGroup::Unspecified, rules::pylint::rules::NestedMinMax),
 
@@ -445,7 +403,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Simplify, "910") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::DictGetWithNoneDefault),
 
         // flake8-copyright
-        #[allow(deprecated)]
         (Flake8Copyright, "001") => (RuleGroup::Nursery, rules::flake8_copyright::rules::MissingCopyrightNotice),
 
         // pyupgrade
@@ -573,7 +530,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Bandit, "110") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::TryExceptPass),
         (Flake8Bandit, "112") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::TryExceptContinue),
         (Flake8Bandit, "113") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::RequestWithoutTimeout),
-        (Flake8Bandit, "201") => (RuleGroup::Preview, rules::flake8_bandit::rules::FlaskDebugTrue),
         (Flake8Bandit, "301") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousPickleUsage),
         (Flake8Bandit, "302") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousMarshalUsage),
         (Flake8Bandit, "303") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousInsecureHashUsage),
@@ -859,11 +815,9 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Ruff, "012") => (RuleGroup::Unspecified, rules::ruff::rules::MutableClassDefault),
         (Ruff, "013") => (RuleGroup::Unspecified, rules::ruff::rules::ImplicitOptional),
         #[cfg(feature = "unreachable-code")] // When removing this feature gate, also update rules_selector.rs
-        #[allow(deprecated)]
         (Ruff, "014") => (RuleGroup::Nursery, rules::ruff::rules::UnreachableCode),
         (Ruff, "015") => (RuleGroup::Unspecified, rules::ruff::rules::UnnecessaryIterableAllocationForFirstElement),
         (Ruff, "016") => (RuleGroup::Unspecified, rules::ruff::rules::InvalidIndexType),
-        #[allow(deprecated)]
         (Ruff, "017") => (RuleGroup::Nursery, rules::ruff::rules::QuadraticListSummation),
         (Ruff, "100") => (RuleGroup::Unspecified, rules::ruff::rules::UnusedNOQA),
         (Ruff, "200") => (RuleGroup::Unspecified, rules::ruff::rules::InvalidPyprojectToml),
@@ -899,7 +853,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Perflint, "203") => (RuleGroup::Unspecified, rules::perflint::rules::TryExceptInLoop),
         (Perflint, "401") => (RuleGroup::Unspecified, rules::perflint::rules::ManualListComprehension),
         (Perflint, "402") => (RuleGroup::Unspecified, rules::perflint::rules::ManualListCopy),
-        (Perflint, "403") => (RuleGroup::Preview, rules::perflint::rules::ManualDictComprehension),
 
         // flake8-fixme
         (Flake8Fixme, "001") => (RuleGroup::Unspecified, rules::flake8_fixme::rules::LineContainsFixme),
@@ -913,20 +866,9 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Slots, "002") => (RuleGroup::Unspecified, rules::flake8_slots::rules::NoSlotsInNamedtupleSubclass),
 
         // refurb
-        #[allow(deprecated)]
         (Refurb, "113") => (RuleGroup::Nursery, rules::refurb::rules::RepeatedAppend),
-        #[allow(deprecated)]
         (Refurb, "131") => (RuleGroup::Nursery, rules::refurb::rules::DeleteFullSlice),
-        #[allow(deprecated)]
         (Refurb, "132") => (RuleGroup::Nursery, rules::refurb::rules::CheckAndRemoveFromSet),
-        (Refurb, "140") => (RuleGroup::Preview, rules::refurb::rules::ReimplementedStarmap),
-        (Refurb, "145") => (RuleGroup::Preview, rules::refurb::rules::SliceCopy),
-
-        // flake8-logging
-        (Flake8Logging, "001") => (RuleGroup::Preview, rules::flake8_logging::rules::DirectLoggerInstantiation),
-        (Flake8Logging, "002") => (RuleGroup::Preview, rules::flake8_logging::rules::InvalidGetLoggerArgument),
-        (Flake8Logging, "007") => (RuleGroup::Preview, rules::flake8_logging::rules::ExceptionWithoutExcInfo),
-        (Flake8Logging, "009") => (RuleGroup::Preview, rules::flake8_logging::rules::UndocumentedWarn),
 
         _ => return None,
     })

crates/ruff/src/cst/helpers.rs

@@ -1,6 +1,4 @@
-use libcst_native::{
-    Expression, Name, NameOrAttribute, ParenthesizableWhitespace, SimpleWhitespace, UnaryOperation,
-};
+use libcst_native::{Expression, NameOrAttribute};
 
 fn compose_call_path_inner<'a>(expr: &'a Expression, parts: &mut Vec<&'a str>) {
     match expr {
@@ -38,55 +36,3 @@ pub(crate) fn compose_module_path(module: &NameOrAttribute) -> String {
         }
     }
 }
-
-/// Return a [`ParenthesizableWhitespace`] containing a single space.
-pub(crate) fn space() -> ParenthesizableWhitespace<'static> {
-    ParenthesizableWhitespace::SimpleWhitespace(SimpleWhitespace(" "))
-}
-
-/// Ensure that a [`ParenthesizableWhitespace`] contains at least one space.
-pub(crate) fn or_space(whitespace: ParenthesizableWhitespace) -> ParenthesizableWhitespace {
-    if whitespace == ParenthesizableWhitespace::default() {
-        space()
-    } else {
-        whitespace
-    }
-}
-
-/// Negate a condition, i.e., `a` => `not a` and `not a` => `a`.
-pub(crate) fn negate<'a>(expression: &Expression<'a>) -> Expression<'a> {
-    if let Expression::UnaryOperation(ref expression) = expression {
-        if matches!(expression.operator, libcst_native::UnaryOp::Not { .. }) {
-            return *expression.expression.clone();
-        }
-    }
-
-    if let Expression::Name(ref expression) = expression {
-        match expression.value {
-            "True" => {
-                return Expression::Name(Box::new(Name {
-                    value: "False",
-                    lpar: vec![],
-                    rpar: vec![],
-                }));
-            }
-            "False" => {
-                return Expression::Name(Box::new(Name {
-                    value: "True",
-                    lpar: vec![],
-                    rpar: vec![],
-                }));
-            }
-            _ => {}
-        }
-    }
-
-    Expression::UnaryOperation(Box::new(UnaryOperation {
-        operator: libcst_native::UnaryOp::Not {
-            whitespace_after: space(),
-        },
-        expression: Box::new(expression.clone()),
-        lpar: vec![],
-        rpar: vec![],
-    }))
-}

crates/ruff/src/docstrings/mod.rs

@@ -30,11 +30,6 @@ impl<'a> Docstring<'a> {
     pub(crate) fn leading_quote(&self) -> &'a str {
         &self.contents[TextRange::up_to(self.body_range.start())]
     }
-
-    pub(crate) fn triple_quoted(&self) -> bool {
-        let leading_quote = self.leading_quote();
-        leading_quote.ends_with("\"\"\"") || leading_quote.ends_with("'''")
-    }
 }
 
 impl Ranged for Docstring<'_> {

crates/ruff/src/lib.rs

@@ -5,8 +5,6 @@
 //!
 //! [Ruff]: https://github.com/astral-sh/ruff
 
-#[cfg(feature = "clap")]
-pub use rule_selector::clap_completion::RuleSelectorParser;
 pub use rule_selector::RuleSelector;
 pub use rules::pycodestyle::rules::{IOError, SyntaxError};
 

crates/ruff/src/linter.rs

@@ -36,6 +36,9 @@ use crate::settings::{flags, Settings};
 use crate::source_kind::SourceKind;
 use crate::{directives, fs};
 
+const CARGO_PKG_NAME: &str = env!("CARGO_PKG_NAME");
+const CARGO_PKG_REPOSITORY: &str = env!("CARGO_PKG_REPOSITORY");
+
 /// A [`Result`]-like type that returns both data and an error. Used to return
 /// diagnostics even in the face of parse errors, since many diagnostics can be
 /// generated without a full AST.
@@ -540,9 +543,8 @@ fn report_failed_to_converge_error(path: &Path, transformed: &str, diagnostics:
     let codes = collect_rule_codes(diagnostics.iter().map(|diagnostic| diagnostic.kind.rule()));
     if cfg!(debug_assertions) {
         eprintln!(
-            "{}{} Failed to converge after {} iterations in `{}` with rule codes {}:---\n{}\n---",
+            "{}: Failed to converge after {} iterations in `{}` with rule codes {}:---\n{}\n---",
             "debug error".red().bold(),
-            ":".bold(),
             MAX_ITERATIONS,
             fs::relativize_path(path),
             codes,
@@ -551,17 +553,18 @@ fn report_failed_to_converge_error(path: &Path, transformed: &str, diagnostics:
     } else {
         eprintln!(
             r#"
-{}{} Failed to converge after {} iterations.
+{}: Failed to converge after {} iterations.
 
-This indicates a bug in Ruff. If you could open an issue at:
+This indicates a bug in `{}`. If you could open an issue at:
 
-    https://github.com/astral-sh/ruff/issues/new?title=%5BInfinite%20loop%5D
+    {}/issues/new?title=%5BInfinite%20loop%5D
 
 ...quoting the contents of `{}`, the rule codes {}, along with the `pyproject.toml` settings and executed command, we'd be very appreciative!
 "#,
             "error".red().bold(),
-            ":".bold(),
             MAX_ITERATIONS,
+            CARGO_PKG_NAME,
+            CARGO_PKG_REPOSITORY,
             fs::relativize_path(path),
             codes
         );
@@ -578,9 +581,8 @@ fn report_autofix_syntax_error(
     let codes = collect_rule_codes(rules);
     if cfg!(debug_assertions) {
         eprintln!(
-            "{}{} Autofix introduced a syntax error in `{}` with rule codes {}: {}\n---\n{}\n---",
+            "{}: Autofix introduced a syntax error in `{}` with rule codes {}: {}\n---\n{}\n---",
             "error".red().bold(),
-            ":".bold(),
             fs::relativize_path(path),
             codes,
             error,
@@ -589,16 +591,17 @@ fn report_autofix_syntax_error(
     } else {
         eprintln!(
             r#"
-{}{} Autofix introduced a syntax error. Reverting all changes.
+{}: Autofix introduced a syntax error. Reverting all changes.
 
-This indicates a bug in Ruff. If you could open an issue at:
+This indicates a bug in `{}`. If you could open an issue at:
 
-    https://github.com/astral-sh/ruff/issues/new?title=%5BAutofix%20error%5D
+    {}/issues/new?title=%5BAutofix%20error%5D
 
 ...quoting the contents of `{}`, the rule codes {}, along with the `pyproject.toml` settings and executed command, we'd be very appreciative!
 "#,
             "error".red().bold(),
-            ":".bold(),
+            CARGO_PKG_NAME,
+            CARGO_PKG_REPOSITORY,
             fs::relativize_path(path),
             codes,
         );

crates/ruff/src/message/gitlab.rs

@@ -1,5 +1,4 @@
 use std::collections::hash_map::DefaultHasher;
-use std::collections::HashSet;
 use std::hash::{Hash, Hasher};
 use std::io::Write;
 
@@ -7,6 +6,8 @@ use serde::ser::SerializeSeq;
 use serde::{Serialize, Serializer};
 use serde_json::json;
 
+use ruff_source_file::SourceLocation;
+
 use crate::fs::{relativize_path, relativize_path_to};
 use crate::message::{Emitter, EmitterContext, Message};
 use crate::registry::AsRule;
@@ -57,7 +58,6 @@ impl Serialize for SerializedMessages<'_> {
         S: Serializer,
     {
         let mut s = serializer.serialize_seq(Some(self.messages.len()))?;
-        let mut fingerprints = HashSet::<u64>::with_capacity(self.messages.len());
 
         for message in self.messages {
             let start_location = message.compute_start_location();
@@ -82,19 +82,10 @@ impl Serialize for SerializedMessages<'_> {
                 |project_dir| relativize_path_to(message.filename(), project_dir),
             );
 
-            let mut message_fingerprint = fingerprint(message, 0);
-
-            // Make sure that we do not get a fingerprint that is already in use
-            // by adding in the previously generated one.
-            while fingerprints.contains(&message_fingerprint) {
-                message_fingerprint = fingerprint(message, message_fingerprint);
-            }
-            fingerprints.insert(message_fingerprint);
-
             let value = json!({
                 "description": format!("({}) {}", message.kind.rule().noqa_code(), message.kind.body),
                 "severity": "major",
-                "fingerprint": format!("{:x}", message_fingerprint),
+                "fingerprint": fingerprint(message, &start_location, &end_location),
                 "location": {
                     "path": path,
                     "lines": lines
@@ -109,7 +100,11 @@ impl Serialize for SerializedMessages<'_> {
 }
 
 /// Generate a unique fingerprint to identify a violation.
-fn fingerprint(message: &Message, salt: u64) -> u64 {
+fn fingerprint(
+    message: &Message,
+    start_location: &SourceLocation,
+    end_location: &SourceLocation,
+) -> String {
     let Message {
         kind,
         range: _,
@@ -120,11 +115,12 @@ fn fingerprint(message: &Message, salt: u64) -> u64 {
 
     let mut hasher = DefaultHasher::new();
 
-    salt.hash(&mut hasher);
-    kind.name.hash(&mut hasher);
+    kind.rule().hash(&mut hasher);
+    start_location.hash(&mut hasher);
+    end_location.hash(&mut hasher);
     file.name().hash(&mut hasher);
 
-    hasher.finish()
+    format!("{:x}", hasher.finish())
 }
 
 #[cfg(test)]

crates/ruff/src/message/grouped.rs

@@ -4,7 +4,7 @@ use std::num::NonZeroUsize;
 
 use colored::Colorize;
 
-use ruff_notebook::NotebookIndex;
+use ruff_notebook::{Notebook, NotebookIndex};
 use ruff_source_file::OneIndexed;
 
 use crate::fs::relativize_path;
@@ -65,7 +65,7 @@ impl Emitter for GroupedEmitter {
                     writer,
                     "{}",
                     DisplayGroupedMessage {
-                        notebook_index: context.notebook_index(message.filename()),
+                        jupyter_index: context.notebook(message.filename()).map(Notebook::index),
                         message,
                         show_fix_status: self.show_fix_status,
                         show_source: self.show_source,
@@ -92,7 +92,7 @@ struct DisplayGroupedMessage<'a> {
     show_source: bool,
     row_length: NonZeroUsize,
     column_length: NonZeroUsize,
-    notebook_index: Option<&'a NotebookIndex>,
+    jupyter_index: Option<&'a NotebookIndex>,
 }
 
 impl Display for DisplayGroupedMessage<'_> {
@@ -110,7 +110,7 @@ impl Display for DisplayGroupedMessage<'_> {
         )?;
 
         // Check if we're working on a jupyter notebook and translate positions with cell accordingly
-        let (row, col) = if let Some(jupyter_index) = self.notebook_index {
+        let (row, col) = if let Some(jupyter_index) = self.jupyter_index {
             write!(
                 f,
                 "cell {cell}{sep}",
@@ -150,7 +150,7 @@ impl Display for DisplayGroupedMessage<'_> {
                 "{}",
                 MessageCodeFrame {
                     message,
-                    notebook_index: self.notebook_index
+                    jupyter_index: self.jupyter_index
                 }
             )?;
         }

crates/ruff/src/message/mod.rs

@@ -14,7 +14,7 @@ pub use json_lines::JsonLinesEmitter;
 pub use junit::JunitEmitter;
 pub use pylint::PylintEmitter;
 use ruff_diagnostics::{Diagnostic, DiagnosticKind, Fix};
-use ruff_notebook::NotebookIndex;
+use ruff_notebook::Notebook;
 use ruff_source_file::{SourceFile, SourceLocation};
 use ruff_text_size::{Ranged, TextRange, TextSize};
 pub use text::TextEmitter;
@@ -127,21 +127,21 @@ pub trait Emitter {
 
 /// Context passed to [`Emitter`].
 pub struct EmitterContext<'a> {
-    notebook_indexes: &'a FxHashMap<String, NotebookIndex>,
+    notebooks: &'a FxHashMap<String, Notebook>,
 }
 
 impl<'a> EmitterContext<'a> {
-    pub fn new(notebook_indexes: &'a FxHashMap<String, NotebookIndex>) -> Self {
-        Self { notebook_indexes }
+    pub fn new(notebooks: &'a FxHashMap<String, Notebook>) -> Self {
+        Self { notebooks }
     }
 
     /// Tests if the file with `name` is a jupyter notebook.
     pub fn is_notebook(&self, name: &str) -> bool {
-        self.notebook_indexes.contains_key(name)
+        self.notebooks.contains_key(name)
     }
 
-    pub fn notebook_index(&self, name: &str) -> Option<&NotebookIndex> {
-        self.notebook_indexes.get(name)
+    pub fn notebook(&self, name: &str) -> Option<&Notebook> {
+        self.notebooks.get(name)
     }
 }
 
@@ -225,8 +225,8 @@ def fibonacci(n):
         emitter: &mut dyn Emitter,
         messages: &[Message],
     ) -> String {
-        let notebook_indexes = FxHashMap::default();
-        let context = EmitterContext::new(&notebook_indexes);
+        let source_kinds = FxHashMap::default();
+        let context = EmitterContext::new(&source_kinds);
         let mut output: Vec<u8> = Vec::new();
         emitter.emit(&mut output, messages, &context).unwrap();
 

crates/ruff/src/message/snapshots/ruff__message__json__tests__output.snap

@@ -33,7 +33,7 @@ expression: content
     },
     "message": "`os` imported but unused",
     "noqa_row": 1,
-    "url": "https://docs.astral.sh/ruff/rules/unused-import"
+    "url": "https://beta.ruff.rs/docs/rules/unused-import"
   },
   {
     "code": "F841",
@@ -65,7 +65,7 @@ expression: content
     },
     "message": "Local variable `x` is assigned to but never used",
     "noqa_row": 6,
-    "url": "https://docs.astral.sh/ruff/rules/unused-variable"
+    "url": "https://beta.ruff.rs/docs/rules/unused-variable"
   },
   {
     "code": "F821",
@@ -81,6 +81,6 @@ expression: content
     },
     "message": "Undefined name `a`",
     "noqa_row": 1,
-    "url": "https://docs.astral.sh/ruff/rules/undefined-name"
+    "url": "https://beta.ruff.rs/docs/rules/undefined-name"
   }
 ]

crates/ruff/src/message/snapshots/ruff__message__json_lines__tests__output.snap

@@ -2,7 +2,7 @@
 source: crates/ruff/src/message/json_lines.rs
 expression: content
 ---
-{"code":"F401","end_location":{"column":10,"row":1},"filename":"fib.py","fix":{"applicability":"Suggested","edits":[{"content":"","end_location":{"column":1,"row":2},"location":{"column":1,"row":1}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":1},"message":"`os` imported but unused","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
-{"code":"F841","end_location":{"column":6,"row":6},"filename":"fib.py","fix":{"applicability":"Suggested","edits":[{"content":"","end_location":{"column":10,"row":6},"location":{"column":5,"row":6}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":6},"message":"Local variable `x` is assigned to but never used","noqa_row":6,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
-{"code":"F821","end_location":{"column":5,"row":1},"filename":"undef.py","fix":null,"location":{"column":4,"row":1},"message":"Undefined name `a`","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/undefined-name"}
+{"code":"F401","end_location":{"column":10,"row":1},"filename":"fib.py","fix":{"applicability":"Suggested","edits":[{"content":"","end_location":{"column":1,"row":2},"location":{"column":1,"row":1}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":1},"message":"`os` imported but unused","noqa_row":1,"url":"https://beta.ruff.rs/docs/rules/unused-import"}
+{"code":"F841","end_location":{"column":6,"row":6},"filename":"fib.py","fix":{"applicability":"Suggested","edits":[{"content":"","end_location":{"column":10,"row":6},"location":{"column":5,"row":6}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":6},"message":"Local variable `x` is assigned to but never used","noqa_row":6,"url":"https://beta.ruff.rs/docs/rules/unused-variable"}
+{"code":"F821","end_location":{"column":5,"row":1},"filename":"undef.py","fix":null,"location":{"column":4,"row":1},"message":"Undefined name `a`","noqa_row":1,"url":"https://beta.ruff.rs/docs/rules/undefined-name"}
 

crates/ruff/src/message/text.rs

@@ -7,7 +7,7 @@ use annotate_snippets::snippet::{Annotation, AnnotationType, Slice, Snippet, Sou
 use bitflags::bitflags;
 use colored::Colorize;
 
-use ruff_notebook::NotebookIndex;
+use ruff_notebook::{Notebook, NotebookIndex};
 use ruff_source_file::{OneIndexed, SourceLocation};
 use ruff_text_size::{Ranged, TextRange, TextSize};
 
@@ -71,14 +71,14 @@ impl Emitter for TextEmitter {
             )?;
 
             let start_location = message.compute_start_location();
-            let notebook_index = context.notebook_index(message.filename());
+            let jupyter_index = context.notebook(message.filename()).map(Notebook::index);
 
             // Check if we're working on a jupyter notebook and translate positions with cell accordingly
-            let diagnostic_location = if let Some(notebook_index) = notebook_index {
+            let diagnostic_location = if let Some(jupyter_index) = jupyter_index {
                 write!(
                     writer,
                     "cell {cell}{sep}",
-                    cell = notebook_index
+                    cell = jupyter_index
                         .cell(start_location.row.get())
                         .unwrap_or_default(),
                     sep = ":".cyan(),
@@ -86,7 +86,7 @@ impl Emitter for TextEmitter {
 
                 SourceLocation {
                     row: OneIndexed::new(
-                        notebook_index
+                        jupyter_index
                             .cell_row(start_location.row.get())
                             .unwrap_or(1) as usize,
                     )
@@ -115,7 +115,7 @@ impl Emitter for TextEmitter {
                     "{}",
                     MessageCodeFrame {
                         message,
-                        notebook_index
+                        jupyter_index
                     }
                 )?;
             }
@@ -161,7 +161,7 @@ impl Display for RuleCodeAndBody<'_> {
 
 pub(super) struct MessageCodeFrame<'a> {
     pub(crate) message: &'a Message,
-    pub(crate) notebook_index: Option<&'a NotebookIndex>,
+    pub(crate) jupyter_index: Option<&'a NotebookIndex>,
 }
 
 impl Display for MessageCodeFrame<'_> {
@@ -186,12 +186,14 @@ impl Display for MessageCodeFrame<'_> {
         let content_start_index = source_code.line_index(range.start());
         let mut start_index = content_start_index.saturating_sub(2);
 
-        // If we're working with a Jupyter Notebook, skip the lines which are
+        // If we're working on a jupyter notebook, skip the lines which are
         // outside of the cell containing the diagnostic.
-        if let Some(index) = self.notebook_index {
-            let content_start_cell = index.cell(content_start_index.get()).unwrap_or_default();
+        if let Some(jupyter_index) = self.jupyter_index {
+            let content_start_cell = jupyter_index
+                .cell(content_start_index.get())
+                .unwrap_or_default();
             while start_index < content_start_index {
-                if index.cell(start_index.get()).unwrap_or_default() == content_start_cell {
+                if jupyter_index.cell(start_index.get()).unwrap_or_default() == content_start_cell {
                     break;
                 }
                 start_index = start_index.saturating_add(1);
@@ -211,12 +213,14 @@ impl Display for MessageCodeFrame<'_> {
             .saturating_add(2)
             .min(OneIndexed::from_zero_indexed(source_code.line_count()));
 
-        // If we're working with a Jupyter Notebook, skip the lines which are
+        // If we're working on a jupyter notebook, skip the lines which are
         // outside of the cell containing the diagnostic.
-        if let Some(index) = self.notebook_index {
-            let content_end_cell = index.cell(content_end_index.get()).unwrap_or_default();
+        if let Some(jupyter_index) = self.jupyter_index {
+            let content_end_cell = jupyter_index
+                .cell(content_end_index.get())
+                .unwrap_or_default();
             while end_index > content_end_index {
-                if index.cell(end_index.get()).unwrap_or_default() == content_end_cell {
+                if jupyter_index.cell(end_index.get()).unwrap_or_default() == content_end_cell {
                     break;
                 }
                 end_index = end_index.saturating_sub(1);
@@ -252,10 +256,10 @@ impl Display for MessageCodeFrame<'_> {
             title: None,
             slices: vec![Slice {
                 source: &source.text,
-                line_start: self.notebook_index.map_or_else(
+                line_start: self.jupyter_index.map_or_else(
                     || start_index.get(),
-                    |notebook_index| {
-                        notebook_index
+                    |jupyter_index| {
+                        jupyter_index
                             .cell_row(start_index.get())
                             .unwrap_or_default() as usize
                     },

crates/ruff/src/noqa.rs

@@ -11,7 +11,7 @@ use log::warn;
 use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
 
 use ruff_diagnostics::Diagnostic;
-use ruff_python_trivia::{indentation_at_offset, CommentRanges};
+use ruff_python_trivia::indentation_at_offset;
 use ruff_source_file::{LineEnding, Locator};
 
 use crate::codes::NoqaCode;
@@ -59,7 +59,7 @@ impl<'a> Directive<'a> {
             if text[..comment_start]
                 .chars()
                 .last()
-                .map_or(true, |c| c != '#')
+                .is_some_and(|c| c != '#')
             {
                 continue;
             }
@@ -234,7 +234,7 @@ impl FileExemption {
     /// globally ignored within the file.
     pub(crate) fn try_extract(
         contents: &str,
-        comment_ranges: &CommentRanges,
+        comment_ranges: &[TextRange],
         path: &Path,
         locator: &Locator,
     ) -> Option<Self> {
@@ -457,7 +457,7 @@ pub(crate) fn add_noqa(
     path: &Path,
     diagnostics: &[Diagnostic],
     locator: &Locator,
-    comment_ranges: &CommentRanges,
+    commented_lines: &[TextRange],
     noqa_line_for: &NoqaMapping,
     line_ending: LineEnding,
 ) -> Result<usize> {
@@ -465,7 +465,7 @@ pub(crate) fn add_noqa(
         path,
         diagnostics,
         locator,
-        comment_ranges,
+        commented_lines,
         noqa_line_for,
         line_ending,
     );
@@ -477,7 +477,7 @@ fn add_noqa_inner(
     path: &Path,
     diagnostics: &[Diagnostic],
     locator: &Locator,
-    comment_ranges: &CommentRanges,
+    commented_ranges: &[TextRange],
     noqa_line_for: &NoqaMapping,
     line_ending: LineEnding,
 ) -> (usize, String) {
@@ -487,8 +487,8 @@ fn add_noqa_inner(
 
     // Whether the file is exempted from all checks.
     // Codes that are globally exempted (within the current file).
-    let exemption = FileExemption::try_extract(locator.contents(), comment_ranges, path, locator);
-    let directives = NoqaDirectives::from_commented_ranges(comment_ranges, path, locator);
+    let exemption = FileExemption::try_extract(locator.contents(), commented_ranges, path, locator);
+    let directives = NoqaDirectives::from_commented_ranges(commented_ranges, path, locator);
 
     // Mark any non-ignored diagnostics.
     for diagnostic in diagnostics {
@@ -658,7 +658,7 @@ pub(crate) struct NoqaDirectives<'a> {
 
 impl<'a> NoqaDirectives<'a> {
     pub(crate) fn from_commented_ranges(
-        comment_ranges: &CommentRanges,
+        comment_ranges: &[TextRange],
         path: &Path,
         locator: &'a Locator<'a>,
     ) -> Self {
@@ -800,7 +800,6 @@ mod tests {
     use ruff_text_size::{TextRange, TextSize};
 
     use ruff_diagnostics::Diagnostic;
-    use ruff_python_trivia::CommentRanges;
     use ruff_source_file::{LineEnding, Locator};
 
     use crate::noqa::{add_noqa_inner, Directive, NoqaMapping, ParsedFileExemption};
@@ -998,7 +997,7 @@ mod tests {
             path,
             &[],
             &Locator::new(contents),
-            &CommentRanges::default(),
+            &[],
             &noqa_line_for,
             LineEnding::Lf,
         );
@@ -1018,7 +1017,7 @@ mod tests {
             path,
             &diagnostics,
             &Locator::new(contents),
-            &CommentRanges::default(),
+            &[],
             &noqa_line_for,
             LineEnding::Lf,
         );
@@ -1039,13 +1038,11 @@ mod tests {
         ];
         let contents = "x = 1  # noqa: E741\n";
         let noqa_line_for = NoqaMapping::default();
-        let comment_ranges =
-            CommentRanges::new(vec![TextRange::new(TextSize::from(7), TextSize::from(19))]);
         let (count, output) = add_noqa_inner(
             path,
             &diagnostics,
             &Locator::new(contents),
-            &comment_ranges,
+            &[TextRange::new(TextSize::from(7), TextSize::from(19))],
             &noqa_line_for,
             LineEnding::Lf,
         );
@@ -1066,13 +1063,11 @@ mod tests {
         ];
         let contents = "x = 1  # noqa";
         let noqa_line_for = NoqaMapping::default();
-        let comment_ranges =
-            CommentRanges::new(vec![TextRange::new(TextSize::from(7), TextSize::from(13))]);
         let (count, output) = add_noqa_inner(
             path,
             &diagnostics,
             &Locator::new(contents),
-            &comment_ranges,
+            &[TextRange::new(TextSize::from(7), TextSize::from(13))],
             &noqa_line_for,
             LineEnding::Lf,
         );

crates/ruff/src/registry.rs

@@ -199,9 +199,6 @@ pub enum Linter {
     /// [refurb](https://pypi.org/project/refurb/)
     #[prefix = "FURB"]
     Refurb,
-    /// [flake8-logging](https://pypi.org/project/flake8-logging/)
-    #[prefix = "LOG"]
-    Flake8Logging,
     /// Ruff-specific rules
     #[prefix = "RUF"]
     Ruff,
@@ -251,6 +248,7 @@ impl Rule {
             | Rule::MissingCopyrightNotice
             | Rule::MissingNewlineAtEndOfFile
             | Rule::MixedSpacesAndTabs
+            | Rule::TabIndentation
             | Rule::TrailingWhitespace => LintSource::PhysicalLines,
             Rule::AmbiguousUnicodeCharacterComment
             | Rule::AmbiguousUnicodeCharacterDocstring
@@ -291,7 +289,6 @@ impl Rule {
             | Rule::ShebangNotExecutable
             | Rule::ShebangNotFirstLine
             | Rule::SingleLineImplicitStringConcatenation
-            | Rule::TabIndentation
             | Rule::TrailingCommaOnBareTuple
             | Rule::TypeCommentInStub
             | Rule::UselessSemicolon

crates/ruff/src/rule_selector.rs

@@ -9,14 +9,12 @@ use crate::codes::RuleCodePrefix;
 use crate::codes::RuleIter;
 use crate::registry::{Linter, Rule, RuleNamespace};
 use crate::rule_redirects::get_redirect;
-use crate::settings::types::PreviewMode;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum RuleSelector {
-    /// Select all rules (includes rules in preview if enabled)
+    /// Select all stable rules.
     All,
-    /// Legacy category to select all rules in the "nursery" which predated preview mode
-    #[deprecated(note = "The nursery was replaced with 'preview mode' which has no selector")]
+    /// Select all nursery rules.
     Nursery,
     /// Legacy category to select both the `mccabe` and `flake8-comprehensions` linters
     /// via a single selector.
@@ -31,11 +29,6 @@ pub enum RuleSelector {
         prefix: RuleCodePrefix,
         redirected_from: Option<&'static str>,
     },
-    /// Select an individual rule with a given prefix.
-    Rule {
-        prefix: RuleCodePrefix,
-        redirected_from: Option<&'static str>,
-    },
 }
 
 impl From<Linter> for RuleSelector {
@@ -50,7 +43,6 @@ impl FromStr for RuleSelector {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
             "ALL" => Ok(Self::All),
-            #[allow(deprecated)]
             "NURSERY" => Ok(Self::Nursery),
             "C" => Ok(Self::C),
             "T" => Ok(Self::T),
@@ -67,43 +59,16 @@ impl FromStr for RuleSelector {
                     return Ok(Self::Linter(linter));
                 }
 
-                // Does the selector select a single rule?
-                let prefix = RuleCodePrefix::parse(&linter, code)
-                    .map_err(|_| ParseError::Unknown(s.to_string()))?;
-
-                if is_single_rule_selector(&prefix) {
-                    Ok(Self::Rule {
-                        prefix,
-                        redirected_from,
-                    })
-                } else {
-                    Ok(Self::Prefix {
-                        prefix,
-                        redirected_from,
-                    })
-                }
+                Ok(Self::Prefix {
+                    prefix: RuleCodePrefix::parse(&linter, code)
+                        .map_err(|_| ParseError::Unknown(s.to_string()))?,
+                    redirected_from,
+                })
             }
         }
     }
 }
 
-/// Returns `true` if the [`RuleCodePrefix`] matches a single rule exactly
-/// (e.g., `E225`, as opposed to `E2`).
-pub(crate) fn is_single_rule_selector(prefix: &RuleCodePrefix) -> bool {
-    let mut rules = prefix.rules();
-
-    // The selector must match a single rule.
-    let Some(rule) = rules.next() else {
-        return false;
-    };
-    if rules.next().is_some() {
-        return false;
-    }
-
-    // The rule must match the selector exactly.
-    rule.noqa_code().suffix() == prefix.short_code()
-}
-
 #[derive(Debug, thiserror::Error)]
 pub enum ParseError {
     #[error("Unknown rule selector: `{0}`")]
@@ -116,11 +81,10 @@ impl RuleSelector {
     pub fn prefix_and_code(&self) -> (&'static str, &'static str) {
         match self {
             RuleSelector::All => ("", "ALL"),
-            #[allow(deprecated)]
             RuleSelector::Nursery => ("", "NURSERY"),
             RuleSelector::C => ("", "C"),
             RuleSelector::T => ("", "T"),
-            RuleSelector::Prefix { prefix, .. } | RuleSelector::Rule { prefix, .. } => {
+            RuleSelector::Prefix { prefix, .. } => {
                 (prefix.linter().common_prefix(), prefix.short_code())
             }
             RuleSelector::Linter(l) => (l.common_prefix(), ""),
@@ -171,13 +135,24 @@ impl Visitor<'_> for SelectorVisitor {
     }
 }
 
-impl RuleSelector {
-    /// Return all matching rules, regardless of whether they're in preview.
-    pub fn all_rules(&self) -> impl Iterator<Item = Rule> + '_ {
-        match self {
-            RuleSelector::All => RuleSelectorIter::All(Rule::iter()),
+impl From<RuleCodePrefix> for RuleSelector {
+    fn from(prefix: RuleCodePrefix) -> Self {
+        Self::Prefix {
+            prefix,
+            redirected_from: None,
+        }
+    }
+}
 
-            #[allow(deprecated)]
+impl IntoIterator for &RuleSelector {
+    type IntoIter = RuleSelectorIter;
+    type Item = Rule;
+
+    fn into_iter(self) -> Self::IntoIter {
+        match self {
+            RuleSelector::All => {
+                RuleSelectorIter::All(Rule::iter().filter(|rule| !rule.is_nursery()))
+            }
             RuleSelector::Nursery => {
                 RuleSelectorIter::Nursery(Rule::iter().filter(Rule::is_nursery))
             }
@@ -192,28 +167,13 @@ impl RuleSelector {
                     .chain(Linter::Flake8Print.rules()),
             ),
             RuleSelector::Linter(linter) => RuleSelectorIter::Vec(linter.rules()),
-            RuleSelector::Prefix { prefix, .. } | RuleSelector::Rule { prefix, .. } => {
-                RuleSelectorIter::Vec(prefix.clone().rules())
-            }
+            RuleSelector::Prefix { prefix, .. } => RuleSelectorIter::Vec(prefix.clone().rules()),
         }
     }
-
-    /// Returns rules matching the selector, taking into account whether preview mode is enabled.
-    pub fn rules(&self, preview: PreviewMode) -> impl Iterator<Item = Rule> + '_ {
-        #[allow(deprecated)]
-        self.all_rules().filter(move |rule| {
-            // Always include rules that are not in preview or the nursery
-            !(rule.is_preview() || rule.is_nursery())
-            // Backwards compatibility allows selection of nursery rules by exact code or dedicated group
-            || ((matches!(self, RuleSelector::Rule { .. }) || matches!(self, RuleSelector::Nursery { .. })) && rule.is_nursery())
-            // Enabling preview includes all preview or nursery rules
-            || preview.is_enabled()
-        })
-    }
 }
 
 pub enum RuleSelectorIter {
-    All(RuleIter),
+    All(std::iter::Filter<RuleIter, fn(&Rule) -> bool>),
     Nursery(std::iter::Filter<RuleIter, fn(&Rule) -> bool>),
     Chain(std::iter::Chain<std::vec::IntoIter<Rule>, std::vec::IntoIter<Rule>>),
     Vec(std::vec::IntoIter<Rule>),
@@ -232,6 +192,18 @@ impl Iterator for RuleSelectorIter {
     }
 }
 
+/// A const alternative to the `impl From<RuleCodePrefix> for RuleSelector`
+/// to let us keep the fields of [`RuleSelector`] private.
+// Note that Rust doesn't yet support `impl const From<RuleCodePrefix> for
+// RuleSelector` (see https://github.com/rust-lang/rust/issues/67792).
+// TODO(martin): Remove once RuleSelector is an enum with Linter & Rule variants
+pub(crate) const fn prefix_to_selector(prefix: RuleCodePrefix) -> RuleSelector {
+    RuleSelector::Prefix {
+        prefix,
+        redirected_from: None,
+    }
+}
+
 #[cfg(feature = "schemars")]
 mod schema {
     use itertools::Itertools;
@@ -254,9 +226,8 @@ mod schema {
                 instance_type: Some(InstanceType::String.into()),
                 enum_values: Some(
                     [
-                        // Include the non-standard "ALL" and "NURSERY" selectors.
+                        // Include the non-standard "ALL" selector.
                         "ALL".to_string(),
-                        "NURSERY".to_string(),
                         // Include the legacy "C" and "T" selectors.
                         "C".to_string(),
                         "T".to_string(),
@@ -295,19 +266,18 @@ impl RuleSelector {
     pub fn specificity(&self) -> Specificity {
         match self {
             RuleSelector::All => Specificity::All,
-            #[allow(deprecated)]
             RuleSelector::Nursery => Specificity::All,
             RuleSelector::T => Specificity::LinterGroup,
             RuleSelector::C => Specificity::LinterGroup,
             RuleSelector::Linter(..) => Specificity::Linter,
-            RuleSelector::Rule { .. } => Specificity::Rule,
             RuleSelector::Prefix { prefix, .. } => {
                 let prefix: &'static str = prefix.short_code();
                 match prefix.len() {
-                    1 => Specificity::Prefix1Char,
-                    2 => Specificity::Prefix2Chars,
-                    3 => Specificity::Prefix3Chars,
-                    4 => Specificity::Prefix4Chars,
+                    1 => Specificity::Code1Char,
+                    2 => Specificity::Code2Chars,
+                    3 => Specificity::Code3Chars,
+                    4 => Specificity::Code4Chars,
+                    5 => Specificity::Code5Chars,
                     _ => panic!("RuleSelector::specificity doesn't yet support codes with so many characters"),
                 }
             }
@@ -315,35 +285,26 @@ impl RuleSelector {
     }
 }
 
-#[derive(EnumIter, PartialEq, Eq, PartialOrd, Ord, Copy, Clone, Debug)]
+#[derive(EnumIter, PartialEq, Eq, PartialOrd, Ord, Copy, Clone)]
 pub enum Specificity {
-    /// The specificity when selecting all rules (e.g., `--select ALL`).
     All,
-    /// The specificity when selecting a legacy linter group (e.g., `--select C` or `--select T`).
     LinterGroup,
-    /// The specificity when selecting a linter (e.g., `--select PLE` or `--select UP`).
     Linter,
-    /// The specificity when selecting via a rule prefix with a one-character code (e.g., `--select PLE1`).
-    Prefix1Char,
-    /// The specificity when selecting via a rule prefix with a two-character code (e.g., `--select PLE12`).
-    Prefix2Chars,
-    /// The specificity when selecting via a rule prefix with a three-character code (e.g., `--select PLE123`).
-    Prefix3Chars,
-    /// The specificity when selecting via a rule prefix with a four-character code (e.g., `--select PLE1234`).
-    Prefix4Chars,
-    /// The specificity when selecting an individual rule (e.g., `--select PLE1205`).
-    Rule,
+    Code1Char,
+    Code2Chars,
+    Code3Chars,
+    Code4Chars,
+    Code5Chars,
 }
 
 #[cfg(feature = "clap")]
-pub mod clap_completion {
+mod clap_completion {
     use clap::builder::{PossibleValue, TypedValueParser, ValueParserFactory};
     use strum::IntoEnumIterator;
 
     use crate::{
         codes::RuleCodePrefix,
         registry::{Linter, RuleNamespace},
-        rule_selector::is_single_rule_selector,
         RuleSelector,
     };
 
@@ -363,29 +324,17 @@ pub mod clap_completion {
 
         fn parse_ref(
             &self,
-            cmd: &clap::Command,
-            arg: Option<&clap::Arg>,
+            _cmd: &clap::Command,
+            _arg: Option<&clap::Arg>,
             value: &std::ffi::OsStr,
         ) -> Result<Self::Value, clap::Error> {
             let value = value
                 .to_str()
                 .ok_or_else(|| clap::Error::new(clap::error::ErrorKind::InvalidUtf8))?;
 
-            value.parse().map_err(|_| {
-                let mut error =
-                    clap::Error::new(clap::error::ErrorKind::ValueValidation).with_cmd(cmd);
-                if let Some(arg) = arg {
-                    error.insert(
-                        clap::error::ContextKind::InvalidArg,
-                        clap::error::ContextValue::String(arg.to_string()),
-                    );
-                }
-                error.insert(
-                    clap::error::ContextKind::InvalidValue,
-                    clap::error::ContextValue::String(value.to_string()),
-                );
-                error
-            })
+            value
+                .parse()
+                .map_err(|e| clap::Error::raw(clap::error::ErrorKind::InvalidValue, e))
         }
 
         fn possible_values(&self) -> Option<Box<dyn Iterator<Item = PossibleValue> + '_>> {
@@ -400,34 +349,27 @@ pub mod clap_completion {
                             RuleCodePrefix::iter()
                                 // Filter out rule gated behind `#[cfg(feature = "unreachable-code")]`, which is
                                 // off-by-default
-                                .filter(|prefix| {
-                                    format!(
-                                        "{}{}",
-                                        prefix.linter().common_prefix(),
-                                        prefix.short_code()
-                                    ) != "RUF014"
+                                .filter(|p| {
+                                    format!("{}{}", p.linter().common_prefix(), p.short_code())
+                                        != "RUF014"
                                 })
-                                .filter_map(|prefix| {
-                                    // Ex) `UP`
-                                    if prefix.short_code().is_empty() {
-                                        let code = prefix.linter().common_prefix();
-                                        let name = prefix.linter().name();
-                                        return Some(PossibleValue::new(code).help(name));
-                                    }
+                                .map(|p| {
+                                    let prefix = p.linter().common_prefix();
+                                    let code = p.short_code();
 
-                                    // Ex) `UP004`
-                                    if is_single_rule_selector(&prefix) {
-                                        let rule = prefix.rules().next()?;
-                                        let code = format!(
-                                            "{}{}",
-                                            prefix.linter().common_prefix(),
-                                            prefix.short_code()
-                                        );
-                                        let name: &'static str = rule.into();
-                                        return Some(PossibleValue::new(code).help(name));
-                                    }
+                                    let mut rules_iter = p.rules();
+                                    let rule1 = rules_iter.next();
+                                    let rule2 = rules_iter.next();
 
-                                    None
+                                    let value = PossibleValue::new(format!("{prefix}{code}"));
+
+                                    if rule2.is_none() {
+                                        let rule1 = rule1.unwrap();
+                                        let name: &'static str = rule1.into();
+                                        value.help(name)
+                                    } else {
+                                        value
+                                    }
                                 }),
                         ),
                 ),

crates/ruff/src/rules/flake8_2020/rules/compare.rs

@@ -1,6 +1,8 @@
+use num_bigint::BigInt;
+use ruff_python_ast::{self as ast, CmpOp, Constant, Expr};
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::{self as ast, CmpOp, Constant, Expr};
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
@@ -235,7 +237,7 @@ pub(crate) fn compare(checker: &mut Checker, left: &Expr, ops: &[CmpOp], compara
                 ..
             }) = slice.as_ref()
             {
-                if *i == 0 {
+                if *i == BigInt::from(0) {
                     if let (
                         [CmpOp::Eq | CmpOp::NotEq],
                         [Expr::Constant(ast::ExprConstant {
@@ -244,13 +246,13 @@ pub(crate) fn compare(checker: &mut Checker, left: &Expr, ops: &[CmpOp], compara
                         })],
                     ) = (ops, comparators)
                     {
-                        if *n == 3 && checker.enabled(Rule::SysVersionInfo0Eq3) {
+                        if *n == BigInt::from(3) && checker.enabled(Rule::SysVersionInfo0Eq3) {
                             checker
                                 .diagnostics
                                 .push(Diagnostic::new(SysVersionInfo0Eq3, left.range()));
                         }
                     }
-                } else if *i == 1 {
+                } else if *i == BigInt::from(1) {
                     if let (
                         [CmpOp::Lt | CmpOp::LtE | CmpOp::Gt | CmpOp::GtE],
                         [Expr::Constant(ast::ExprConstant {

crates/ruff/src/rules/flake8_2020/rules/subscript.rs

@@ -1,3 +1,4 @@
+use num_bigint::BigInt;
 use ruff_python_ast::{self as ast, Constant, Expr};
 
 use ruff_diagnostics::{Diagnostic, Violation};
@@ -183,11 +184,11 @@ pub(crate) fn subscript(checker: &mut Checker, value: &Expr, slice: &Expr) {
                     ..
                 }) = upper.as_ref()
                 {
-                    if *i == 1 && checker.enabled(Rule::SysVersionSlice1) {
+                    if *i == BigInt::from(1) && checker.enabled(Rule::SysVersionSlice1) {
                         checker
                             .diagnostics
                             .push(Diagnostic::new(SysVersionSlice1, value.range()));
-                    } else if *i == 3 && checker.enabled(Rule::SysVersionSlice3) {
+                    } else if *i == BigInt::from(3) && checker.enabled(Rule::SysVersionSlice3) {
                         checker
                             .diagnostics
                             .push(Diagnostic::new(SysVersionSlice3, value.range()));
@@ -199,11 +200,11 @@ pub(crate) fn subscript(checker: &mut Checker, value: &Expr, slice: &Expr) {
                 value: Constant::Int(i),
                 ..
             }) => {
-                if *i == 2 && checker.enabled(Rule::SysVersion2) {
+                if *i == BigInt::from(2) && checker.enabled(Rule::SysVersion2) {
                     checker
                         .diagnostics
                         .push(Diagnostic::new(SysVersion2, value.range()));
-                } else if *i == 0 && checker.enabled(Rule::SysVersion0) {
+                } else if *i == BigInt::from(0) && checker.enabled(Rule::SysVersion0) {
                     checker
                         .diagnostics
                         .push(Diagnostic::new(SysVersion0, value.range()));

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

@@ -454,6 +454,7 @@ fn check_dynamically_typed<F>(
     if let Expr::Constant(ast::ExprConstant {
         range,
         value: Constant::Str(string),
+        ..
     }) = annotation
     {
         // Quoted annotations

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

@@ -19,7 +19,6 @@ mod tests {
     #[test_case(Rule::BadFilePermissions, Path::new("S103.py"))]
     #[test_case(Rule::CallWithShellEqualsTrue, Path::new("S604.py"))]
     #[test_case(Rule::ExecBuiltin, Path::new("S102.py"))]
-    #[test_case(Rule::FlaskDebugTrue, Path::new("S201.py"))]
     #[test_case(Rule::HardcodedBindAllInterfaces, Path::new("S104.py"))]
     #[test_case(Rule::HardcodedPasswordDefault, Path::new("S107.py"))]
     #[test_case(Rule::HardcodedPasswordFuncArg, Path::new("S106.py"))]

crates/ruff/src/rules/flake8_bandit/rules/bad_file_permissions.rs

@@ -1,4 +1,4 @@
-use malachite::Integer;
+use num_traits::ToPrimitive;
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -36,7 +36,7 @@ use crate::checkers::ast::Checker;
 /// - [Common Weakness Enumeration: CWE-732](https://cwe.mitre.org/data/definitions/732.html)
 #[violation]
 pub struct BadFilePermissions {
-    mask: Integer,
+    mask: u16,
 }
 
 impl Violation for BadFilePermissions {
@@ -56,9 +56,7 @@ pub(crate) fn bad_file_permissions(checker: &mut Checker, call: &ast::ExprCall)
     {
         if let Some(mode_arg) = call.arguments.find_argument("mode", 1) {
             if let Some(int_value) = int_value(mode_arg, checker.semantic()) {
-                if (int_value.clone() & Integer::from(WRITE_WORLD) > 0)
-                    || (int_value.clone() & Integer::from(EXECUTE_GROUP) > 0)
-                {
+                if (int_value & WRITE_WORLD > 0) || (int_value & EXECUTE_GROUP > 0) {
                     checker.diagnostics.push(Diagnostic::new(
                         BadFilePermissions { mask: int_value },
                         mode_arg.range(),
@@ -115,17 +113,13 @@ fn py_stat(call_path: &CallPath) -> Option<u16> {
     }
 }
 
-fn int_value(expr: &Expr, semantic: &SemanticModel) -> Option<Integer> {
+fn int_value(expr: &Expr, semantic: &SemanticModel) -> Option<u16> {
     match expr {
         Expr::Constant(ast::ExprConstant {
             value: Constant::Int(value),
             ..
-        }) => Some(value.clone()),
-        Expr::Attribute(_) => semantic
-            .resolve_call_path(expr)
-            .as_ref()
-            .and_then(py_stat)
-            .map(Integer::from),
+        }) => value.to_u16(),
+        Expr::Attribute(_) => semantic.resolve_call_path(expr).as_ref().and_then(py_stat),
         Expr::BinOp(ast::ExprBinOp {
             left,
             op,

crates/ruff/src/rules/flake8_bandit/rules/flask_debug_true.rs

@@ -1,89 +0,0 @@
-use ruff_diagnostics::{Diagnostic, Violation};
-use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::is_const_true;
-use ruff_python_ast::{Expr, ExprAttribute, ExprCall, Stmt, StmtAssign};
-use ruff_text_size::Ranged;
-
-use crate::checkers::ast::Checker;
-
-/// ## What it does
-/// Checks for uses of `debug=True` in Flask.
-///
-/// ## Why is this bad?
-/// Enabling debug mode shows an interactive debugger in the browser if an
-/// error occurs, and allows running arbitrary Python code from the browser.
-/// This could leak sensitive information, or allow an attacker to run
-/// arbitrary code.
-///
-/// ## Example
-/// ```python
-/// import flask
-///
-/// app = Flask()
-///
-/// app.run(debug=True)
-/// ```
-///
-/// Use instead:
-/// ```python
-/// import flask
-///
-/// app = Flask()
-///
-/// app.run(debug=os.environ["ENV"] == "dev")
-/// ```
-///
-/// ## References
-/// - [Flask documentation: Debug Mode](https://flask.palletsprojects.com/en/latest/quickstart/#debug-mode)
-#[violation]
-pub struct FlaskDebugTrue;
-
-impl Violation for FlaskDebugTrue {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Use of `debug=True` in Flask app detected")
-    }
-}
-
-/// S201
-pub(crate) fn flask_debug_true(checker: &mut Checker, call: &ExprCall) {
-    let Expr::Attribute(ExprAttribute { attr, value, .. }) = call.func.as_ref() else {
-        return;
-    };
-
-    if attr.as_str() != "run" {
-        return;
-    }
-
-    let Some(debug_argument) = call.arguments.find_keyword("debug") else {
-        return;
-    };
-
-    if !is_const_true(&debug_argument.value) {
-        return;
-    }
-
-    let Expr::Name(name) = value.as_ref() else {
-        return;
-    };
-
-    if let Some(binding_id) = checker.semantic().resolve_name(name) {
-        if let Some(Stmt::Assign(StmtAssign { value, .. })) = checker
-            .semantic()
-            .binding(binding_id)
-            .statement(checker.semantic())
-        {
-            if let Expr::Call(ExprCall { func, .. }) = value.as_ref() {
-                if checker
-                    .semantic()
-                    .resolve_call_path(func)
-                    .is_some_and(|call_path| matches!(call_path.as_slice(), ["flask", "Flask"]))
-                {
-                    checker
-                        .diagnostics
-                        .push(Diagnostic::new(FlaskDebugTrue, debug_argument.range()));
-                }
-            }
-        }
-    };
-}

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

@@ -1,7 +1,6 @@
 pub(crate) use assert_used::*;
 pub(crate) use bad_file_permissions::*;
 pub(crate) use exec_used::*;
-pub(crate) use flask_debug_true::*;
 pub(crate) use hardcoded_bind_all_interfaces::*;
 pub(crate) use hardcoded_password_default::*;
 pub(crate) use hardcoded_password_func_arg::*;
@@ -25,7 +24,6 @@ pub(crate) use unsafe_yaml_load::*;
 mod assert_used;
 mod bad_file_permissions;
 mod exec_used;
-mod flask_debug_true;
 mod hardcoded_bind_all_interfaces;
 mod hardcoded_password_default;
 mod hardcoded_password_func_arg;

crates/ruff/src/rules/flake8_bandit/rules/shell_injection.rs

@@ -148,7 +148,7 @@ impl Violation for StartProcessWithNoShell {
 ///
 /// ## References
 /// - [Python documentation: `subprocess.Popen()`](https://docs.python.org/3/library/subprocess.html#subprocess.Popen)
-/// - [Common Weakness Enumeration: CWE-426](https://cwe.mitre.org/data/definitions/426.html)
+/// - [Common Weakness Enumeration: CWE-78](https://cwe.mitre.org/data/definitions/78.html)
 #[violation]
 pub struct StartProcessWithPartialPath;
 

crates/ruff/src/rules/flake8_bandit/rules/snmp_insecure_version.rs

@@ -1,3 +1,5 @@
+use num_traits::{One, Zero};
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::{self as ast, Constant, Expr};
@@ -55,7 +57,7 @@ pub(crate) fn snmp_insecure_version(checker: &mut Checker, call: &ast::ExprCall)
                 ..
             }) = &keyword.value
             {
-                if *value == 0 || *value == 1 {
+                if value.is_zero() || value.is_one() {
                     checker
                         .diagnostics
                         .push(Diagnostic::new(SnmpInsecureVersion, keyword.range()));

crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S201_S201.py.snap

@@ -1,13 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_bandit/mod.rs
----
-S201.py:10:9: S201 Use of `debug=True` in Flask app detected
-   |
- 9 | # OK
-10 | app.run(debug=True)
-   |         ^^^^^^^^^^ S201
-11 | 
-12 | # Errors
-   |
-
-

crates/ruff/src/rules/flake8_bugbear/mod.rs

@@ -33,10 +33,6 @@ mod tests {
     #[test_case(Rule::JumpStatementInFinally, Path::new("B012.py"))]
     #[test_case(Rule::LoopVariableOverridesIterator, Path::new("B020.py"))]
     #[test_case(Rule::MutableArgumentDefault, Path::new("B006_B008.py"))]
-    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_1.py"))]
-    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_2.py"))]
-    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_3.py"))]
-    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_4.py"))]
     #[test_case(Rule::NoExplicitStacklevel, Path::new("B028.py"))]
     #[test_case(Rule::RaiseLiteral, Path::new("B016.py"))]
     #[test_case(Rule::RaiseWithoutFromInsideExcept, Path::new("B904.py"))]

crates/ruff/src/rules/flake8_bugbear/rules/getattr_with_constant.rs

@@ -1,4 +1,3 @@
-use crate::autofix::edits::pad;
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::{self as ast, Constant, Expr};
@@ -81,21 +80,17 @@ pub(crate) fn getattr_with_constant(
     let mut diagnostic = Diagnostic::new(GetAttrWithConstant, expr.range());
     if checker.patch(diagnostic.kind.rule()) {
         diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
-            pad(
-                if matches!(
-                    obj,
-                    Expr::Name(_) | Expr::Attribute(_) | Expr::Subscript(_) | Expr::Call(_)
-                ) {
-                    format!("{}.{}", checker.locator().slice(obj), value)
-                } else {
-                    // Defensively parenthesize any other expressions. For example, attribute accesses
-                    // on `int` literals must be parenthesized, e.g., `getattr(1, "real")` becomes
-                    // `(1).real`. The same is true for named expressions and others.
-                    format!("({}).{}", checker.locator().slice(obj), value)
-                },
-                expr.range(),
-                checker.locator(),
-            ),
+            if matches!(
+                obj,
+                Expr::Name(_) | Expr::Attribute(_) | Expr::Subscript(_) | Expr::Call(_)
+            ) {
+                format!("{}.{}", checker.locator().slice(obj), value)
+            } else {
+                // Defensively parenthesize any other expressions. For example, attribute accesses
+                // on `int` literals must be parenthesized, e.g., `getattr(1, "real")` becomes
+                // `(1).real`. The same is true for named expressions and others.
+                format!("({}).{}", checker.locator().slice(obj), value)
+            },
             expr.range(),
         )));
     }

crates/ruff/src/rules/flake8_bugbear/rules/mutable_argument_default.rs

@@ -70,7 +70,6 @@ impl Violation for MutableArgumentDefault {
     fn message(&self) -> String {
         format!("Do not use mutable data structures for argument defaults")
     }
-
     fn autofix_title(&self) -> Option<String> {
         Some(format!("Replace with `None`; initialize within function"))
     }
@@ -176,7 +175,7 @@ fn move_initialization(
                 return None;
             }
             Edit::insertion(content, locator.line_start(statement.start()))
-        } else if locator.full_line_end(statement.end()) == locator.text_len() {
+        } else if statement.end() == locator.text_len() {
             // If the statement is at the end of the file, without a trailing newline, insert
             // _after_ it with an extra newline.
             Edit::insertion(