Isolate some bugs in the autofixer

.gitattributes

@@ -1,6 +0,0 @@
-* text=auto eol=lf
-
-crates/ruff/resources/test/fixtures/isort/line_ending_crlf.py text eol=crlf
-crates/ruff/resources/test/fixtures/pycodestyle/W605_1.py text eol=crlf
-
-ruff.schema.json linguist-generated=true text=auto eol=lf

.github/workflows/ci.yaml

@@ -29,7 +29,7 @@ jobs:
       - run: ./target/debug/ruff_dev generate-all
       - run: git diff --quiet README.md || echo "::error file=README.md::This file is outdated. Run 'cargo dev generate-all'."
       - run: git diff --quiet ruff.schema.json || echo "::error file=ruff.schema.json::This file is outdated. Run 'cargo dev generate-all'."
-      - run: git diff --exit-code -- README.md ruff.schema.json docs
+      - run: git diff --exit-code -- README.md ruff.schema.json
 
   cargo-fmt:
     name: "cargo fmt"
@@ -40,20 +40,9 @@ jobs:
         run: rustup component add rustfmt
       - run: cargo fmt --all --check
 
-  cargo-clippy:
+  cargo_clippy:
     name: "cargo clippy"
     runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: "Install Rust toolchain"
-        run: |
-          rustup component add clippy
-      - uses: Swatinem/rust-cache@v1
-      - run: cargo clippy --workspace --all-targets --all-features -- -D warnings
-
-  cargo-clippy-wasm:
-    name: "cargo clippy (wasm)"
-    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
@@ -61,6 +50,7 @@ jobs:
           rustup component add clippy
           rustup target add wasm32-unknown-unknown
       - uses: Swatinem/rust-cache@v1
+      - run: cargo clippy --workspace --all-targets --all-features -- -D warnings
       - run: cargo clippy -p ruff --target wasm32-unknown-unknown --all-features -- -D warnings
 
   cargo-test:

.github/workflows/docs.yaml

@@ -13,12 +13,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - uses: Swatinem/rust-cache@v1
       - name: "Install dependencies"
         run: |
-          pip install -r docs/requirements.txt
+          pip install "mkdocs~=1.4.2" "mkdocs-material~=9.0.6"
       - name: "Copy README File"
         run: |
           python scripts/transform_readme.py --target mkdocs

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

@@ -27,7 +27,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Build wheels - x86_64"
-        uses: PyO3/maturin-action@v1
+        uses: messense/maturin-action@v1
         with:
           target: x86_64
           args: --release --out dist --sdist -m ./${{ env.CRATE_NAME }}/Cargo.toml
@@ -50,7 +50,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Build wheels - universal2"
-        uses: PyO3/maturin-action@v1
+        uses: messense/maturin-action@v1
         with:
           args: --release --universal2 --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
       - name: "Install built wheel - universal2"
@@ -76,7 +76,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
+        uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
@@ -102,7 +102,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
       - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
+        uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: auto
@@ -128,7 +128,7 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
+        uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: auto
@@ -166,7 +166,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
       - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
+        uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
@@ -201,7 +201,7 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
+        uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
           manylinux: musllinux_1_2
@@ -222,6 +222,40 @@ jobs:
           name: wheels
           path: dist
 
+  pypy:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        target: [x86_64, aarch64]
+        python-version:
+          - "3.7"
+          - "3.8"
+          - "3.9"
+        exclude:
+          - os: macos-latest
+            target: aarch64
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: pypy${{ matrix.python-version }}
+      - name: "Build wheels"
+        uses: messense/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          manylinux: auto
+          args: --release --out dist -i pypy${{ matrix.python-version }} -m ./${{ env.CRATE_NAME }}/Cargo.toml
+      - name: "Install built wheel"
+        if: matrix.target == 'x86_64'
+        run: |
+          pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
+      - name: "Upload wheels"
+        uses: actions/upload-artifact@v3
+        with:
+          name: wheels
+          path: dist
+
   release:
     name: Release
     runs-on: ubuntu-latest
@@ -233,6 +267,7 @@ jobs:
       - linux-cross
       - musllinux
       - musllinux-cross
+      - pypy
     steps:
       - uses: actions/download-artifact@v3
         with:

.github/workflows/ruff.yaml

@@ -29,7 +29,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels - x86_64"
-        uses: PyO3/maturin-action@v1
+        uses: messense/maturin-action@v1
         with:
           target: x86_64
           args: --release --out dist --sdist
@@ -41,19 +41,6 @@ jobs:
         with:
           name: wheels
           path: dist
-      - name: "Archive binary"
-        run: |
-            ARCHIVE_FILE=ruff-x86_64-apple-darwin.tar.gz
-            tar czvf $ARCHIVE_FILE -C target/x86_64-apple-darwin/release ruff
-            shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
-      - name: "Upload binary"
-        uses: actions/upload-artifact@v3
-        with:
-          name: binaries
-          path: |
-            *.tar.gz
-            *.sha256
-
   macos-universal:
     runs-on: macos-latest
     steps:
@@ -65,7 +52,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels - universal2"
-        uses: PyO3/maturin-action@v1
+        uses: messense/maturin-action@v1
         with:
           args: --release --universal2 --out dist
       - name: "Install built wheel - universal2"
@@ -76,45 +63,26 @@ jobs:
         with:
           name: wheels
           path: dist
-      - name: "Archive binary"
-        run: |
-            ARCHIVE_FILE=ruff-aarch64-apple-darwin.tar.gz
-            tar czvf $ARCHIVE_FILE -C target/aarch64-apple-darwin/release ruff
-            shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
-      - name: "Upload binary"
-        uses: actions/upload-artifact@v3
-        with:
-          name: binaries
-          path: |
-            *.tar.gz
-            *.sha256
 
   windows:
     runs-on: windows-latest
     strategy:
       matrix:
-        platform:
-          - target: x86_64-pc-windows-msvc
-            arch: x64
-          - target: i686-pc-windows-msvc
-            arch: x86
-          - target: aarch64-pc-windows-msvc
-            arch: x64
+        target: [x64, x86]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-          architecture: ${{ matrix.platform.arch }}
+          architecture: ${{ matrix.target }}
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
+        uses: messense/maturin-action@v1
         with:
-          target: ${{ matrix.platform.target }}
+          target: ${{ matrix.target }}
           args: --release --out dist
       - name: "Install built wheel"
-        if: ${{ !startsWith(matrix.platform.target, 'aarch64') }}
         shell: bash
         run: |
           python -m pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
@@ -123,27 +91,12 @@ jobs:
         with:
           name: wheels
           path: dist
-      - name: "Archive binary"
-        shell: bash
-        run: |
-            ARCHIVE_FILE=ruff-${{ matrix.platform.target }}.zip
-            7z a $ARCHIVE_FILE ./target/${{ matrix.platform.target }}/release/ruff.exe
-            sha256sum $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
-      - name: "Upload binary"
-        uses: actions/upload-artifact@v3
-        with:
-          name: binaries
-          path: |
-            *.zip
-            *.sha256
 
   linux:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target:
-          - x86_64-unknown-linux-gnu
-          - i686-unknown-linux-gnu
+        target: [x86_64, i686]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -153,13 +106,13 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
+        uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist
       - name: "Install built wheel"
-        if: ${{ startsWith(matrix.target, 'x86_64') }}
+        if: matrix.target == 'x86_64'
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
       - name: "Upload wheels"
@@ -167,34 +120,12 @@ jobs:
         with:
           name: wheels
           path: dist
-      - name: "Archive binary"
-        run: |
-            ARCHIVE_FILE=ruff-${{ matrix.target }}.tar.gz
-            tar czvf $ARCHIVE_FILE -C target/${{ matrix.target }}/release ruff
-            shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
-      - name: "Upload binary"
-        uses: actions/upload-artifact@v3
-        with:
-          name: binaries
-          path: |
-            *.tar.gz
-            *.sha256
 
   linux-cross:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        platform:
-          - target: aarch64-unknown-linux-gnu
-            arch: aarch64
-          - target: armv7-unknown-linux-gnueabihf
-            arch: armv7
-          - target: s390x-unknown-linux-gnu
-            arch: s390x
-          - target: powerpc64le-unknown-linux-gnu
-            arch: ppc64le
-          - target: powerpc64-unknown-linux-gnu
-            arch: ppc64
+        target: [aarch64, armv7, s390x, ppc64le, ppc64]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -203,16 +134,16 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
+        uses: messense/maturin-action@v1
         with:
-          target: ${{ matrix.platform.target }}
+          target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist
       - uses: uraimo/run-on-arch-action@v2.5.0
-        if: matrix.platform.arch != 'ppc64'
+        if: matrix.target != 'ppc64'
         name: Install built wheel
         with:
-          arch: ${{ matrix.platform.arch }}
+          arch: ${{ matrix.target }}
           distro: ubuntu20.04
           githubToken: ${{ github.token }}
           install: |
@@ -226,18 +157,6 @@ jobs:
         with:
           name: wheels
           path: dist
-      - name: "Archive binary"
-        run: |
-            ARCHIVE_FILE=ruff-${{ matrix.platform.target }}.tar.gz
-            tar czvf $ARCHIVE_FILE -C target/${{ matrix.platform.target }}/release ruff
-            shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
-      - name: "Upload binary"
-        uses: actions/upload-artifact@v3
-        with:
-          name: binaries
-          path: |
-            *.tar.gz
-            *.sha256
 
   musllinux:
     runs-on: ubuntu-latest
@@ -255,7 +174,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
+        uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
@@ -274,18 +193,6 @@ jobs:
         with:
           name: wheels
           path: dist
-      - name: "Archive binary"
-        run: |
-            ARCHIVE_FILE=ruff-${{ matrix.target }}.tar.gz
-            tar czvf $ARCHIVE_FILE -C target/${{ matrix.target }}/release ruff
-            shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
-      - name: "Upload binary"
-        uses: actions/upload-artifact@v3
-        with:
-          name: binaries
-          path: |
-            *.tar.gz
-            *.sha256
 
   musllinux-cross:
     runs-on: ubuntu-latest
@@ -304,7 +211,7 @@ jobs:
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
+        uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
           manylinux: musllinux_1_2
@@ -324,18 +231,42 @@ jobs:
         with:
           name: wheels
           path: dist
-      - name: "Archive binary"
+
+  pypy:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        target: [x86_64, aarch64]
+        python-version:
+          - "3.7"
+          - "3.8"
+          - "3.9"
+        exclude:
+          - os: macos-latest
+            target: aarch64
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: pypy${{ matrix.python-version }}
+      - name: "Prep README.md"
+        run: python scripts/transform_readme.py --target pypi
+      - name: "Build wheels"
+        uses: messense/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          manylinux: auto
+          args: --release --out dist -i pypy${{ matrix.python-version }}
+      - name: "Install built wheel"
+        if: matrix.target == 'x86_64'
         run: |
-            ARCHIVE_FILE=ruff-${{ matrix.platform.target }}.tar.gz
-            tar czvf $ARCHIVE_FILE -C target/${{ matrix.platform.target }}/release ruff
-            shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
-      - name: "Upload binary"
+          pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v3
         with:
-          name: binaries
-          path: |
-            *.tar.gz
-            *.sha256
+          name: wheels
+          path: dist
 
   release:
     name: Release
@@ -348,6 +279,7 @@ jobs:
       - linux-cross
       - musllinux
       - musllinux-cross
+      - pypy
     if: "startsWith(github.ref, 'refs/tags/')"
     steps:
       - uses: actions/download-artifact@v3
@@ -364,11 +296,3 @@ jobs:
       - name: "Update pre-commit mirror"
         run: |
           curl -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.RUFF_PRE_COMMIT_PAT }}" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/charliermarsh/ruff-pre-commit/dispatches --data '{"event_type": "pypi_release"}'
-      - uses: actions/download-artifact@v3
-        with:
-          name: binaries
-          path: binaries
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: binaries/*

.gitignore

@@ -1,6 +1,9 @@
 # Local cache
 .ruff_cache
 crates/ruff/resources/test/cpython
+docs/*
+!docs/rules
+!docs/assets
 mkdocs.yml
 .overrides
 
@@ -187,7 +190,3 @@ cython_debug/
 
 # Visual Studio Code
 .vscode/
-
-# VIM
-.*.sw?
-.sw?

.pre-commit-config.yaml

@@ -1,18 +1,9 @@
-fail_fast: true
 repos:
   - repo: https://github.com/abravalheri/validate-pyproject
     rev: v0.10.1
     hooks:
       - id: validate-pyproject
 
-  - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.16
-    hooks:
-      - id: mdformat
-        additional_dependencies:
-          - mdformat-black
-          - black==23.1.0 # Must be the latest version of Black
-
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.33.0
     hooks:
@@ -37,15 +28,11 @@ repos:
         pass_filenames: false
       - id: ruff
         name: ruff
-        entry: cargo run -p ruff_cli -- check --no-cache --force-exclude --fix --exit-non-zero-on-fix
+        entry: cargo run -- --no-cache --fix
         language: rust
         types_or: [python, pyi]
         require_serial: true
-        exclude: |
-          (?x)^(
-            crates/ruff/resources/.*|
-            crates/ruff_python_formatter/resources/.*
-          )$
+        exclude: ^crates/ruff/resources
       - id: dev-generate-all
         name: dev-generate-all
         entry: cargo dev generate-all
@@ -53,16 +40,5 @@ repos:
         pass_filenames: false
         exclude: target
 
-  # Black
-  - repo: https://github.com/psf/black
-    rev: 23.1.0
-    hooks:
-      - id: black
-        exclude: |
-          (?x)^(
-            crates/ruff/resources/.*|
-            crates/ruff_python_formatter/resources/.*
-          )$
-
 ci:
   skip: [cargo-fmt, clippy, dev-generate-all]

BREAKING_CHANGES.md

@@ -20,7 +20,8 @@ the intention of adding a stable public API in the future.
 ### `select`, `extend-select`, `ignore`, and `extend-ignore` have new semantics ([#2312](https://github.com/charliermarsh/ruff/pull/2312))
 
 Previously, the interplay between `select` and its related options could lead to unexpected
-behavior. For example, `ruff --select E501 --ignore ALL` and `ruff --select E501 --extend-ignore ALL` behaved differently. (See [#2312](https://github.com/charliermarsh/ruff/pull/2312) for more
+behavior. For example, `ruff --select E501 --ignore ALL` and `ruff --select E501 --extend-ignore
+ALL` behaved differently. (See [#2312](https://github.com/charliermarsh/ruff/pull/2312) for more
 examples.)
 
 When Ruff determines the enabled rule set, it has to reconcile `select` and `ignore` from a variety
@@ -73,7 +74,7 @@ ruff rule E402   --format json      # Works! (And preferred.)
 This change is largely backwards compatible -- most users should experience
 no change in behavior. However, please note the following exceptions:
 
-- Subcommands will now fail when invoked with unsupported arguments, instead
+* Subcommands will now fail when invoked with unsupported arguments, instead
   of silently ignoring them. For example, the following will now fail:
 
   ```console
@@ -82,16 +83,16 @@ no change in behavior. However, please note the following exceptions:
 
   (the `clean` command doesn't support `--respect-gitignore`.)
 
-- The semantics of `ruff <arg>` have changed slightly when `<arg>` is a valid subcommand.
+* The semantics of `ruff <arg>` have changed slightly when `<arg>` is a valid subcommand.
   For example, prior to this release, running `ruff rule` would run `ruff` over a file or
   directory called `rule`. Now, `ruff rule` would invoke the `rule` subcommand. This should
   only impact projects with files or directories named `rule`, `check`, `explain`, `clean`,
   or `generate-shell-completion`.
 
-- Scripts that invoke ruff should supply `--` before any positional arguments.
+* Scripts that invoke ruff should supply `--` before any positional arguments.
   (The semantics of `ruff -- <arg>` have not changed.)
 
-- `--explain` previously treated `--format grouped` as a synonym for `--format text`.
+* `--explain` previously treated `--format grouped` as a synonym for `--format text`.
   This is no longer supported; instead, use `--format text`.
 
 ## 0.0.226

CODE_OF_CONDUCT.md

@@ -1,17 +1,5 @@
 # Contributor Covenant Code of Conduct
 
-- [Our Pledge](#our-pledge)
-- [Our Standards](#our-standards)
-- [Enforcement Responsibilities](#enforcement-responsibilities)
-- [Scope](#scope)
-- [Enforcement](#enforcement)
-- [Enforcement Guidelines](#enforcement-guidelines)
-  - [1. Correction](#1-correction)
-  - [2. Warning](#2-warning)
-  - [3. Temporary Ban](#3-temporary-ban)
-  - [4. Permanent Ban](#4-permanent-ban)
-- [Attribution](#attribution)
-
 ## Our Pledge
 
 We as members, contributors, and leaders pledge to make participation in our
@@ -29,23 +17,23 @@ diverse, inclusive, and healthy community.
 Examples of behavior that contributes to a positive environment for our
 community include:
 
-- Demonstrating empathy and kindness toward other people
-- Being respectful of differing opinions, viewpoints, and experiences
-- Giving and gracefully accepting constructive feedback
-- Accepting responsibility and apologizing to those affected by our mistakes,
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
   and learning from the experience
-- Focusing on what is best not just for us as individuals, but for the
+* Focusing on what is best not just for us as individuals, but for the
   overall community
 
 Examples of unacceptable behavior include:
 
-- The use of sexualized language or imagery, and sexual attention or
+* The use of sexualized language or imagery, and sexual attention or
   advances of any kind
-- Trolling, insulting or derogatory comments, and personal or political attacks
-- Public or private harassment
-- Publishing others' private information, such as a physical or email
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
   address, without their explicit permission
-- Other conduct which could reasonably be considered inappropriate in a
+* Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
 ## Enforcement Responsibilities
@@ -132,7 +120,7 @@ version 2.0, available [here](https://www.contributor-covenant.org/version/2/0/c
 Community Impact Guidelines were inspired by [Mozilla's code of conduct
 enforcement ladder](https://github.com/mozilla/diversity).
 
+[homepage]: https://www.contributor-covenant.org
+
 For answers to common questions about this code of conduct, see the [FAQ](https://www.contributor-covenant.org/faq).
 Translations are available [here](https://www.contributor-covenant.org/translations).
-
-[homepage]: https://www.contributor-covenant.org

CONTRIBUTING.md

@@ -2,18 +2,7 @@
 
 Welcome! We're happy to have you here. Thank you in advance for your contribution to Ruff.
 
-- [The Basics](#the-basics)
-  - [Prerequisites](#prerequisites)
-  - [Development](#development)
-  - [Project Structure](#project-structure)
-  - [Example: Adding a new lint rule](#example-adding-a-new-lint-rule)
-    - [Rule naming convention](#rule-naming-convention)
-  - [Example: Adding a new configuration option](#example-adding-a-new-configuration-option)
-- [MkDocs](#mkdocs)
-- [Release Process](#release-process)
-- [Benchmarks](#benchmarks)
-
-## The Basics
+## The basics
 
 Ruff welcomes contributions in the form of Pull Requests.
 
@@ -29,10 +18,13 @@ If you're looking for a place to start, we recommend implementing a new lint rul
 pattern-match against the examples in the existing codebase. Many lint rules are inspired by
 existing Python plugins, which can be used as a reference implementation.
 
-As a concrete example: consider taking on one of the rules from the [`flake8-pyi`](https://github.com/charliermarsh/ruff/issues/848)
-plugin, and looking to the originating [Python source](https://github.com/PyCQA/flake8-pyi)
+As a concrete example: consider taking on one of the rules from the [`tryceratops`](https://github.com/charliermarsh/ruff/issues/2056)
+plugin, and looking to the originating [Python source](https://github.com/guilatrova/tryceratops)
 for guidance.
 
+Alternatively, we've started work on the [`flake8-pyi`](https://github.com/charliermarsh/ruff/issues/848)
+plugin (see the [Python source](https://github.com/PyCQA/flake8-pyi)) -- another good place to start.
+
 ### Prerequisites
 
 Ruff is written in Rust. You'll need to install the
@@ -49,16 +41,16 @@ cargo install cargo-insta
 After cloning the repository, run Ruff locally with:
 
 ```shell
-cargo run -p ruff_cli -- check /path/to/file.py --no-cache
+cargo run check /path/to/file.py --no-cache
 ```
 
 Prior to opening a pull request, ensure that your code has been auto-formatted,
 and that it passes both the lint and test validation checks:
 
 ```shell
-cargo fmt  # Auto-formatting...
+cargo fmt --all  # Auto-formatting...
 cargo clippy --fix --workspace --all-targets --all-features  # Linting...
-cargo test  # Testing...
+cargo test --all  # Testing...
 ```
 
 These checks will run on GitHub Actions when you open your Pull Request, but running them locally
@@ -81,7 +73,7 @@ pre-commit run --all-files
 Your Pull Request will be reviewed by a maintainer, which may involve a few rounds of iteration
 prior to merging.
 
-### Project Structure
+### Project structure
 
 Ruff is structured as a monorepo with a [flat crate structure](https://matklad.github.io/2021/08/22/large-rust-workspaces.html),
 such that all crates are contained in a flat `crates` directory.
@@ -103,15 +95,15 @@ At time of writing, the repository includes the following crates:
 At a high level, the steps involved in adding a new lint rule are as follows:
 
 1. Determine a name for the new rule as per our [rule naming convention](#rule-naming-convention).
-1. Create a file for your rule (e.g., `crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs`).
-1. In that file, define a violation struct. You can grep for `define_violation!` to see examples.
-1. Map the violation struct to a rule code in `crates/ruff/src/registry.rs` (e.g., `E402`).
-1. Define the logic for triggering the violation in `crates/ruff/src/checkers/ast.rs` (for AST-based
+2. Create a file for your rule (e.g., `crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs`).
+3. In that file, define a violation struct. You can grep for `define_violation!` to see examples.
+4. Map the violation struct to a rule code in `crates/ruff/src/registry.rs` (e.g., `E402`).
+5. Define the logic for triggering the violation in `crates/ruff/src/checkers/ast.rs` (for AST-based
    checks), `crates/ruff/src/checkers/tokens.rs` (for token-based checks), `crates/ruff/src/checkers/lines.rs`
    (for text-based checks), or `crates/ruff/src/checkers/filesystem.rs` (for filesystem-based
    checks).
-1. Add a test fixture.
-1. Update the generated files (documentation and generated code).
+6. Add a test fixture.
+7. Update the generated files (documentation and generated code).
 
 To define the violation, start by creating a dedicated file for your rule under the appropriate
 rule linter (e.g., `crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs`). That file should
@@ -132,10 +124,10 @@ contain a variety of violations and non-violations designed to evaluate and demo
 of your lint rule.
 
 Run `cargo dev generate-all` to generate the code for your new fixture. Then run Ruff
-locally with (e.g.) `cargo run -p ruff_cli -- check crates/ruff/resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402`.
+locally with (e.g.) `cargo run check crates/ruff/resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402`.
 
 Once you're satisfied with the output, codify the behavior as a snapshot test by adding a new
-`test_case` macro in the relevant `crates/ruff/src/[linter]/mod.rs` file. Then, run `cargo test`.
+`test_case` macro in the relevant `crates/ruff/src/[linter]/mod.rs` file. Then, run `cargo test --all`.
 Your test will fail, but you'll be prompted to follow-up with `cargo insta review`. Accept the
 generated snapshot, then commit the snapshot file alongside the rest of your changes.
 
@@ -143,18 +135,15 @@ Finally, regenerate the documentation and generated code with `cargo dev generat
 
 #### Rule naming convention
 
-The rule name should make sense when read as "allow _rule-name_" or "allow _rule-name_ items".
+The rule name should make sense when read as "allow *rule-name*" or "allow *rule-name* items".
 
 This implies that rule names:
 
-- should state the bad thing being checked for
+* should state the bad thing being checked for
 
-- should not contain instructions on what you what you should use instead
+* should not contain instructions on what you what you should use instead
   (these belong in the rule documentation and the `autofix_title` for rules that have autofix)
 
-When re-implementing rules from other linters, this convention is given more importance than
-preserving the original rule name.
-
 ### Example: Adding a new configuration option
 
 Ruff's user-facing settings live in a few different places.
@@ -181,32 +170,7 @@ lives in `crates/ruff/src/flake8_to_ruff/converter.rs`.
 
 Finally, regenerate the documentation and generated code with `cargo dev generate-all`.
 
-## MkDocs
-
-To preview any changes to the documentation locally:
-
-1. Install MkDocs and Material for MkDocs with:
-
-   ```shell
-   pip install -r docs/requirements.txt
-   ```
-
-1. Generate the MkDocs site with:
-
-   ```shell
-   python scripts/generate_mkdocs.py
-   ```
-
-1. Run the development server with:
-
-   ```shell
-   mkdocs serve
-   ```
-
-The documentation should then be available locally at
-[http://127.0.0.1:8000/docs/](http://127.0.0.1:8000/docs/).
-
-## Release Process
+## Release process
 
 As of now, Ruff has an ad hoc release process: releases are cut with high frequency via GitHub
 Actions, which automatically generates the appropriate wheels across architectures and publishes

Cargo.lock

@@ -2,12 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -92,7 +86,7 @@ version = "2.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9834fcc22e0874394a010230586367d4a3e9f11b560f469262678547e1d2575e"
 dependencies = [
- "bstr 1.3.0",
+ "bstr 1.2.0",
  "doc-comment",
  "predicates",
  "predicates-core",
@@ -181,9 +175,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.3.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1"
+checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832"
 dependencies = [
  "memchr",
  "once_cell",
@@ -289,9 +283,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.1.6"
+version = "4.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
+checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
 dependencies = [
  "bitflags",
  "clap_derive",
@@ -304,11 +298,11 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.1.2"
+version = "4.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd125be87bf4c255ebc50de0b7f4d2a6201e8ac3dc86e39c0ad081dc5e7236fe"
+checksum = "3d6540eedc41f8a5a76cf3d8d458057dcdf817be4158a55b5f861f7a5483de75"
 dependencies = [
- "clap 4.1.6",
+ "clap 4.1.4",
 ]
 
 [[package]]
@@ -317,18 +311,18 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4160b4a4f72ef58bd766bad27c09e6ef1cc9d82a22f6a0f55d152985a4a48e31"
 dependencies = [
- "clap 4.1.6",
+ "clap 4.1.4",
  "clap_complete",
  "clap_complete_fig",
 ]
 
 [[package]]
 name = "clap_complete_fig"
-version = "4.1.1"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63a06158a72dbb088f864887b4409fd22600ba379f3cee3040f842234cc5c2d0"
+checksum = "cf0c76d8fcf782a1102ccfcd10ca8246e7fdd609c1cd6deddbb96cb638e9bb5c"
 dependencies = [
- "clap 4.1.6",
+ "clap 4.1.4",
  "clap_complete",
 ]
 
@@ -556,9 +550,9 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.91"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62"
+checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -568,9 +562,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.91"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690"
+checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -583,26 +577,15 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.91"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf"
+checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.91"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -678,12 +661,6 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
-[[package]]
-name = "drop_bomb"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1"
-
 [[package]]
 name = "dyn-clone"
 version = "1.0.10"
@@ -734,9 +711,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "1.9.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
 dependencies = [
  "instant",
 ]
@@ -752,14 +729,14 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.20"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412"
+checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
- "windows-sys 0.45.0",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -770,10 +747,10 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.253"
+version = "0.0.245"
 dependencies = [
  "anyhow",
- "clap 4.1.6",
+ "clap 4.1.4",
  "colored",
  "configparser",
  "once_cell",
@@ -857,7 +834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
 dependencies = [
  "aho-corasick",
- "bstr 1.3.0",
+ "bstr 1.2.0",
  "fnv",
  "log",
  "regex",
@@ -904,9 +881,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "856b5cb0902c2b6d65d5fd97dfa30f9b70c7538e770b98eab5ed52d8db923e01"
 
 [[package]]
 name = "hexf-parse"
@@ -1007,9 +984,9 @@ dependencies = [
 
 [[package]]
 name = "insta"
-version = "1.28.0"
+version = "1.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea5b3894afe466b4bcf0388630fc15e11938a6074af0cd637c825ba2ec8a099"
+checksum = "f6f0f08b46e4379744de2ab67aa8f7de3ffd1da3e275adc41fcc82053ede46ff"
 dependencies = [
  "console",
  "lazy_static",
@@ -1040,31 +1017,27 @@ dependencies = [
  "windows-sys 0.45.0",
 ]
 
-[[package]]
-name = "is-macro"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7d079e129b77477a49c5c4f1cfe9ce6c2c909ef52520693e8e811a714c7b20"
-dependencies = [
- "Inflector",
- "pmutil",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "is-terminal"
-version = "0.4.4"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857"
+checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef"
 dependencies = [
- "hermit-abi 0.3.1",
+ "hermit-abi 0.3.0",
  "io-lifetimes",
  "rustix",
  "windows-sys 0.45.0",
 ]
 
+[[package]]
+name = "is_executable"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -1192,7 +1165,7 @@ checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 [[package]]
 name = "libcst"
 version = "0.1.0"
-source = "git+https://github.com/charliermarsh/LibCST?rev=80e4c1399f95e5beb532fdd1e209ad2dbb470438#80e4c1399f95e5beb532fdd1e209ad2dbb470438"
+source = "git+https://github.com/charliermarsh/LibCST?rev=f2f0b7a487a8725d161fe8b3ed73a6758b21e177#f2f0b7a487a8725d161fe8b3ed73a6758b21e177"
 dependencies = [
  "chic",
  "itertools",
@@ -1207,7 +1180,7 @@ dependencies = [
 [[package]]
 name = "libcst_derive"
 version = "0.1.0"
-source = "git+https://github.com/charliermarsh/LibCST?rev=80e4c1399f95e5beb532fdd1e209ad2dbb470438#80e4c1399f95e5beb532fdd1e209ad2dbb470438"
+source = "git+https://github.com/charliermarsh/LibCST?rev=f2f0b7a487a8725d161fe8b3ed73a6758b21e177#f2f0b7a487a8725d161fe8b3ed73a6758b21e177"
 dependencies = [
  "quote",
  "syn",
@@ -1313,14 +1286,14 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.6"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
 dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -1449,18 +1422,18 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.5.10"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e0072973714303aa6e3631c7e8e777970cf4bdd25dc4932e41031027b8bcc4e"
+checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b"
 dependencies = [
  "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.5.10"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0629cbd6b897944899b1f10496d9c4a7ac5878d45fd61bc22e9e79bfbbc29597"
+checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -1470,9 +1443,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
 
 [[package]]
 name = "oorandom"
@@ -1568,9 +1541,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "pest"
-version = "2.5.5"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660"
+checksum = "4ab62d2fa33726dbe6321cc97ef96d8cde531e3eeaf858a058de53a8a6d40d8f"
 dependencies = [
  "thiserror",
  "ucd-trie",
@@ -1578,9 +1551,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.5.5"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ac3922aac69a40733080f53c1ce7f91dcf57e1a5f6c52f421fadec7fbdc4b69"
+checksum = "8bf026e2d0581559db66d837fe5242320f525d85c76283c61f4d51a1238d65ea"
 dependencies = [
  "pest",
  "pest_generator",
@@ -1588,9 +1561,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.5.5"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d06646e185566b5961b4058dd107e0a7f56e77c3f484549fb119867773c0f202"
+checksum = "2b27bd18aa01d91c8ed2b61ea23406a676b42d82609c6e2581fba42f0c15f17f"
 dependencies = [
  "pest",
  "pest_meta",
@@ -1601,9 +1574,9 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.5.5"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6f60b2ba541577e2a0c307c8f39d1439108120eb7903adeb6497fa880c59616"
+checksum = "9f02b677c1859756359fc9983c2e56a0237f18624a3789528804406b7e915e5d"
 dependencies = [
  "once_cell",
  "pest",
@@ -1612,9 +1585,9 @@ dependencies = [
 
 [[package]]
 name = "petgraph"
-version = "0.6.3"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
+checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143"
 dependencies = [
  "fixedbitset",
  "indexmap",
@@ -1673,12 +1646,6 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
 
-[[package]]
-name = "pin-project-lite"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
-
 [[package]]
 name = "plotters"
 version = "0.3.4"
@@ -1707,17 +1674,6 @@ dependencies = [
  "plotters-backend",
 ]
 
-[[package]]
-name = "pmutil"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -1942,28 +1898,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "result-like"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccc7ce6435c33898517a30e85578cd204cbb696875efb93dec19a2d31294f810"
-dependencies = [
- "result-like-derive",
-]
-
-[[package]]
-name = "result-like-derive"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fabf0a2e54f711c68c50d49f648a1a8a37adcb57353f518ac4df374f0788f42"
-dependencies = [
- "pmutil",
- "proc-macro2",
- "quote",
- "syn",
- "syn-ext",
-]
-
 [[package]]
 name = "ring"
 version = "0.16.20"
@@ -1981,19 +1915,18 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.253"
+version = "0.0.245"
 dependencies = [
  "anyhow",
  "bisection",
  "bitflags",
  "cfg-if",
  "chrono",
- "clap 4.1.6",
+ "clap 4.1.4",
  "colored",
  "console_error_panic_hook",
  "console_log",
  "criterion",
- "derivative",
  "dirs",
  "fern",
  "getrandom",
@@ -2002,7 +1935,7 @@ dependencies = [
  "ignore",
  "imperative",
  "insta",
- "is-macro",
+ "is_executable",
  "itertools",
  "js-sys",
  "libcst",
@@ -2014,10 +1947,8 @@ dependencies = [
  "once_cell",
  "path-absolutize",
  "regex",
- "result-like",
  "ruff_macros",
  "ruff_python",
- "ruff_rustpython",
  "rustc-hash",
  "rustpython-common",
  "rustpython-parser",
@@ -2040,17 +1971,16 @@ dependencies = [
 
 [[package]]
 name = "ruff_cli"
-version = "0.0.253"
+version = "0.0.245"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
  "assert_cmd",
  "atty",
  "bincode",
- "bitflags",
  "cachedir",
  "chrono",
- "clap 4.1.6",
+ "clap 4.1.4",
  "clap_complete_command",
  "clearscreen",
  "colored",
@@ -2069,7 +1999,6 @@ dependencies = [
  "rustc-hash",
  "serde",
  "serde_json",
- "shellexpand",
  "similar",
  "strum",
  "textwrap",
@@ -2080,14 +2009,13 @@ dependencies = [
 
 [[package]]
 name = "ruff_dev"
-version = "0.0.0"
+version = "0.0.245"
 dependencies = [
  "anyhow",
- "clap 4.1.6",
+ "clap 4.1.4",
  "itertools",
  "libcst",
  "once_cell",
- "regex",
  "ruff",
  "ruff_cli",
  "rustpython-common",
@@ -2099,23 +2027,9 @@ dependencies = [
  "textwrap",
 ]
 
-[[package]]
-name = "ruff_formatter"
-version = "0.0.0"
-dependencies = [
- "drop_bomb",
- "insta",
- "ruff_text_size",
- "rustc-hash",
- "schemars",
- "serde",
- "tracing",
- "unicode-width",
-]
-
 [[package]]
 name = "ruff_macros"
-version = "0.0.0"
+version = "0.0.245"
 dependencies = [
  "itertools",
  "proc-macro2",
@@ -2126,66 +2040,13 @@ dependencies = [
 
 [[package]]
 name = "ruff_python"
-version = "0.0.0"
+version = "0.0.245"
 dependencies = [
  "once_cell",
  "regex",
  "rustc-hash",
 ]
 
-[[package]]
-name = "ruff_python_formatter"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "clap 4.1.6",
- "insta",
- "is-macro",
- "itertools",
- "once_cell",
- "ruff_formatter",
- "ruff_python",
- "ruff_rustpython",
- "ruff_testing_macros",
- "ruff_text_size",
- "rustc-hash",
- "rustpython-common",
- "rustpython-parser",
- "similar",
- "test-case",
-]
-
-[[package]]
-name = "ruff_rustpython"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "once_cell",
- "rustpython-common",
- "rustpython-parser",
-]
-
-[[package]]
-name = "ruff_testing_macros"
-version = "0.0.0"
-dependencies = [
- "glob",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "ruff_text_size"
-version = "0.0.0"
-dependencies = [
- "schemars",
- "serde",
- "serde_test",
- "static_assertions",
-]
-
 [[package]]
 name = "rust-stemmers"
 version = "1.2.0"
@@ -2231,7 +2092,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=aa8336ee94492b52458ed8e1517238e5c6c2914c#aa8336ee94492b52458ed8e1517238e5c6c2914c"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d94d0ac72072eb60bd9363e69b96ff1d5eb401b3#d94d0ac72072eb60bd9363e69b96ff1d5eb401b3"
 dependencies = [
  "num-bigint",
  "rustpython-compiler-core",
@@ -2240,7 +2101,7 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=aa8336ee94492b52458ed8e1517238e5c6c2914c#aa8336ee94492b52458ed8e1517238e5c6c2914c"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d94d0ac72072eb60bd9363e69b96ff1d5eb401b3#d94d0ac72072eb60bd9363e69b96ff1d5eb401b3"
 dependencies = [
  "ascii",
  "bitflags",
@@ -2265,7 +2126,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=aa8336ee94492b52458ed8e1517238e5c6c2914c#aa8336ee94492b52458ed8e1517238e5c6c2914c"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d94d0ac72072eb60bd9363e69b96ff1d5eb401b3#d94d0ac72072eb60bd9363e69b96ff1d5eb401b3"
 dependencies = [
  "bincode",
  "bitflags",
@@ -2282,7 +2143,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=aa8336ee94492b52458ed8e1517238e5c6c2914c#aa8336ee94492b52458ed8e1517238e5c6c2914c"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d94d0ac72072eb60bd9363e69b96ff1d5eb401b3#d94d0ac72072eb60bd9363e69b96ff1d5eb401b3"
 dependencies = [
  "ahash",
  "anyhow",
@@ -2427,9 +2288,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.93"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
+checksum = "7434af0dc1cbd59268aa98b4c22c131c0584d2232f6fb166efb993e2832e896a"
 dependencies = [
  "itoa",
  "ryu",
@@ -2445,15 +2306,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_test"
-version = "1.0.152"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3611210d2d67e3513204742004d6ac6f589e521861dabb0f649b070eea8bed9e"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "sha2"
 version = "0.10.6"
@@ -2553,24 +2405,15 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.108"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56e159d99e6c2b93995d171050271edb50ecc5288fbc7cc17de8fdce4e58c14"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
-[[package]]
-name = "syn-ext"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b86cb2b68c5b3c078cac02588bc23f3c04bb828c5d3aedd17980876ec6a7be6"
-dependencies = [
- "syn",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.3.0"
@@ -2679,11 +2522,10 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
 dependencies = [
- "cfg-if",
  "once_cell",
 ]
 
@@ -2797,26 +2639,6 @@ dependencies = [
  "toml_datetime",
 ]
 
-[[package]]
-name = "tracing"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
-dependencies = [
- "cfg-if",
- "pin-project-lite",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
-dependencies = [
- "once_cell",
-]
-
 [[package]]
 name = "twox-hash"
 version = "1.6.3"
@@ -2948,11 +2770,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "unicode_names2"
-version = "0.6.0"
-source = "git+https://github.com/youknowone/unicode_names2.git?tag=v0.6.0+character-alias#4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde"
-dependencies = [
- "phf",
-]
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "029df4cc8238cefc911704ff8fa210853a0f3bce2694d8f51181dd41ee0f3301"
 
 [[package]]
 name = "untrusted"

Cargo.toml

@@ -1,27 +1,11 @@
 [workspace]
 members = ["crates/*"]
-
-[workspace.package]
-edition = "2021"
-rust-version = "1.67.0"
+default-members = ["crates/ruff", "crates/ruff_cli"]
 
 [workspace.dependencies]
-anyhow = { version = "1.0.66" }
-clap = { version = "4.0.1", features = ["derive"] }
-itertools = { version = "0.10.5" }
-is-macro = { version = "0.2.2" }
-libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "80e4c1399f95e5beb532fdd1e209ad2dbb470438" }
-once_cell = { version = "1.16.0" }
-regex = { version = "1.6.0" }
-rustc-hash = { version = "1.1.0" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "aa8336ee94492b52458ed8e1517238e5c6c2914c" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "aa8336ee94492b52458ed8e1517238e5c6c2914c" }
-schemars = { version = "0.8.11" }
-serde = { version = "1.0.147", features = ["derive"] }
-serde_json = { version = "1.0.87" }
-strum = { version = "0.24.1", features = ["strum_macros"] }
-strum_macros = { version = "0.24.3" }
-toml = { version = "0.6.0" }
+libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "d94d0ac72072eb60bd9363e69b96ff1d5eb401b3" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "d94d0ac72072eb60bd9363e69b96ff1d5eb401b3" }
 
 [profile.release]
 panic = "abort"

LICENSE

@@ -1060,57 +1060,3 @@ are:
   """
     Freely Distributable
   """
-
-- flake8-django, licensed under the GPL license.
-
-- rust-analyzer/text-size, licensed under the MIT license:
-  """
-    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.
-  """
-
-- rome/tools, licensed under the MIT license:
-  """
-    MIT License
-
-    Copyright (c) Rome Tools, Inc. and its affiliates.
-
-    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.
-  """

_typos.toml

@@ -1,7 +1,2 @@
 [files]
-extend-exclude = ["snapshots", "black"]
-
-[default.extend-words]
-trivias = "trivias"
-hel = "hel"
-whos = "whos"
+extend-exclude = ["snapshots"]

clippy.toml

@@ -1,7 +0,0 @@
-doc-valid-idents = [
-  "StackOverflow",
-  "CodeQL",
-  "IPython",
-  "NumPy",
-  "..",
-]

crates/flake8_to_ruff/Cargo.toml

@@ -1,20 +1,19 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.253"
-edition = { workspace = true }
-rust-version = { workspace = true }
+version = "0.0.245"
+edition = "2021"
 
 [dependencies]
-anyhow = { workspace = true }
-clap = { workspace = true }
+anyhow = { version = "1.0.66" }
+clap = { version = "4.0.1", features = ["derive"] }
 colored = { version = "2.0.0" }
 configparser = { version = "3.0.2" }
-once_cell = { workspace = true }
-regex = { workspace = true }
+once_cell = { version = "1.16.0" }
+regex = { version = "1.6.0" }
 ruff = { path = "../ruff", default-features = false }
-rustc-hash = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-strum = { workspace = true }
-strum_macros = { workspace = true }
-toml = { workspace = true }
+rustc-hash = { version = "1.1.0" }
+serde = { version = "1.0.147", features = ["derive"] }
+serde_json = { version = "1.0.87" }
+strum = { version = "0.24.1", features = ["strum_macros"] }
+strum_macros = { version = "0.24.3" }
+toml = { version = "0.6.0" }

crates/flake8_to_ruff/README.md

@@ -84,7 +84,7 @@ flake8-to-ruff path/to/.flake8 --plugin flake8-builtins --plugin flake8-quotes
 1. Ruff only supports a subset of the Flake configuration options. `flake8-to-ruff` will warn on and
    ignore unsupported options in the `.flake8` file (or equivalent). (Similarly, Ruff has a few
    configuration options that don't exist in Flake8.)
-1. Ruff will omit any rule codes that are unimplemented or unsupported by Ruff, including rule
+2. Ruff will omit any rule codes that are unimplemented or unsupported by Ruff, including rule
    codes from unsupported plugins. (See the [Ruff README](https://github.com/charliermarsh/ruff#user-content-how-does-ruff-compare-to-flake8)
    for the complete list of supported plugins.)
 

crates/ruff/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "ruff"
-version = "0.0.253"
+version = "0.0.245"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
-edition = { workspace = true }
-rust-version = { workspace = true }
+edition = "2021"
+rust-version = "1.65.0"
 documentation = "https://github.com/charliermarsh/ruff"
 homepage = "https://github.com/charliermarsh/ruff"
 repository = "https://github.com/charliermarsh/ruff"
@@ -16,52 +16,48 @@ crate-type = ["cdylib", "rlib"]
 doctest = false
 
 [dependencies]
-ruff_macros = { path = "../ruff_macros" }
-ruff_python = { path = "../ruff_python" }
-ruff_rustpython = { path = "../ruff_rustpython" }
-
-anyhow = { workspace = true }
+anyhow = { version = "1.0.66" }
 bisection = { version = "0.1.0" }
 bitflags = { version = "1.3.2" }
 cfg-if = { version = "1.0.0" }
 chrono = { version = "0.4.21", default-features = false, features = ["clock"] }
-clap = { workspace = true, features = ["derive", "env", "string"] }
+clap = { version = "4.0.1", features = ["derive", "env"] }
 colored = { version = "2.0.0" }
-derivative = { version = "2.2.0" }
 dirs = { version = "4.0.0" }
 fern = { version = "0.6.1" }
 glob = { version = "0.3.0" }
 globset = { version = "0.4.9" }
 ignore = { version = "0.4.18" }
 imperative = { version = "1.0.3" }
-is-macro = { workspace = true }
-itertools = { workspace = true }
+itertools = { version = "0.10.5" }
 libcst = { workspace = true }
 log = { version = "0.4.17" }
 natord = { version = "1.0.9" }
 nohash-hasher = { version = "0.2.0" }
 num-bigint = { version = "0.4.3" }
 num-traits = "0.2.15"
-once_cell = { workspace = true }
+once_cell = { version = "1.16.0" }
 path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] }
-regex = { workspace = true }
-result-like = "0.4.6"
-rustc-hash = { workspace = true }
+regex = { version = "1.6.0" }
+ruff_macros = { version = "0.0.245", path = "../ruff_macros" }
+ruff_python = { version = "0.0.245", path = "../ruff_python" }
+rustc-hash = { version = "1.1.0" }
 rustpython-common = { workspace = true }
 rustpython-parser = { workspace = true }
-schemars = { workspace = true }
+schemars = { version = "0.8.11" }
 semver = { version = "1.0.16" }
-serde = { workspace = true }
+serde = { version = "1.0.147", features = ["derive"] }
 shellexpand = { version = "3.0.0" }
 smallvec = { version = "1.10.0" }
-strum = { workspace = true }
-strum_macros = { workspace = true }
+strum = { version = "0.24.1", features = ["strum_macros"] }
+strum_macros = { version = "0.24.3" }
 textwrap = { version = "0.16.0" }
 thiserror = { version = "1.0" }
 titlecase = { version = "2.2.1" }
-toml = { workspace = true }
+toml = { version = "0.6.0" }
 
 # https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support
+# For (future) wasm-pack support
 [target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies]
 getrandom = { version = "0.2.7", features = ["js"] }
 console_error_panic_hook = { version = "0.1.7" }
@@ -70,6 +66,9 @@ serde-wasm-bindgen = { version = "0.4" }
 js-sys = { version = "0.3.60" }
 wasm-bindgen = { version = "0.2.83" }
 
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
+is_executable = "1.0.1"
+
 [dev-dependencies]
 insta = { version = "1.19.0", features = ["yaml", "redactions"] }
 test-case = { version = "2.2.2" }

crates/ruff/resources/test/fixtures/flake8_annotations/annotation_presence.py

@@ -103,11 +103,3 @@ class Foo:
     @classmethod
     def foo(cls, a: int, b: int) -> int:
         pass
-
-    # ANN101
-    def foo(self, /, a: int, b: int) -> int:
-        pass
-
-
-# OK
-def f(*args: *tuple[int]) -> None: ...

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

@@ -19,8 +19,6 @@ token = "s3cr3t"
 secrete = "s3cr3t"
 safe = password = "s3cr3t"
 password = safe = "s3cr3t"
-PASSWORD = "s3cr3t"
-PassWord = "s3cr3t"
 
 d["password"] = "s3cr3t"
 d["pass"] = "s3cr3t"
@@ -63,15 +61,3 @@ if token == "3\t4":
 
 if token == "5\r6":
     pass
-
-
-# These should not be flagged
-passed_msg = "You have passed!"
-compassion = "Please don't match!"
-impassable = "You shall not pass!"
-passwords = ""
-PASSWORDS = ""
-passphrases = ""
-PassPhrases = ""
-tokens = ""
-secrets = ""

crates/ruff/resources/test/fixtures/flake8_boolean_trap/FBT.py

@@ -57,12 +57,6 @@ dict.fromkeys(("world",), True)
 {}.deploy(True, False)
 getattr(someobj, attrname, False)
 mylist.index(True)
-int(True)
-str(int(False))
-cfg.get("hello", True)
-cfg.getint("hello", True)
-cfg.getfloat("hello", True)
-cfg.getboolean("hello", True)
 
 
 class Registry:
@@ -72,11 +66,3 @@ class Registry:
     # FBT001: Boolean positional arg in function definition
     def __setitem__(self, switch: Switch, value: bool) -> None:
         self._switches[switch.value] = value
-
-    @foo.setter
-    def foo(self, value: bool) -> None:
-        pass
-
-    # FBT001: Boolean positional arg in function definition
-    def foo(self, value: bool) -> None:
-        pass

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

@@ -17,11 +17,6 @@ s.rstrip(".facebook.com")  # warning
 s.rstrip("e")  # no warning
 s.rstrip("\n\t ")  # no warning
 s.rstrip(r"\n\t ")  # warning
-s.strip("a")  # no warning
-s.strip("あ")  # no warning
-s.strip("ああ")  # warning
-s.strip("\ufeff")  # no warning
-s.strip("\u0074\u0065\u0073\u0074")  # warning
 
 from somewhere import other_type, strip
 

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

@@ -105,25 +105,3 @@ while True:
         pass
     finally:
         break  # warning
-
-
-while True:
-    try:
-        pass
-    finally:
-        match *0, 1, *2:
-            case 0,:
-                y = 0
-            case 0, *x:
-                break  # warning
-
-
-while True:
-    try:
-        pass
-    finally:
-        match *0, 1, *2:
-            case 0,:
-                y = 0
-            case 0, *x:
-                pass  # no warning

crates/ruff/resources/test/fixtures/flake8_bugbear/B027.pyi

@@ -1,101 +0,0 @@
-"""
-Should emit:
-B027 - on lines 13, 16, 19, 23
-"""
-import abc
-from abc import ABC
-from abc import abstractmethod, abstractproperty
-from abc import abstractmethod as notabstract
-from abc import abstractproperty as notabstract_property
-
-
-class AbstractClass(ABC):
-    def empty_1(self):  # error
-        ...
-
-    def empty_2(self):  # error
-        pass
-
-    def empty_3(self):  # error
-        """docstring"""
-        ...
-
-    def empty_4(self):  # error
-        """multiple ellipsis/pass"""
-        ...
-        pass
-        ...
-        pass
-
-    @notabstract
-    def abstract_0(self):
-        ...
-
-    @abstractmethod
-    def abstract_1(self):
-        ...
-
-    @abstractmethod
-    def abstract_2(self):
-        pass
-
-    @abc.abstractmethod
-    def abstract_3(self):
-        ...
-
-    @abc.abstractproperty
-    def abstract_4(self):
-        ...
-
-    @abstractproperty
-    def abstract_5(self):
-        ...
-
-    @notabstract_property
-    def abstract_6(self):
-        ...
-
-    def body_1(self):
-        print("foo")
-        ...
-
-    def body_2(self):
-        self.body_1()
-
-
-class NonAbstractClass:
-    def empty_1(self):  # safe
-        ...
-
-    def empty_2(self):  # safe
-        pass
-
-
-# ignore @overload, fixes issue #304
-# ignore overload with other imports, fixes #308
-import typing
-import typing as t
-import typing as anything
-from typing import Union, overload
-
-
-class AbstractClass(ABC):
-    @overload
-    def empty_1(self, foo: str):
-        ...
-
-    @typing.overload
-    def empty_1(self, foo: int):
-        ...
-
-    @t.overload
-    def empty_1(self, foo: list):
-        ...
-
-    @anything.overload
-    def empty_1(self, foo: float):
-        ...
-
-    @abstractmethod
-    def empty_1(self, foo: Union[str, int, list, float]):
-        ...

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

@@ -1,14 +0,0 @@
-"""
-Should emit:
-B029 - on lines 8 and 13
-"""
-
-try:
-    pass
-except ():
-    pass
-
-try:
-    pass
-except () as e:
-    pass

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

@@ -1,29 +0,0 @@
-"""
-Should emit:
-B032 - on lines 9, 10, 12, 13, 16-19
-"""
-
-# Flag these
-dct = {"a": 1}
-
-dct["b"]: 2
-dct.b: 2
-
-dct["b"]: "test"
-dct.b: "test"
-
-test = "test"
-dct["b"]: test
-dct["b"]: test.lower()
-dct.b: test
-dct.b: test.lower()
-
-# Do not flag below
-typed_dct: dict[str, int] = {"a": 1}
-typed_dct["b"] = 2
-typed_dct.b = 2
-
-
-class TestClass:
-    def test_self(self):
-        self.test: int

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

@@ -1,6 +1,6 @@
 """
 Should emit:
-B904 - on lines 10, 11, 16, 62, and 64
+B904 - on lines 10, 11 and 16
 """
 
 try:
@@ -53,20 +53,3 @@ except ImportError:
                 raise ValueError
             except ValueError:
                 raise
-
-
-try:
-    ...
-except Exception as e:
-    if ...:
-        raise RuntimeError("boom!")
-    else:
-        raise RuntimeError("bang!")
-
-
-try:
-    ...
-except Exception as e:
-    match 0:
-        case 0:
-            raise RuntimeError("boom!")

crates/ruff/resources/test/fixtures/flake8_commas/COM81.py

@@ -626,8 +626,3 @@ result = function(
     bar,
     **{'ham': spam}
 )
-
-# Make sure the COM812 and UP034 rules don't autofix simultaneously and cause a syntax error.
-the_first_one = next(
-    (i for i in range(10) if i // 2 == 0)  # COM812 fix should include the final bracket
-)

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

@@ -2,9 +2,7 @@ x = set(x for x in range(3))
 x = set(
     x for x in range(3)
 )
-y = f'{set(a if a < 6 else 0  for a in range(3))}'
-_ = '{}'.format(set(a if a < 6 else 0  for a in range(3)))
-print(f'Hello {set(a for a in range(3))} World')
+
 
 def set(*args, **kwargs):
     return None

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

@@ -3,5 +3,3 @@ dict(
     (x, x) for x in range(3)
 )
 dict(((x, x) for x in range(3)), z=3)
-y = f'{dict((x, x) for x in range(3))}'
-print(f'Hello {dict((x, x) for x in range(3))} World')

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

@@ -4,9 +4,7 @@ list(sorted(x))
 reversed(sorted(x))
 reversed(sorted(x, key=lambda e: e))
 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))
+
 
 def reversed(*args, **kwargs):
     return None

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

@@ -12,9 +12,3 @@ sorted(list(x))
 sorted(tuple(x))
 sorted(sorted(x))
 sorted(reversed(x))
-tuple(
-    list(
-        [x, 3, "hell"\
-        "o"]
-    )
-)

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

@@ -1,34 +1,6 @@
-# Errors.
 nums = [1, 2, 3]
 map(lambda x: x + 1, nums)
 map(lambda x: str(x), nums)
 list(map(lambda x: x * 2, nums))
 set(map(lambda x: x % 2 == 0, nums))
 dict(map(lambda v: (v, v**2), nums))
-map(lambda: "const", nums)
-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))
-
-# When inside f-string, then the fix should be surrounded by whitespace
-_ = f"{set(map(lambda x: x % 2 == 0, nums))}"
-_ = f"{dict(map(lambda v: (v, v**2), nums))}"
-
-# Error, but unfixable.
-# For simple expressions, this could be: `(x if x else 1 for x in nums)`.
-# For more complex expressions, this would differ: `(x + 2 if x else 3 for x in nums)`.
-map(lambda x=1: x, nums)
-
-# False negatives.
-map(lambda x=2, y=1: x + y, nums, nums)
-set(map(lambda x, y: x, nums, nums))
-
-
-def myfunc(arg1: int, arg2: int = 4):
-    return 2 * arg1 + arg2
-
-
-list(map(myfunc, nums))
-
-[x for x in nums]

crates/ruff/resources/test/fixtures/flake8_django/DJ001.py

@@ -1,48 +0,0 @@
-from django.db.models import Model as DjangoModel
-from django.db import models
-from django.db.models import CharField as SmthCharField
-
-
-class IncorrectModel(models.Model):
-    charfield = models.CharField(max_length=255, null=True)
-    textfield = models.TextField(max_length=255, null=True)
-    slugfield = models.SlugField(max_length=255, null=True)
-    emailfield = models.EmailField(max_length=255, null=True)
-    filepathfield = models.FilePathField(max_length=255, null=True)
-    urlfield = models.URLField(max_length=255, null=True)
-
-
-class IncorrectModelWithAlias(DjangoModel):
-    charfield = DjangoModel.CharField(max_length=255, null=True)
-    textfield = SmthCharField(max_length=255, null=True)
-    slugfield = models.SlugField(max_length=255, null=True)
-    emailfield = models.EmailField(max_length=255, null=True)
-    filepathfield = models.FilePathField(max_length=255, null=True)
-    urlfield = models.URLField(max_length=255, null=True)
-
-
-class IncorrectModelWithoutSuperclass:
-    charfield = DjangoModel.CharField(max_length=255, null=True)
-    textfield = SmthCharField(max_length=255, null=True)
-    slugfield = models.SlugField(max_length=255, null=True)
-    emailfield = models.EmailField(max_length=255, null=True)
-    filepathfield = models.FilePathField(max_length=255, null=True)
-    urlfield = models.URLField(max_length=255, null=True)
-
-
-class CorrectModel(models.Model):
-    charfield = models.CharField(max_length=255, null=False, blank=True)
-    textfield = models.TextField(max_length=255, null=False, blank=True)
-    slugfield = models.SlugField(max_length=255, null=False, blank=True)
-    emailfield = models.EmailField(max_length=255, null=False, blank=True)
-    filepathfield = models.FilePathField(max_length=255, null=False, blank=True)
-    urlfield = models.URLField(max_length=255, null=False, blank=True)
-
-    charfieldu = models.CharField(max_length=255, null=True, blank=True, unique=True)
-    textfieldu = models.TextField(max_length=255, null=True, blank=True, unique=True)
-    slugfieldu = models.SlugField(max_length=255, null=True, blank=True, unique=True)
-    emailfieldu = models.EmailField(max_length=255, null=True, blank=True, unique=True)
-    filepathfieldu = models.FilePathField(
-        max_length=255, null=True, blank=True, unique=True
-    )
-    urlfieldu = models.URLField(max_length=255, null=True, blank=True, unique=True)

crates/ruff/resources/test/fixtures/flake8_django/DJ003.py

@@ -1,21 +0,0 @@
-from django.shortcuts import render
-
-
-def test_view1(request):
-    return render(request, "index.html", locals())
-
-
-def test_view2(request):
-    return render(request, "index.html", context=locals())
-
-
-def test_view3(request):
-    return render(request, "index.html")
-
-
-def test_view4(request):
-    return render(request, "index.html", {})
-
-
-def test_view5(request):
-    return render(request, "index.html", context={})

crates/ruff/resources/test/fixtures/flake8_django/DJ006.py

@@ -1,11 +0,0 @@
-from django import forms
-
-
-class TestModelForm1(forms.ModelForm):
-    class Meta:
-        exclude = ["bar"]
-
-
-class TestModelForm2(forms.ModelForm):
-    class Meta:
-        fields = ["foo"]

crates/ruff/resources/test/fixtures/flake8_django/DJ007.py

@@ -1,16 +0,0 @@
-from django import forms
-
-
-class TestModelForm1(forms.ModelForm):
-    class Meta:
-        fields = "__all__"
-
-
-class TestModelForm2(forms.ModelForm):
-    class Meta:
-        fields = b"__all__"
-
-
-class TestModelForm3(forms.ModelForm):
-    class Meta:
-        fields = ["foo"]

crates/ruff/resources/test/fixtures/flake8_django/DJ008.py

@@ -1,167 +0,0 @@
-from django.db import models
-from django.db.models import Model
-
-
-# Models without __str__
-class TestModel1(models.Model):
-    new_field = models.CharField(max_length=10)
-
-    class Meta:
-        verbose_name = "test model"
-        verbose_name_plural = "test models"
-
-    @property
-    def my_brand_new_property(self):
-        return 1
-
-    def my_beautiful_method(self):
-        return 2
-
-
-class TestModel2(Model):
-    new_field = models.CharField(max_length=10)
-
-    class Meta:
-        verbose_name = "test model"
-        verbose_name_plural = "test models"
-
-    @property
-    def my_brand_new_property(self):
-        return 1
-
-    def my_beautiful_method(self):
-        return 2
-
-
-class TestModel3(Model):
-    new_field = models.CharField(max_length=10)
-
-    class Meta:
-        abstract = False
-
-    @property
-    def my_brand_new_property(self):
-        return 1
-
-    def my_beautiful_method(self):
-        return 2
-
-
-# Models with __str__
-class TestModel4(Model):
-    new_field = models.CharField(max_length=10)
-
-    class Meta:
-        verbose_name = "test model"
-        verbose_name_plural = "test models"
-
-    def __str__(self):
-        return self.new_field
-
-    @property
-    def my_brand_new_property(self):
-        return 1
-
-    def my_beautiful_method(self):
-        return 2
-
-
-class TestModel5(models.Model):
-    new_field = models.CharField(max_length=10)
-
-    class Meta:
-        verbose_name = "test model"
-        verbose_name_plural = "test models"
-
-    def __str__(self):
-        return self.new_field
-
-    @property
-    def my_brand_new_property(self):
-        return 1
-
-    def my_beautiful_method(self):
-        return 2
-
-
-# Abstract models without str
-class AbstractTestModel1(models.Model):
-    new_field = models.CharField(max_length=10)
-
-    class Meta:
-        abstract = True
-
-    @property
-    def my_brand_new_property(self):
-        return 1
-
-    def my_beautiful_method(self):
-        return 2
-
-
-class AbstractTestModel2(Model):
-    new_field = models.CharField(max_length=10)
-
-    class Meta:
-        abstract = True
-
-    @property
-    def my_brand_new_property(self):
-        return 1
-
-    def my_beautiful_method(self):
-        return 2
-
-
-# Abstract models with __str__
-
-
-class AbstractTestModel3(Model):
-    new_field = models.CharField(max_length=10)
-
-    class Meta:
-        abstract = True
-
-    def __str__(self):
-        return self.new_field
-
-    @property
-    def my_brand_new_property(self):
-        return 1
-
-    def my_beautiful_method(self):
-        return 2
-
-
-class AbstractTestModel4(models.Model):
-    new_field = models.CharField(max_length=10)
-
-    class Meta:
-        abstract = True
-
-    def __str__(self):
-        return self.new_field
-
-    @property
-    def my_brand_new_property(self):
-        return 1
-
-    def my_beautiful_method(self):
-        return 2
-
-
-class AbstractTestModel5(models.Model):
-    new_field = models.CharField(max_length=10)
-
-    class Meta:
-        abstract = False
-
-    def __str__(self):
-        return self.new_field
-
-    @property
-    def my_brand_new_property(self):
-        return 1
-
-    def my_beautiful_method(self):
-        return 2

crates/ruff/resources/test/fixtures/flake8_django/DJ013.py

@@ -1,37 +0,0 @@
-from django.db.models.signals import pre_save
-from django.dispatch import receiver
-from myapp.models import MyModel
-
-test_decorator = lambda func: lambda *args, **kwargs: func(*args, **kwargs)
-
-
-@receiver(pre_save, sender=MyModel)
-@test_decorator
-def correct_pre_save_handler():
-    pass
-
-
-@test_decorator
-@receiver(pre_save, sender=MyModel)
-def incorrect_pre_save_handler():
-    pass
-
-
-@receiver(pre_save, sender=MyModel)
-@receiver(pre_save, sender=MyModel)
-@test_decorator
-def correct_multiple():
-    pass
-
-
-@receiver(pre_save, sender=MyModel)
-@receiver(pre_save, sender=MyModel)
-def correct_multiple():
-    pass
-
-
-@receiver(pre_save, sender=MyModel)
-@test_decorator
-@receiver(pre_save, sender=MyModel)
-def incorrect_multiple():
-    pass

crates/ruff/resources/test/fixtures/flake8_pie/PIE802.py

@@ -1,10 +0,0 @@
-# no error
-all((x.id for x in bar))
-all(x.id for x in bar)
-all(x.id for x in bar)
-any(x.id for x in bar)
-any({x.id for x in bar})
-
-# PIE 802
-any([x.id for x in bar])
-all([x.id for x in bar])

crates/ruff/resources/test/fixtures/flake8_pie/PIE807.py

@@ -18,10 +18,3 @@ class Foo:
 
 class FooTable(BaseTable):
     bar = fields.ListField(list)
-
-
-lambda *args, **kwargs: []
-
-lambda *args: []
-
-lambda **kwargs: []

crates/ruff/resources/test/fixtures/flake8_pyi/PYI006.py

@@ -1,14 +0,0 @@
-import sys
-from sys import version_info as python_version
-
-if sys.version_info < (3, 9): ...  # OK
-
-if sys.version_info >= (3, 9): ...  # OK
-
-if sys.version_info == (3, 9): ...  # OK
-
-if sys.version_info <= (3, 10): ...  # OK
-
-if sys.version_info > (3, 10): ...  # OK
-
-if python_version > (3, 10): ...  # OK

crates/ruff/resources/test/fixtures/flake8_pyi/PYI006.pyi

@@ -1,18 +0,0 @@
-import sys
-from sys import version_info as python_version
-
-if sys.version_info < (3, 9): ...  # OK
-
-if sys.version_info >= (3, 9): ...  # OK
-
-if sys.version_info == (3, 9): ...  # OK
-
-if sys.version_info == (3, 9): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
-
-if sys.version_info <= (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
-
-if sys.version_info <= (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
-
-if sys.version_info > (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
-
-if python_version > (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons

crates/ruff/resources/test/fixtures/flake8_pyi/PYI007.py

@@ -1,11 +0,0 @@
-import sys
-
-if sys.platform == "platform_name_1": ...  # OK
-
-if sys.platform != "platform_name_2": ...  # OK
-
-if sys.platform in ["linux"]: ...  # OK
-
-if sys.platform > 3: ...  # OK
-
-if sys.platform == 10.12: ...  # OK

crates/ruff/resources/test/fixtures/flake8_pyi/PYI007.pyi

@@ -1,11 +0,0 @@
-import sys
-
-if sys.platform == "platform_name_1": ...  # OK
-
-if sys.platform != "platform_name_2": ...  # OK
-
-if sys.platform in ["linux"]: ...  # Error: PYI007 Unrecognized sys.platform check
-
-if sys.platform > 3: ...  # Error: PYI007 Unrecognized sys.platform check
-
-if sys.platform == 10.12: ...  # Error: PYI007 Unrecognized sys.platform check

crates/ruff/resources/test/fixtures/flake8_pyi/PYI008.py

@@ -1,11 +0,0 @@
-import sys
-
-if sys.platform == "linus": ...  # OK
-
-if sys.platform != "linux": ...  # OK
-
-if sys.platform == "win32": ...  # OK
-
-if sys.platform != "darwin": ...  # OK
-
-if sys.platform == "cygwin": ...  # OK

crates/ruff/resources/test/fixtures/flake8_pyi/PYI008.pyi

@@ -1,11 +0,0 @@
-import sys
-
-if sys.platform == "linus": ...  # Error: PYI008 Unrecognized platform `linus`
-
-if sys.platform != "linux": ...  # OK
-
-if sys.platform == "win32": ...  # OK
-
-if sys.platform != "darwin": ...  # OK
-
-if sys.platform == "cygwin": ...  # OK

crates/ruff/resources/test/fixtures/flake8_pyi/PYI009.py

@@ -1,14 +0,0 @@
-def bar():
-    ...  # OK
-
-
-def foo():
-    pass  # OK, since we're not in a stub file
-
-
-class Bar:
-    ...  # OK
-
-
-class Foo:
-    pass  # OK, since we're not in a stub file

crates/ruff/resources/test/fixtures/flake8_pyi/PYI009.pyi

@@ -1,8 +0,0 @@
-def bar(): ...  # OK
-def foo():
-    pass  # ERROR PYI009, since we're in a stub file
-
-class Bar: ...  # OK
-
-class Foo:
-    pass  # ERROR PYI009, since we're in a stub file

crates/ruff/resources/test/fixtures/flake8_pyi/PYI010.py

@@ -1,18 +0,0 @@
-def bar():
-    ...  # OK
-
-
-def foo():
-    """foo"""  # OK
-
-
-def buzz():
-    print("buzz")  # OK, not in stub file
-
-
-def foo2():
-    123  # OK, not in a stub file
-
-
-def bizz():
-    x = 123  # OK, not in a stub file

crates/ruff/resources/test/fixtures/flake8_pyi/PYI010.pyi

@@ -1,12 +0,0 @@
-def bar(): ...  # OK
-def foo():
-    """foo"""  # OK, strings are handled by another rule
-
-def buzz():
-    print("buzz")  # ERROR PYI010
-
-def foo2():
-    123  # ERROR PYI010
-
-def bizz():
-    x = 123  # ERROR PYI010

crates/ruff/resources/test/fixtures/flake8_pyi/PYI011.py

@@ -1,79 +0,0 @@
-def f12(
-    x,
-    y: str = os.pathsep,  # OK
-) -> None:
-    ...
-
-
-def f11(*, x: str = "x") -> None:  # OK
-    ...
-
-
-def f13(
-    x: list[str] = [
-        "foo",
-        "bar",
-        "baz",
-    ]  # OK
-) -> None:
-    ...
-
-
-def f14(
-    x: tuple[str, ...] = (
-        "foo",
-        "bar",
-        "baz",
-    )  # OK
-) -> None:
-    ...
-
-
-def f15(
-    x: set[str] = {
-        "foo",
-        "bar",
-        "baz",
-    }  # OK
-) -> None:
-    ...
-
-
-def f16(x: frozenset[bytes] = frozenset({b"foo", b"bar", b"baz"})) -> None:  # OK
-    ...
-
-
-def f17(
-    x: str = "foo" + "bar",  # OK
-) -> None:
-    ...
-
-
-def f18(
-    x: str = b"foo" + b"bar",  # OK
-) -> None:
-    ...
-
-
-def f19(
-    x: object = "foo" + 4,  # OK
-) -> None:
-    ...
-
-
-def f20(
-    x: int = 5 + 5,  # OK
-) -> None:
-    ...
-
-
-def f21(
-    x: complex = 3j - 3j,  # OK
-) -> None:
-    ...
-
-
-def f22(
-    x: complex = -42.5j + 4.3j,  # OK
-) -> None:
-    ...

crates/ruff/resources/test/fixtures/flake8_pyi/PYI011.pyi

@@ -1,63 +0,0 @@
-def f12(
-    x,
-    y: str = os.pathsep,  # Error PYI011 Only simple default values allowed for typed arguments
-) -> None: ...
-def f11(*, x: str = "x") -> None: ...  # OK
-def f13(
-    x: list[
-        str
-    ] = [  # Error PYI011 Only simple default values allowed for typed arguments
-        "foo",
-        "bar",
-        "baz",
-    ]
-) -> None: ...
-def f14(
-    x: tuple[
-        str, ...
-    ] = (  # Error PYI011 Only simple default values allowed for typed arguments
-        "foo",
-        "bar",
-        "baz",
-    )
-) -> None: ...
-def f15(
-    x: set[
-        str
-    ] = {  # Error PYI011 Only simple default values allowed for typed arguments
-        "foo",
-        "bar",
-        "baz",
-    }
-) -> None: ...
-def f16(
-    x: frozenset[
-        bytes
-    ] = frozenset(  # Error PYI011 Only simple default values allowed for typed arguments
-        {b"foo", b"bar", b"baz"}
-    )
-) -> None: ...
-def f17(
-    x: str = "foo"  # Error PYI011 Only simple default values allowed for typed arguments
-    + "bar",
-) -> None: ...
-def f18(
-    x: str = b"foo"  # Error PYI011 Only simple default values allowed for typed arguments
-    + b"bar",
-) -> None: ...
-def f19(
-    x: object = "foo"  # Error PYI011 Only simple default values allowed for typed arguments
-    + 4,
-) -> None: ...
-def f20(
-    x: int = 5
-    + 5,  # Error PYI011 Only simple default values allowed for typed arguments
-) -> None: ...
-def f21(
-    x: complex = 3j
-    - 3j,  # Error PYI011 Only simple default values allowed for typed arguments
-) -> None: ...
-def f22(
-    x: complex = -42.5j  # Error PYI011 Only simple default values allowed for typed arguments
-    + 4.3j,
-) -> None: ...

crates/ruff/resources/test/fixtures/flake8_pyi/PYI014.py

@@ -1,79 +0,0 @@
-def f12(
-    x,
-    y=os.pathsep,  # OK
-) -> None:
-    ...
-
-
-def f11(*, x="x") -> None:
-    ...  # OK
-
-
-def f13(
-    x=[  # OK
-        "foo",
-        "bar",
-        "baz",
-    ]
-) -> None:
-    ...
-
-
-def f14(
-    x=(  # OK
-        "foo",
-        "bar",
-        "baz",
-    )
-) -> None:
-    ...
-
-
-def f15(
-    x={  # OK
-        "foo",
-        "bar",
-        "baz",
-    }
-) -> None:
-    ...
-
-
-def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None:
-    ...  # OK
-
-
-def f17(
-    x="foo" + "bar",  # OK
-) -> None:
-    ...
-
-
-def f18(
-    x=b"foo" + b"bar",  # OK
-) -> None:
-    ...
-
-
-def f19(
-    x="foo" + 4,  # OK
-) -> None:
-    ...
-
-
-def f20(
-    x=5 + 5,  # OK
-) -> None:
-    ...
-
-
-def f21(
-    x=3j - 3j,  # OK
-) -> None:
-    ...
-
-
-def f22(
-    x=-42.5j + 4.3j,  # OK
-) -> None:
-    ...

crates/ruff/resources/test/fixtures/flake8_pyi/PYI014.pyi

@@ -1,45 +0,0 @@
-def f12(
-    x,
-    y=os.pathsep,  # Error PYI014
-) -> None: ...
-def f11(*, x="x") -> None: ...  # OK
-def f13(
-    x=[  # Error PYI014
-        "foo",
-        "bar",
-        "baz",
-    ]
-) -> None: ...
-def f14(
-    x=(  # Error PYI014
-        "foo",
-        "bar",
-        "baz",
-    )
-) -> None: ...
-def f15(
-    x={  # Error PYI014
-        "foo",
-        "bar",
-        "baz",
-    }
-) -> None: ...
-def f16(x=frozenset({b"foo", b"bar", b"baz"})) -> None: ...  # Error PYI014
-def f17(
-    x="foo" + "bar",  # Error PYI014
-) -> None: ...
-def f18(
-    x=b"foo" + b"bar",  # Error PYI014
-) -> None: ...
-def f19(
-    x="foo" + 4,  # Error PYI014
-) -> None: ...
-def f20(
-    x=5 + 5,  # Error PYI014
-) -> None: ...
-def f21(
-    x=3j - 3j,  # Error PYI014
-) -> None: ...
-def f22(
-    x=-42.5j + 4.3j,  # Error PYI014
-) -> None: ...

crates/ruff/resources/test/fixtures/flake8_pyi/PYI021.py

@@ -1,14 +0,0 @@
-"""foo"""  # OK, not in stub
-
-
-def foo():
-    """foo"""  # OK, doc strings are allowed in non-stubs
-
-
-class Bar:
-    """bar"""  # OK, doc strings are allowed in non-stubs
-
-
-def bar():
-    x = 1
-    """foo"""  # OK, not a doc string

crates/ruff/resources/test/fixtures/flake8_pyi/PYI021.pyi

@@ -1,11 +0,0 @@
-"""foo"""  # ERROR PYI021
-
-def foo():
-    """foo"""  # ERROR PYI021
-
-class Bar:
-    """bar"""  # ERROR PYI021
-
-def bar():
-    x = 1
-    """foo"""  # OK, not a doc string

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

@@ -17,12 +17,6 @@ class Test(unittest.TestCase):
         self.assertTrue(**{"expr": expr, "msg": msg})  # Error, unfixable
         self.assertTrue(msg=msg, expr=expr, unexpected_arg=False)  # Error, unfixable
         self.assertTrue(msg=msg)  # Error, unfixable
-        (
-            self.assertIsNotNone(value)  # Error, unfixable
-            if expect_condition
-            else self.assertIsNone(value)  # Error, unfixable
-        )
-        return self.assertEqual(True,  False)  # Error, unfixable
 
     def test_assert_false(self):
         self.assertFalse(True)  # Error

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

@@ -6,8 +6,6 @@ def test_ok():
     assert something or something_else
     assert something or something_else and something_third
     assert not (something and something_else)
-    assert something, "something message"
-    assert something or something_else and something_third, "another message"
 
 
 def test_error():
@@ -15,27 +13,6 @@ def test_error():
     assert something and something_else and something_third
     assert something and not something_else
     assert something and (something_else or something_third)
-    assert not something and something_else
     assert not (something or something_else)
     assert not (something or something_else or something_third)
-    assert something and something_else == """error
-    message
-    """
-
-    # recursive case
-    assert not (a or not (b or c))
-    assert not (a or not (b and c))
-
-    # detected, but no autofix for messages
-    assert something and something_else, "error message"
-    assert not (something or something_else and something_third), "with message"
-    # detected, but no autofix for mixed conditions (e.g. `a or b and c`)
     assert not (something or something_else and something_third)
-    # detected, but no autofix for parenthesized conditions
-    assert (
-        something
-        and something_else
-        == """error
-message
-"""
-    )

crates/ruff/resources/test/fixtures/flake8_return/RET503.py

@@ -3,8 +3,6 @@ import os
 import posix
 from posix import abort
 import sys as std_sys
-import typing
-import typing_extensions
 import _thread
 import _winapi
 
@@ -79,7 +77,7 @@ def x(y):
 
 # last line in while loop
 def x(y):
-    while i > 0:
+    while True:
         if y > 0:
             return 1
         y += 1
@@ -213,18 +211,6 @@ def noreturn_sys_exit():
     std_sys.exit(0)
 
 
-def noreturn_typing_assert_never():
-    if x > 0:
-        return 1
-    typing.assert_never(0)
-
-
-def noreturn_typing_extensions_assert_never():
-    if x > 0:
-        return 1
-    typing_extensions.assert_never(0)
-
-
 def noreturn__thread_exit():
     if x > 0:
         return 1
@@ -265,31 +251,3 @@ def noreturn_pytest_xfail_2():
     if x > 0:
         return 1
     py_xfail("oof")
-
-
-def nested(values):
-    if not values:
-        return False
-
-    for value in values:
-        print(value)
-
-
-def while_true():
-    while True:
-        if y > 0:
-            return 1
-        y += 1
-
-
-# match
-def x(y):
-    match y:
-        case 0:
-            return 1
-        case 1:
-            print()  # error
-
-
-def foo(baz: str) -> str:
-    return baz

crates/ruff/resources/test/fixtures/flake8_return/RET508.py

@@ -136,24 +136,3 @@ def nested2(x, y, z):
                 break
         else:
             a = z
-
-
-def elif1(x, y, w, z):
-    for i in x:
-        if i > y:
-            a = z
-        elif i > w:
-            break
-        else:
-            a = z
-
-
-def elif2(x, y, w, z):
-    for i in x:
-        if i > y:
-            a = z
-        else:
-            if i > w:
-                break
-            else:
-                a = z

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

@@ -35,38 +35,29 @@ class Foo(metaclass=BazMeta):
             return None
         if self.bar()._private:  # SLF001
             return None
-        if Bar._private_thing:  # SLF001
-            return None
-        if Foo._private_thing:
-            return None
-        Foo = Bar()
-        if Foo._private_thing:  # SLF001
-            return None
         return self.bar
 
     def public_func(self):
-        super().public_func()
+        pass
 
     def _private_func(self):
-        super()._private_func()
+        pass
 
     def __really_private_func(self, arg):
-        super().__really_private_func(arg)
+        pass
 
 
 foo = Foo()
 
+print(foo.public_thing)
+print(foo.public_func())
+print(foo.__dict__)
+print(foo.__str__())
+print(foo().__class__)
+
 print(foo._private_thing)  # SLF001
 print(foo.__really_private_thing)  # SLF001
 print(foo._private_func())  # SLF001
 print(foo.__really_private_func(1))  # SLF001
 print(foo.bar._private)  # SLF001
 print(foo()._private_thing)  # SLF001
-print(foo()._private_thing__)  # SLF001
-
-print(foo.public_thing)
-print(foo.public_func())
-print(foo.__dict__)
-print(foo.__str__())
-print(foo().__class__)
-print(foo._asdict())

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

@@ -155,19 +155,3 @@ def f():
         if check(x):
             return False
     return True
-
-
-def f():
-    # SIM111
-    for x in iterable:
-        if x not in y:
-            return False
-    return True
-
-
-def f():
-    # SIM111
-    for x in iterable:
-        if x > y:
-            return False
-    return True

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

@@ -1,96 +0,0 @@
-# Errors
-if a:
-    b
-elif c:
-    b
-
-if x == 1:
-    for _ in range(20):
-        print("hello")
-elif x == 2:
-    for _ in range(20):
-        print("hello")
-
-if x == 1:
-    if True:
-        for _ in range(20):
-            print("hello")
-elif x == 2:
-    if True:
-        for _ in range(20):
-            print("hello")
-
-if x == 1:
-    if True:
-        for _ in range(20):
-            print("hello")
-    elif False:
-        for _ in range(20):
-            print("hello")
-elif x == 2:
-    if True:
-        for _ in range(20):
-            print("hello")
-    elif False:
-        for _ in range(20):
-            print("hello")
-
-if (
-    x == 1
-    and y == 2
-    and z == 3
-    and a == 4
-    and b == 5
-    and c == 6
-    and d == 7
-    and e == 8
-    and f == 9
-    and g == 10
-    and h == 11
-    and i == 12
-    and j == 13
-    and k == 14
-):
-    pass
-elif 1 == 2:
-    pass
-
-if result.eofs == "O":
-    pass
-elif result.eofs == "S":
-    skipped = 1
-elif result.eofs == "F":
-    errors = 1
-elif result.eofs == "E":
-    errors = 1
-
-
-# OK
-def complicated_calc(*arg, **kwargs):
-    return 42
-
-
-def foo(p):
-    if p == 2:
-        return complicated_calc(microsecond=0)
-    elif p == 3:
-        return complicated_calc(microsecond=0, second=0)
-    return None
-
-
-a = False
-b = True
-c = True
-
-if a:
-    z = 1
-elif b:
-    z = 2
-elif c:
-    z = 1
-
-# False negative (or arguably a different rule)
-if result.eofs == "F":
-    errors = 1
-else:
-    errors = 1

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

@@ -1,86 +0,0 @@
-# Errors
-a = "hello"
-
-# SIM116
-if a == "foo":
-    return "bar"
-elif a == "bar":
-    return "baz"
-elif a == "boo":
-    return "ooh"
-else:
-    return 42
-
-# SIM116
-if a == 1:
-    return (1, 2, 3)
-elif a == 2:
-    return (4, 5, 6)
-elif a == 3:
-    return (7, 8, 9)
-else:
-    return (10, 11, 12)
-
-# SIM116
-if a == 1:
-    return (1, 2, 3)
-elif a == 2:
-    return (4, 5, 6)
-elif a == 3:
-    return (7, 8, 9)
-
-# SIM116
-if a == "hello 'sir'":
-    return (1, 2, 3)
-elif a == 'goodbye "mam"':
-    return (4, 5, 6)
-elif a == """Fairwell 'mister'""":
-    return (7, 8, 9)
-else:
-    return (10, 11, 12)
-
-# SIM116
-if a == b"one":
-    return 1
-elif a == b"two":
-    return 2
-elif a == b"three":
-    return 3
-
-# SIM116
-if a == "hello 'sir'":
-    return ("hello'", 'hi"', 3)
-elif a == 'goodbye "mam"':
-    return (4, 5, 6)
-elif a == """Fairwell 'mister'""":
-    return (7, 8, 9)
-else:
-    return (10, 11, 12)
-
-# OK
-if a == "foo":
-    return "bar"
-elif a == "bar":
-    return baz()
-elif a == "boo":
-    return "ooh"
-else:
-    return 42
-
-# OK
-if a == b"one":
-    return 1
-elif b == b"two":
-    return 2
-elif a == b"three":
-    return 3
-
-# SIM116
-if func_name == "create":
-    return "A"
-elif func_name == "modify":
-    return "M"
-elif func_name == "remove":
-    return "D"
-elif func_name == "move":
-    return "MV"

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

@@ -11,7 +11,6 @@ YODA > age  # SIM300
 YODA >= age  # SIM300
 JediOrder.YODA == age  # SIM300
 0 < (number - 100)  # SIM300
-SomeClass().settings.SOME_CONSTANT_VALUE > (60 * 60)  # SIM300
 
 # OK
 compare == "yoda"

crates/ruff/resources/test/fixtures/flake8_tidy_imports/TID252.py

@@ -18,6 +18,8 @@ from \
     ..parent\
     import \
     world_hello
+
+# TID252 (without autofix; too many levels up)
 from ..... import ultragrantparent
 from ...... import ultragrantparent
 from ....... import ultragrantparent

crates/ruff/resources/test/fixtures/flake8_tidy_imports/TID252/my_package/sublib/api/application.py

@@ -1,8 +0,0 @@
-from typing import TYPE_CHECKING, Any, ClassVar
- 
-import attrs
-
-from ..protocol import commands, definitions, responses
-from ..server import example
-from .. import server
-from . import logger, models

crates/ruff/resources/test/fixtures/flake8_type_checking/TCH004_13.py

@@ -1,10 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from typing import Final, Literal, TypeAlias
-
-    RatingKey: TypeAlias = Literal["good", "fair", "poor"]
-
-RATING_KEYS: Final[tuple[RatingKey, ...]] = ("good", "fair", "poor")

crates/ruff/resources/test/fixtures/isort/as_imports_comments.py

@@ -1,15 +0,0 @@
-from foo import (  # Comment on `foo`
-    Member as Alias,  # Comment on `Alias`
-)
-
-from bar import (  # Comment on `bar`
-    Member,  # Comment on `Member`
-)
-
-from baz import (  # Comment on `baz`
-    Member as Alias  # Comment on `Alias`
-)
-
-from bop import (  # Comment on `bop`
-    Member  # Comment on `Member`
-)

crates/ruff/resources/test/fixtures/isort/force_to_top.py

@@ -1,23 +0,0 @@
-import lib6
-import lib2
-import lib5
-import lib1
-import lib3
-import lib4
-
-import foo
-import z
-from foo import bar
-from lib1 import foo
-from lib2 import foo
-from lib1.lib2 import foo
-from foo.lib1.bar import baz
-from lib4 import lib1
-from lib5 import lib2
-from lib4 import lib2
-from lib5 import lib1
-
-import lib3.lib4
-import lib3.lib4.lib5
-from lib3.lib4 import foo
-from lib3.lib4.lib5 import foo

crates/ruff/resources/test/fixtures/isort/line_ending_crlf.py

@@ -1,2 +1,2 @@
-from long_module_name import member_one, member_two, member_three, member_four, member_five
+from long_module_name import member_one, member_two, member_three, member_four, member_five
 

crates/ruff/resources/test/fixtures/isort/no_lines_before_with_empty_sections.py

@@ -1,3 +0,0 @@
-from __future__ import annotations
-from typing import Any
-from . import my_local_folder_object

crates/ruff/resources/test/fixtures/isort/pyproject.toml

@@ -5,4 +5,3 @@ line-length = 88
 lines-after-imports = 3
 lines-between-types = 2
 known-local-folder = ["ruff"]
-force-to-top = ["lib1", "lib3", "lib5", "lib3.lib4", "z"]

crates/ruff/resources/test/fixtures/isort/required_imports/multiline_docstring.py

@@ -1,4 +0,0 @@
-"""a
-b"""
-# b
-import os

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

@@ -1,20 +0,0 @@
-import numpy as npy
-import numpy as np
-import numpy
-
-# Error
-npy.bool
-npy.int
-
-if dtype == np.object:
-    ...
-
-result = result.select_dtypes([np.byte, np.ubyte, np.short, np.ushort, np.int, np.long])
-
-pdf = pd.DataFrame(
-    data=[[1, 2, 3]],
-    columns=["a", "b", "c"],
-    dtype=numpy.object,
-)
-
-_ = arr.astype(np.int)

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

@@ -1,62 +0,0 @@
-# Do this (new version)
-from numpy.random import default_rng
-rng = default_rng()
-vals = rng.standard_normal(10)
-more_vals = rng.standard_normal(10)
-numbers = rng.integers(high, size=5)
-
-# instead of this (legacy version)
-from numpy import random
-vals = random.standard_normal(10)
-more_vals = random.standard_normal(10)
-numbers = random.integers(high, size=5)
-
-import numpy
-numpy.random.seed()
-numpy.random.get_state()
-numpy.random.set_state()
-numpy.random.rand()
-numpy.random.randn()
-numpy.random.randint()
-numpy.random.random_integers()
-numpy.random.random_sample()
-numpy.random.choice()
-numpy.random.bytes()
-numpy.random.shuffle()
-numpy.random.permutation()
-numpy.random.beta()
-numpy.random.binomial()
-numpy.random.chisquare()
-numpy.random.dirichlet()
-numpy.random.exponential()
-numpy.random.f()
-numpy.random.gamma()
-numpy.random.geometric()
-numpy.random.get_state()
-numpy.random.gumbel()
-numpy.random.hypergeometric()
-numpy.random.laplace()
-numpy.random.logistic()
-numpy.random.lognormal()
-numpy.random.logseries()
-numpy.random.multinomial()
-numpy.random.multivariate_normal()
-numpy.random.negative_binomial()
-numpy.random.noncentral_chisquare()
-numpy.random.noncentral_f()
-numpy.random.normal()
-numpy.random.pareto()
-numpy.random.poisson()
-numpy.random.power()
-numpy.random.rayleigh()
-numpy.random.standard_cauchy()
-numpy.random.standard_exponential()
-numpy.random.standard_gamma()
-numpy.random.standard_normal()
-numpy.random.standard_t()
-numpy.random.triangular()
-numpy.random.uniform()
-numpy.random.vonmises()
-numpy.random.wald()
-numpy.random.weibull()
-numpy.random.zipf()