Reverts

.cargo/config.toml

@@ -1,6 +1,6 @@
 [alias]
 dev = "run --package ruff_dev --bin ruff_dev"
-benchmark = "bench -p ruff_benchmark --bench linter --bench formatter --"
+benchmark = "bench -p ruff_benchmark --"
 
 [target.'cfg(all())']
 rustflags = [

.devcontainer/devcontainer.json

@@ -1,46 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/rust
-{
-	"name": "Ruff",
-	"image": "mcr.microsoft.com/devcontainers/rust:0-1-bullseye",
-	"mounts": [
-		{
-			"source": "devcontainer-cargo-cache-${devcontainerId}",
-			"target": "/usr/local/cargo",
-			"type": "volume"
-		}
-	],
-	"customizations": {
-		"codespaces": {
-			"openFiles": [
-				"CONTRIBUTING.md"
-			]
-		},
-		"vscode": {
-			"extensions": [
-				"ms-python.python",
-				"rust-lang.rust-analyzer",
-				"serayuzgur.crates",
-				"tamasfe.even-better-toml",
-				"Swellaby.vscode-rust-test-adapter",
-				"charliermarsh.ruff"
-			],
-			"settings": {
-				"rust-analyzer.updates.askBeforeDownload": false
-			}
-		}
-	},
-	// Features to add to the dev container. More info: https://containers.dev/features.
-	"features": {
-		"ghcr.io/devcontainers/features/python": {
-			"installTools": false
-		}
-	},
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-	"postCreateCommand": ".devcontainer/post-create.sh"
-	// Configure tool-specific properties.
-	// "customizations": {},
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "root"
-}

.devcontainer/post-create.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-rustup default < rust-toolchain
-rustup component add clippy rustfmt
-cargo install cargo-insta
-cargo fetch
-
-pip install maturin pre-commit

.editorconfig

@@ -14,7 +14,4 @@ indent_size = 2
 indent_size = 4
 
 [*.snap]
-trim_trailing_whitespace = false
-
-[*.md]
-max_line_length = 100
+trim_trailing_whitespace = false

.gitattributes

@@ -4,4 +4,3 @@ 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
-*.md.snap linguist-language=Markdown

.github/CODEOWNERS

@@ -1,9 +0,0 @@
-# GitHub code owners file. For more info: https://help.github.com/articles/about-codeowners/
-#
-# - Comment lines begin with `#` character.
-# - Each line is a file pattern followed by one or more owners.
-# - The '*' pattern is global owners.
-# - Order is important. The last matching pattern has the most precedence.
-
-# Jupyter
-/crates/ruff/src/jupyter/ @dhruvmanila

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +0,0 @@
-<!--
-Thank you for contributing to Ruff! To help us out with reviewing, please consider the following:
-
-- Does this pull request include a summary of the change? (See below.)
-- Does this pull request include a descriptive title?
-- Does this pull request include references to any relevant issues?
--->
-
-## Summary
-
-<!-- What's the purpose of the change? What does it do, and why? -->
-
-## Test Plan
-
-<!-- How was it tested? -->

.github/release.yml

@@ -1,9 +1,5 @@
 # https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuring-automatically-generated-release-notes
 changelog:
-  exclude:
-    labels:
-      - internal
-      - documentation
   categories:
     - title: Breaking Changes
       labels:
@@ -15,7 +11,6 @@ changelog:
     - title: Settings
       labels:
         - configuration
-        - cli
     - title: Bug Fixes
       labels:
         - bug

.github/workflows/benchmark.yaml

@@ -2,14 +2,6 @@ name: Benchmark
 
 on:
   pull_request:
-    paths:
-      - 'Cargo.toml'
-      - 'Cargo.lock'
-      - 'rust-toolchain'
-      - 'crates/**'
-      - '!crates/ruff_dev'
-      - '!crates/ruff_shrinking'
-
   workflow_dispatch:
 
 concurrency:
@@ -22,7 +14,7 @@ jobs:
     name: "Run | ${{ matrix.os }}"
     strategy:
       matrix:
-        os: [ ubuntu-latest, windows-latest ]
+        os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -37,7 +29,10 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: "PR - Build benchmarks"
-        run: cargo bench -p ruff_benchmark --no-run
+        uses: actions-rs/cargo@v1
+        with:
+          command: bench
+          args: -p ruff_benchmark --no-run
 
       - name: "PR - Run benchmarks"
         run: cargo benchmark --save-baseline=pr
@@ -52,7 +47,10 @@ jobs:
         run: rustup show
 
       - name: "Main - Build benchmarks"
-        run: cargo bench -p ruff_benchmark --no-run
+        uses: actions-rs/cargo@v1
+        with:
+          command: bench
+          args: -p ruff_benchmark --no-run
 
       - name: "Main - Run benchmarks"
         run: cargo benchmark --save-baseline=main
@@ -80,10 +78,11 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
 
+      - name: "Install cargo-binstall"
+        uses: taiki-e/install-action@cargo-binstall
+
       - name: "Install critcmp"
-        uses: taiki-e/install-action@v2
-        with:
-          tool: critcmp
+        run: cargo binstall critcmp -y
 
       - name: "Linux | Download PR benchmark results"
         uses: actions/download-artifact@v3

.github/workflows/ci.yaml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
   workflow_dispatch:
 
@@ -16,42 +16,9 @@ env:
   CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
   PACKAGE_NAME: ruff
-  PYTHON_VERSION: "3.11" # to build abi3 wheels
+  PYTHON_VERSION: "3.7" # to build abi3 wheels
 
 jobs:
-  determine_changes:
-    name: "Determine changes"
-    runs-on: ubuntu-latest
-    outputs:
-      linter: ${{ steps.changed.outputs.linter_any_changed }}
-      formatter: ${{ steps.changed.outputs.formatter_any_changed }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - uses: tj-actions/changed-files@v37
-        id: changed
-        with:
-          files_yaml: |
-            linter:
-              - Cargo.toml
-              - Cargo.lock
-              - crates/**
-              - "!crates/ruff_python_formatter/**"
-              - "!crates/ruff_formatter/**"
-              - "!crates/ruff_dev/**"
-              - "!crates/ruff_shrinking/**"
-
-            formatter:
-              - Cargo.toml
-              - Cargo.lock
-              - crates/ruff_python_formatter/**
-              - crates/ruff_formatter/**
-              - crates/ruff_python_trivia/**
-              - crates/ruff_python_ast/**
-
-
   cargo-fmt:
     name: "cargo fmt"
     runs-on: ubuntu-latest
@@ -64,6 +31,17 @@ jobs:
   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@v2
+      - 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"
@@ -71,39 +49,33 @@ jobs:
           rustup component add clippy
           rustup target add wasm32-unknown-unknown
       - uses: Swatinem/rust-cache@v2
-      - name: "Clippy"
-        run: cargo clippy --workspace --all-targets --all-features -- -D warnings
-      - name: "Clippy (wasm)"
-        run: cargo clippy -p ruff_wasm --target wasm32-unknown-unknown --all-features -- -D warnings
+      - run: cargo clippy -p ruff_wasm --target wasm32-unknown-unknown --all-features -- -D warnings
 
   cargo-test:
     strategy:
       matrix:
-        os: [ ubuntu-latest, windows-latest ]
+        os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     name: "cargo test | ${{ matrix.os }}"
     steps:
       - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
-      - name: "Install cargo insta"
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-insta
-      - run: pip install black[d]==23.1.0
       - uses: Swatinem/rust-cache@v2
+      - run: cargo install cargo-insta
+      - run: pip install black[d]==23.1.0
       - name: "Run tests (Ubuntu)"
         if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: cargo insta test --all --all-features --unreferenced reject
+        run: |
+          cargo insta test --all --all-features --delete-unreferenced-snapshots
+          git diff --exit-code
       - name: "Run tests (Windows)"
         if: ${{ matrix.os == 'windows-latest' }}
         shell: bash
-        # We can't reject unreferenced snapshots on windows because flake8_executable can't run on windows
-        run: cargo insta test --all --all-features
+        run: |
+          cargo insta test --all --all-features
+          git diff --exit-code
       - run: cargo test --package ruff_cli --test black_compatibility_test -- --ignored
-        # TODO: Skipped as it's currently broken. The resource were moved from the
-        # ruff_cli to ruff crate, but this test was not updated.
-        if: false
       # Check for broken links in the documentation.
       - run: cargo doc --all --no-deps
         env:
@@ -115,22 +87,6 @@ jobs:
           name: ruff
           path: target/debug/ruff
 
-  cargo-fuzz:
-    runs-on: ubuntu-latest
-    name: "cargo fuzz"
-    steps:
-      - uses: actions/checkout@v3
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: "fuzz -> target"
-      - name: "Install cargo-fuzz"
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-fuzz@0.11
-      - run: cargo fuzz build -s none
-
   cargo-test-wasm:
     runs-on: ubuntu-latest
     name: "cargo test (wasm)"
@@ -170,16 +126,14 @@ jobs:
   ecosystem:
     name: "ecosystem"
     runs-on: ubuntu-latest
-    needs:
-      - cargo-test
-      - determine_changes
+    needs: cargo-test
     # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
-    if: github.event_name == 'pull_request' && needs.determine_changes.outputs.linter == 'true'
+    if: github.event_name == 'pull_request'
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: ${{ env.PYTHON_VERSION }}
+          python-version: "3.11"
 
       - uses: actions/download-artifact@v3
         name: Download Ruff binary
@@ -224,12 +178,12 @@ jobs:
       - uses: actions/checkout@v3
       - name: "Install nightly Rust toolchain"
         # Only pinned to make caching work, update freely
-        run: rustup toolchain install nightly-2023-06-08
+        run: rustup toolchain install nightly-2023-03-30
       - uses: Swatinem/rust-cache@v2
       - name: "Install cargo-udeps"
         uses: taiki-e/install-action@cargo-udeps
       - name: "Run cargo-udeps"
-        run: cargo +nightly-2023-06-08 udeps
+        run: cargo +nightly-2023-03-30 udeps
 
 
   python-package:
@@ -241,20 +195,18 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - uses: Swatinem/rust-cache@v2
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
         uses: PyO3/maturin-action@v1
         with:
+          manylinux: auto
           args: --out dist
       - name: "Test wheel"
         run: |
-          pip install --force-reinstall --find-links dist ${{ env.PACKAGE_NAME }}
+          pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
           ruff --help
           python -m ruff --help
-      - name: "Remove wheels from cache"
-        run: rm -rf target/wheels
 
   pre-commit:
     name: "pre-commit"
@@ -263,7 +215,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: ${{ env.PYTHON_VERSION }}
+          python-version: "3.11"
       - name: "Install Rust toolchain"
         run: rustup show
       - uses: Swatinem/rust-cache@v2
@@ -272,8 +224,8 @@ jobs:
       - name: "Cache pre-commit"
         uses: actions/cache@v3
         with:
-          path: ~/.cache/pre-commit
-          key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
+            path: ~/.cache/pre-commit
+            key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
       - name: "Run pre-commit"
         run: |
           echo '```console' > $GITHUB_STEP_SUMMARY
@@ -287,24 +239,13 @@ jobs:
   docs:
     name: "mkdocs"
     runs-on: ubuntu-latest
-    env:
-      MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
-      - name: "Add SSH key"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        uses: webfactory/ssh-agent@v0.8.0
-        with:
-          ssh-private-key: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY }}
       - name: "Install Rust toolchain"
         run: rustup show
       - uses: Swatinem/rust-cache@v2
-      - name: "Install Insiders dependencies"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        run: pip install -r docs/requirements-insiders.txt
       - name: "Install dependencies"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
         run: pip install -r docs/requirements.txt
       - name: "Update README File"
         run: python scripts/transform_readme.py --target mkdocs
@@ -312,30 +253,5 @@ jobs:
         run: python scripts/generate_mkdocs.py
       - name: "Check docs formatting"
         run: python scripts/check_docs_formatted.py
-      - name: "Build Insiders docs"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        run: mkdocs build --strict -f mkdocs.insiders.yml
       - name: "Build docs"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
-        run: mkdocs build --strict -f mkdocs.generated.yml
-
-  check-formatter-ecosystem:
-    name: "Formatter ecosystem and progress checks"
-    runs-on: ubuntu-latest
-    needs: determine_changes
-    if: needs.determine_changes.outputs.formatter == 'true'
-    steps:
-      - uses: actions/checkout@v3
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - name: "Cache rust"
-        uses: Swatinem/rust-cache@v2
-      - name: "Formatter progress"
-        run: scripts/formatter_progress.sh
-      - name: "Github step summary"
-        run: grep "similarity index" target/progress_projects_report.txt | sort > $GITHUB_STEP_SUMMARY
-      # CPython is not black formatted, so we run only the stability check
-      - name: "Clone CPython 3.10"
-        run: git clone --branch 3.10 --depth 1 https://github.com/python/cpython.git crates/ruff/resources/test/cpython
-      - name: "Check CPython stability"
-        run: cargo run --bin ruff_dev -- format-dev --stability-check crates/ruff/resources/test/cpython
+        run: mkdocs build --strict

.github/workflows/docs.yaml

@@ -1,43 +1,29 @@
 name: mkdocs
 
 on:
-  workflow_dispatch:
   release:
-    types: [ published ]
+    types: [published]
+  workflow_dispatch:
 
 jobs:
   mkdocs:
     runs-on: ubuntu-latest
     env:
       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
-      MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
-      - name: "Add SSH key"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        uses: webfactory/ssh-agent@v0.8.0
-        with:
-          ssh-private-key: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY }}
       - name: "Install Rust toolchain"
         run: rustup show
       - uses: Swatinem/rust-cache@v2
-      - name: "Install Insiders dependencies"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        run: pip install -r docs/requirements-insiders.txt
       - name: "Install dependencies"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
-        run: pip install -r docs/requirements.txt
+        run: |
+          pip install -r docs/requirements.txt
       - name: "Copy README File"
         run: |
           python scripts/transform_readme.py --target mkdocs
           python scripts/generate_mkdocs.py
-      - name: "Build Insiders docs"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        run: mkdocs build --strict -f mkdocs.insiders.yml
-      - name: "Build docs"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
-        run: mkdocs build --strict -f mkdocs.generated.yml
+          mkdocs build --strict
       - name: "Deploy to Cloudflare Pages"
         if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
         uses: cloudflare/wrangler-action@2.0.0

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

@@ -9,7 +9,7 @@ concurrency:
 env:
   PACKAGE_NAME: flake8-to-ruff
   CRATE_NAME: flake8_to_ruff
-  PYTHON_VERSION: "3.11"
+  PYTHON_VERSION: "3.7" # to build abi3 wheels
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
   CARGO_TERM_COLOR: always
@@ -52,7 +52,7 @@ jobs:
       - name: "Build wheels - universal2"
         uses: PyO3/maturin-action@v1
         with:
-          args: --release --target universal2-apple-darwin --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+          args: --release --universal2 --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
       - name: "Install built wheel - universal2"
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*universal2.whl --force-reinstall
@@ -66,7 +66,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        target: [ x64, x86 ]
+        target: [x64, x86]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -94,7 +94,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [ x86_64, i686 ]
+        target: [x86_64, i686]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -121,7 +121,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [ aarch64, armv7, s390x, ppc64le, ppc64 ]
+        target: [aarch64, armv7, s390x, ppc64le, ppc64]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4

.github/workflows/playground.yaml

@@ -2,8 +2,8 @@ name: "[Playground] Release"
 
 on:
   workflow_dispatch:
-  release:
-    types: [ published ]
+  push:
+    branches: [main]
 
 env:
   CARGO_INCREMENTAL: 0

.github/workflows/pr-comment.yaml

@@ -2,8 +2,8 @@ name: PR Check Comment
 
 on:
   workflow_run:
-    workflows: [ CI, Benchmark ]
-    types: [ completed ]
+    workflows: [CI, Benchmark]
+    types: [completed]
   workflow_dispatch:
     inputs:
       workflow_run_id:

.github/workflows/release.yaml

@@ -2,17 +2,8 @@ name: "[ruff] Release"
 
 on:
   workflow_dispatch:
-    inputs:
-      tag:
-        description: "The version to tag, without the leading 'v'. If omitted, will initiate a dry run (no uploads)."
-        type: string
-      sha:
-        description: "Optionally, the full sha of the commit to be released"
-        type: string
-  pull_request:
-    paths:
-      # When we change pyproject.toml, we want to ensure that the maturin builds still work
-      - pyproject.toml
+  release:
+    types: [published]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -20,7 +11,7 @@ concurrency:
 
 env:
   PACKAGE_NAME: ruff
-  PYTHON_VERSION: "3.11"
+  PYTHON_VERSION: "3.7" # to build abi3 wheels
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
   CARGO_TERM_COLOR: always
@@ -43,7 +34,6 @@ jobs:
           args: --out dist
       - name: "Test sdist"
         run: |
-          rustup default $(cat rust-toolchain)
           pip install dist/${{ env.PACKAGE_NAME }}-*.tar.gz --force-reinstall
           ruff --help
           python -m ruff --help
@@ -104,7 +94,7 @@ jobs:
       - name: "Build wheels - universal2"
         uses: PyO3/maturin-action@v1
         with:
-          args: --release --target universal2-apple-darwin --out dist
+          args: --release --universal2 --out dist
       - name: "Test wheel - universal2"
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall
@@ -230,7 +220,7 @@ jobs:
         platform:
           - target: aarch64-unknown-linux-gnu
             arch: aarch64
-            # see https://github.com/astral-sh/ruff/issues/3791
+            # see https://github.com/charliermarsh/ruff/issues/3791
             # and https://github.com/gnzlbg/jemallocator/issues/170#issuecomment-1503228963
             maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
           - target: armv7-unknown-linux-gnueabihf
@@ -392,39 +382,8 @@ jobs:
             *.tar.gz
             *.sha256
 
-  validate-tag:
-    name: Validate tag
-    runs-on: ubuntu-latest
-    # If you don't set an input tag, it's a dry run (no uploads).
-    if: ${{ inputs.tag }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Check tag consistency
-        run: |
-          version=$(grep "version = " pyproject.toml | sed -e 's/version = "\(.*\)"/\1/g')
-          if [ "${{ inputs.tag }}" != "${version}" ]; then
-            echo "The input tag does not match the version from pyproject.toml:" >&2
-            echo "${{ inputs.tag }}" >&2
-            echo "${version}" >&2
-            exit 1
-          else
-            echo "Releasing ${version}"
-          fi
-      - name: Check SHA consistency
-        if: ${{ inputs.sha }}
-        run: |
-          git_sha=$(git rev-parse HEAD)
-          if [ "${{ inputs.sha }}" != "${git_sha}" ]; then
-            echo "The specified sha does not match the git checkout" >&2
-            echo "${{ inputs.sha }}" >&2
-            echo "${git_sha}" >&2
-            exit 1
-          else
-            echo "Releasing ${git_sha}"
-          fi
-
-  upload-release:
-    name: Upload to PyPI
+  release:
+    name: Release
     runs-on: ubuntu-latest
     needs:
       - macos-universal
@@ -434,82 +393,27 @@ jobs:
       - linux-cross
       - musllinux
       - musllinux-cross
-      - validate-tag
-    # If you don't set an input tag, it's a dry run (no uploads).
-    if: ${{ inputs.tag }}
-    environment:
-      name: release
-    permissions:
-      # For pypi trusted publishing
-      id-token: write
+    if: "startsWith(github.ref, 'refs/tags/')"
     steps:
       - uses: actions/download-artifact@v3
         with:
           name: wheels
-          path: wheels
-      - name: Publish to PyPi
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          skip-existing: true
-          packages-dir: wheels
-          verbose: true
-
-  tag-release:
-    name: Tag release
-    runs-on: ubuntu-latest
-    needs: upload-release
-    # If you don't set an input tag, it's a dry run (no uploads).
-    if: ${{ inputs.tag }}
-    permissions:
-      # For git tag
-      contents: write
-    steps:
-      - uses: actions/checkout@v3
-      - name: git tag
+      - uses: actions/setup-python@v4
+      - name: "Publish to PyPi"
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.RUFF_TOKEN }}
         run: |
-          git config user.email "hey@astral.sh"
-          git config user.name "Ruff Release CI"
-          git tag -m "v${{ inputs.tag }}" "v${{ inputs.tag }}"
-          # If there is duplicate tag, this will fail. The publish to pypi action will have been a noop (due to skip
-          # existing), so we make a non-destructive exit here
-          git push --tags
-
-  publish-release:
-    name: Publish to GitHub
-    runs-on: ubuntu-latest
-    needs: tag-release
-    # If you don't set an input tag, it's a dry run (no uploads).
-    if: ${{ inputs.tag }}
-    permissions:
-      # For GitHub release publishing
-      contents: write
-    steps:
+          pip install --upgrade twine
+          twine upload --skip-existing *
+      - 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: "Publish to GitHub"
+      - name: Release
         uses: softprops/action-gh-release@v1
         with:
-          draft: true
           files: binaries/*
-          tag_name: v${{ inputs.tag }}
-
-  # After the release has been published, we update downstream repositories
-  # This is separate because if this fails the release is still fine, we just need to do some manual workflow triggers
-  update-dependents:
-    name: Update dependents
-    runs-on: ubuntu-latest
-    needs: publish-release
-    steps:
-      - name: "Update pre-commit mirror"
-        uses: actions/github-script@v6
-        with:
-          github-token: ${{ secrets.RUFF_PRE_COMMIT_PAT }}
-          script: |
-            github.rest.actions.createWorkflowDispatch({
-              owner: 'astral-sh',
-              repo: 'ruff-pre-commit',
-              workflow_id: 'main.yml',
-              ref: 'main',
-            })

.gitignore

@@ -1,25 +1,10 @@
-# Benchmarking cpython (CONTRIBUTING.md)
+# Local cache
+.ruff_cache
 crates/ruff/resources/test/cpython
-# generate_mkdocs.py
-mkdocs.generated.yml
-# check_ecosystem.py
+mkdocs.yml
+.overrides
 ruff-old
 github_search*.jsonl
-# update_schemastore.py
-schemastore
-# `maturin develop` and ecosystem_all_check.sh
-.venv*
-# Formatter debugging (crates/ruff_python_formatter/README.md)
-scratch.*
-# Created by `perf` (CONTRIBUTING.md)
-perf.data
-perf.data.old
-# Created by `flamegraph` (CONTRIBUTING.md)
-flamegraph.svg
-# Additional target directories that don't invalidate the main compile cache when changing linker settings,
-# e.g. `CARGO_TARGET_DIR=target-maturin maturin build --release --strip` or
-# `CARGO_TARGET_DIR=target-llvm-lines RUSTFLAGS="-Csymbol-mangling-version=v0" cargo llvm-lines -p ruff --lib`
-/target*
 
 ###
 # Rust.gitignore

.markdownlint.yaml

@@ -1,15 +0,0 @@
-# default to true for all rules
-default: true
-
-# MD007/unordered-list-indent
-MD007:
-  indent: 4
-
-# MD033/no-inline-html
-MD033: false
-
-# MD041/first-line-h1
-MD041: false
-
-# MD013/line-length
-MD013: false

.pre-commit-config.yaml

@@ -1,16 +1,4 @@
 fail_fast: true
-
-exclude: |
-  (?x)^(
-    crates/ruff/resources/.*|
-    crates/ruff/src/rules/.*/snapshots/.*|
-    crates/ruff_cli/resources/.*|
-    crates/ruff_python_formatter/resources/.*|
-    crates/ruff_python_formatter/tests/snapshots/.*|
-    crates/ruff_python_resolver/resources/.*|
-    crates/ruff_python_resolver/tests/snapshots/.*
-  )$
-
 repos:
   - repo: https://github.com/abravalheri/validate-pyproject
     rev: v0.12.1
@@ -22,7 +10,6 @@ repos:
     hooks:
       - id: mdformat
         additional_dependencies:
-          - mdformat-mkdocs
           - mdformat-black
           - black==23.1.0 # Must be the latest version of Black
 
@@ -30,9 +17,14 @@ repos:
     rev: v0.33.0
     hooks:
       - id: markdownlint-fix
+        args:
+          - --disable
+          - MD013 # line-length
+          - MD033 # no-inline-html
+          - --
 
   - repo: https://github.com/crate-ci/typos
-    rev: v1.14.12
+    rev: v1.14.8
     hooks:
       - id: typos
 
@@ -42,19 +34,29 @@ repos:
         name: cargo fmt
         entry: cargo fmt --
         language: system
-        types: [ rust ]
-        pass_filenames: false # This makes it a lot faster
+        types: [rust]
+      - id: clippy
+        name: clippy
+        entry: cargo clippy --workspace --all-targets --all-features -- -D warnings
+        language: system
+        pass_filenames: false
       - id: ruff
         name: ruff
-        entry: cargo run --bin ruff -- check --no-cache --force-exclude --fix --exit-non-zero-on-fix
+        entry: cargo run -p ruff_cli -- check --no-cache --force-exclude --fix --exit-non-zero-on-fix
         language: system
-        types_or: [ python, pyi ]
+        types_or: [python, pyi]
         require_serial: true
         exclude: |
           (?x)^(
             crates/ruff/resources/.*|
             crates/ruff_python_formatter/resources/.*
           )$
+      - id: dev-generate-all
+        name: dev-generate-all
+        entry: cargo dev generate-all
+        language: system
+        pass_filenames: false
+        exclude: target
 
   # Black
   - repo: https://github.com/psf/black
@@ -63,4 +65,4 @@ repos:
       - id: black
 
 ci:
-  skip: [ cargo-fmt, dev-generate-all ]
+  skip: [cargo-fmt, clippy, dev-generate-all]

BREAKING_CHANGES.md

@@ -1,70 +1,8 @@
 # Breaking Changes
 
-## 0.0.277
-
-### `.ipynb_checkpoints`, `.pyenv`, `.pytest_cache`, and `.vscode` are now excluded by default ([#5513](https://github.com/astral-sh/ruff/pull/5513))
-
-Ruff maintains a list of default exclusions, which now consists of the following patterns:
-
-- `.bzr`
-- `.direnv`
-- `.eggs`
-- `.git`
-- `.git-rewrite`
-- `.hg`
-- `.ipynb_checkpoints`
-- `.mypy_cache`
-- `.nox`
-- `.pants.d`
-- `.pyenv`
-- `.pytest_cache`
-- `.pytype`
-- `.ruff_cache`
-- `.svn`
-- `.tox`
-- `.venv`
-- `.vscode`
-- `__pypackages__`
-- `_build`
-- `buck-out`
-- `build`
-- `dist`
-- `node_modules`
-- `venv`
-
-Previously, the `.ipynb_checkpoints`, `.pyenv`, `.pytest_cache`, and `.vscode` directories were not
-excluded by default. This change brings Ruff's default exclusions in line with other tools like
-Black.
-
-## 0.0.276
-
-### The `keep-runtime-typing` setting has been reinstated ([#5470](https://github.com/astral-sh/ruff/pull/5470))
-
-The `keep-runtime-typing` setting has been reinstated with revised semantics. This setting was
-removed in [#4427](https://github.com/astral-sh/ruff/pull/4427), as it was equivalent to ignoring
-the `UP006` and `UP007` rules via Ruff's standard `ignore` mechanism.
-
-Taking `UP006` (rewrite `List[int]` to `list[int]`) as an example, the setting now behaves as
-follows:
-
-- On Python 3.7 and Python 3.8, setting `keep-runtime-typing = true` will cause Ruff to ignore
-    `UP006` violations, even if `from __future__ import annotations` is present in the file.
-    While such annotations are valid in Python 3.7 and Python 3.8 when combined with
-    `from __future__ import annotations`, they aren't supported by libraries like Pydantic and
-    FastAPI, which rely on runtime type checking.
-- On Python 3.9 and above, the setting has no effect, as `list[int]` is a valid type annotation,
-    and libraries like Pydantic and FastAPI support it without issue.
-
-In short: `keep-runtime-typing` can be used to ensure that Ruff doesn't introduce type annotations
-that are not supported at runtime by the current Python version, which are unsupported by libraries
-like Pydantic and FastAPI.
-
-Note that this is not a breaking change, but is included here to complement the previous removal
-of `keep-runtime-typing`.
-
 ## 0.0.268
 
-### The `keep-runtime-typing` setting has been removed ([#4427](https://github.com/astral-sh/ruff/pull/4427))
+### The `keep-runtime-typing` setting has been removed ([#4427](https://github.com/charliermarsh/ruff/pull/4427))
 
 Enabling the `keep-runtime-typing` option, located under the `pyupgrade` section, is equivalent
 to ignoring the `UP006` and `UP007` rules via Ruff's standard `ignore` mechanism. As there's no
@@ -73,9 +11,9 @@ removed.
 
 ## 0.0.267
 
-### `update-check` is no longer a valid configuration option ([#4313](https://github.com/astral-sh/ruff/pull/4313))
+### `update-check` is no longer a valid configuration option ([#4313](https://github.com/charliermarsh/ruff/pull/4313))
 
-The `update-check` functionality was deprecated in [#2530](https://github.com/astral-sh/ruff/pull/2530),
+The `update-check` functionality was deprecated in [#2530](https://github.com/charliermarsh/ruff/pull/2530),
 in that the behavior itself was removed, and Ruff was changed to warn when that option was enabled.
 
 Now, Ruff will throw an error when `update-check` is provided via a configuration file (e.g.,
@@ -84,7 +22,7 @@ this option from their configuration.
 
 ## 0.0.265
 
-### `--fix-only` now exits with a zero exit code, unless `--exit-non-zero-on-fix` is specified ([#4146](https://github.com/astral-sh/ruff/pull/4146))
+### `--fix-only` now exits with a zero exit code, unless `--exit-non-zero-on-fix` is specified ([#4146](https://github.com/charliermarsh/ruff/pull/4146))
 
 Previously, `--fix-only` would exit with a non-zero exit code if any fixes were applied. This
 behavior was inconsistent with `--fix`, and further, meant that `--exit-non-zero-on-fix` was
@@ -95,7 +33,7 @@ in which case it will exit with a non-zero exit code if any fixes were applied.
 
 ## 0.0.260
 
-### Fixes are now represented as a list of edits ([#3709](https://github.com/astral-sh/ruff/pull/3709))
+### Fixes are now represented as a list of edits ([#3709](https://github.com/charliermarsh/ruff/pull/3709))
 
 Previously, Ruff represented each fix as a single edit, which prohibited Ruff from automatically
 fixing violations that required multiple edits across a file. As such, Ruff now represents each
@@ -130,14 +68,14 @@ The updated representation instead includes a list of edits:
 
 ## 0.0.246
 
-### `multiple-statements-on-one-line-def` (`E704`) was removed ([#2773](https://github.com/astral-sh/ruff/pull/2773))
+### `multiple-statements-on-one-line-def` (`E704`) was removed ([#2773](https://github.com/charliermarsh/ruff/pull/2773))
 
 This rule was introduced in v0.0.245. However, it turns out that pycodestyle and Flake8 ignore this
 rule by default, as it is not part of PEP 8. As such, we've removed it from Ruff.
 
 ## 0.0.245
 
-### Ruff's public `check` method was removed ([#2709](https://github.com/astral-sh/ruff/pull/2709))
+### Ruff's public `check` method was removed ([#2709](https://github.com/charliermarsh/ruff/pull/2709))
 
 Previously, Ruff exposed a `check` method as a public Rust API. This method was used by few,
 if any clients, and was not well documented or supported. As such, it has been removed, with
@@ -145,11 +83,10 @@ the intention of adding a stable public API in the future.
 
 ## 0.0.238
 
-### `select`, `extend-select`, `ignore`, and `extend-ignore` have new semantics ([#2312](https://github.com/astral-sh/ruff/pull/2312))
+### `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/astral-sh/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
@@ -175,14 +112,14 @@ ignore = ["F401"]
 Running `ruff --select F` would previously have enabled all `F` rules, apart from `F401`. Now, it
 will enable all `F` rules, including `F401`, as the command line's `--select` resets the resolution.
 
-### `remove-six-compat` (`UP016`) has been removed ([#2332](https://github.com/astral-sh/ruff/pull/2332))
+### `remove-six-compat` (`UP016`) has been removed ([#2332](https://github.com/charliermarsh/ruff/pull/2332))
 
 The `remove-six-compat` rule has been removed. This rule was only useful for one-time Python 2-to-3
 upgrades.
 
 ## 0.0.237
 
-### `--explain`, `--clean`, and `--generate-shell-completion` are now subcommands ([#2190](https://github.com/astral-sh/ruff/pull/2190))
+### `--explain`, `--clean`, and `--generate-shell-completion` are now subcommands ([#2190](https://github.com/charliermarsh/ruff/pull/2190))
 
 `--explain`, `--clean`, and `--generate-shell-completion` are now implemented as subcommands:
 
@@ -203,36 +140,36 @@ 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
-    of silently ignoring them. For example, the following will now fail:
+  of silently ignoring them. For example, the following will now fail:
 
-    ```console
-    ruff --clean --respect-gitignore
-    ```
+  ```console
+  ruff --clean --respect-gitignore
+  ```
 
-    (the `clean` command doesn't support `--respect-gitignore`.)
+  (the `clean` command doesn't support `--respect-gitignore`.)
 
 - 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`.
+  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.
-    (The semantics of `ruff -- <arg>` have not changed.)
+  (The semantics of `ruff -- <arg>` have not changed.)
 
 - `--explain` previously treated `--format grouped` as a synonym for `--format text`.
-    This is no longer supported; instead, use `--format text`.
+  This is no longer supported; instead, use `--format text`.
 
 ## 0.0.226
 
-### `misplaced-comparison-constant` (`PLC2201`) was deprecated in favor of `SIM300` ([#1980](https://github.com/astral-sh/ruff/pull/1980))
+### `misplaced-comparison-constant` (`PLC2201`) was deprecated in favor of `SIM300` ([#1980](https://github.com/charliermarsh/ruff/pull/1980))
 
 These two rules contain (nearly) identical logic. To deduplicate the rule set, we've upgraded
 `SIM300` to handle a few more cases, and deprecated `PLC2201` in favor of `SIM300`.
 
 ## 0.0.225
 
-### `@functools.cache` rewrites have been moved to a standalone rule (`UP033`) ([#1938](https://github.com/astral-sh/ruff/pull/1938))
+### `@functools.cache` rewrites have been moved to a standalone rule (`UP033`) ([#1938](https://github.com/charliermarsh/ruff/pull/1938))
 
 Previously, `UP011` handled both `@functools.lru_cache()`-to-`@functools.lru_cache` conversions,
 _and_ `@functools.lru_cache(maxsize=None)`-to-`@functools.cache` conversions. The latter has been
@@ -241,7 +178,7 @@ to reflect the change in rule code.
 
 ## 0.0.222
 
-### `--max-complexity` has been removed from the CLI ([#1877](https://github.com/astral-sh/ruff/pull/1877))
+### `--max-complexity` has been removed from the CLI ([#1877](https://github.com/charliermarsh/ruff/pull/1877))
 
 The McCabe plugin's `--max-complexity` setting has been removed from the CLI, for consistency with
 the treatment of other, similar settings.
@@ -256,7 +193,7 @@ max-complexity = 10
 
 ## 0.0.181
 
-### Files excluded by `.gitignore` are now ignored ([#1234](https://github.com/astral-sh/ruff/pull/1234))
+### Files excluded by `.gitignore` are now ignored ([#1234](https://github.com/charliermarsh/ruff/pull/1234))
 
 Ruff will now avoid checking files that are excluded by `.ignore`, `.gitignore`,
 `.git/info/exclude`, and global `gitignore` files. This behavior is powered by the [`ignore`](https://docs.rs/ignore/latest/ignore/struct.WalkBuilder.html#ignore-rules)
@@ -269,7 +206,7 @@ default.
 
 ## 0.0.178
 
-### Configuration files are now resolved hierarchically ([#1190](https://github.com/astral-sh/ruff/pull/1190))
+### Configuration files are now resolved hierarchically ([#1190](https://github.com/charliermarsh/ruff/pull/1190))
 
 `pyproject.toml` files are now resolved hierarchically, such that for each Python file, we find
 the first `pyproject.toml` file in its path, and use that to determine its lint settings.

CODE_OF_CONDUCT.md

@@ -6,10 +6,10 @@
 - [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)
+  - [1. Correction](#1-correction)
+  - [2. Warning](#2-warning)
+  - [3. Temporary Ban](#3-temporary-ban)
+  - [4. Permanent Ban](#4-permanent-ban)
 - [Attribution](#attribution)
 
 ## Our Pledge
@@ -33,20 +33,20 @@ community include:
 - 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
+  and learning from the experience
 - Focusing on what is best not just for us as individuals, but for the
-    overall community
+  overall community
 
 Examples of unacceptable behavior include:
 
 - The use of sexualized language or imagery, and sexual attention or
-    advances of any kind
+  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
-    address, without their explicit permission
+  address, without their explicit permission
 - Other conduct which could reasonably be considered inappropriate in a
-    professional setting
+  professional setting
 
 ## Enforcement Responsibilities
 

CONTRIBUTING.md

@@ -3,29 +3,15 @@
 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)
-        - [Rule testing: fixtures and snapshots](#rule-testing-fixtures-and-snapshots)
-    - [Example: Adding a new configuration option](#example-adding-a-new-configuration-option)
+  - [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)
-    - [Creating a new release](#creating-a-new-release)
-- [Ecosystem CI](#ecosystem-ci)
-- [Benchmarking and Profiling](#benchmarking-and-profiling)
-    - [CPython Benchmark](#cpython-benchmark)
-    - [Microbenchmarks](#microbenchmarks)
-        - [Benchmark-driven Development](#benchmark-driven-development)
-        - [PR Summary](#pr-summary)
-        - [Tips](#tips)
-    - [Profiling Projects](#profiling-projects)
-        - [Linux](#linux)
-        - [Mac](#mac)
-- [`cargo dev`](#cargo-dev)
-- [Subsystems](#subsystems)
-    - [Compilation Pipeline](#compilation-pipeline)
+- [Benchmarks](#benchmarks)
 
 ## The Basics
 
@@ -34,23 +20,18 @@ Ruff welcomes contributions in the form of Pull Requests.
 For small changes (e.g., bug fixes), feel free to submit a PR.
 
 For larger changes (e.g., new lint rules, new functionality, new configuration options), consider
-creating an [**issue**](https://github.com/astral-sh/ruff/issues) outlining your proposed change.
-You can also join us on [**Discord**](https://discord.gg/c9MhzV8aU5) to discuss your idea with the
-community. We've labeled [beginner-friendly tasks](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
-in the issue tracker, along with [bugs](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3Abug)
-and [improvements](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3Aaccepted)
-that are ready for contributions.
+creating an [**issue**](https://github.com/charliermarsh/ruff/issues) outlining your proposed
+change. You can also join us on [**Discord**](https://discord.gg/c9MhzV8aU5) to discuss your idea with
+the community.
 
 If you're looking for a place to start, we recommend implementing a new lint rule (see:
 [_Adding a new lint rule_](#example-adding-a-new-lint-rule), which will allow you to learn from and
 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/astral-sh/ruff/issues/848)
-plugin, and looking to the originating [Python source](https://github.com/PyCQA/flake8-pyi) for
-guidance.
-
-If you have suggestions on how we might improve the contributing documentation, [let us know](https://github.com/astral-sh/ruff/discussions/5693)!
+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)
+for guidance.
 
 ### Prerequisites
 
@@ -63,15 +44,9 @@ You'll also need [Insta](https://insta.rs/docs/) to update snapshot tests:
 cargo install cargo-insta
 ```
 
-and pre-commit to run some validation checks:
-
-```shell
-pipx install pre-commit  # or `pip install pre-commit` if you have a virtualenv
-```
-
 ### Development
 
-After cloning the repository, run Ruff locally from the repository root with:
+After cloning the repository, run Ruff locally with:
 
 ```shell
 cargo run -p ruff_cli -- check /path/to/file.py --no-cache
@@ -81,9 +56,9 @@ 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 clippy --workspace --all-targets --all-features -- -D warnings  # Rust linting
-RUFF_UPDATE_SCHEMA=1 cargo test  # Rust testing and updating ruff.schema.json
-pre-commit run --all-files --show-diff-on-failure  # Rust and Python formatting, Markdown and Python linting, etc.
+cargo fmt  # Auto-formatting...
+cargo clippy --fix --workspace --all-targets --all-features  # Linting...
+cargo test  # Testing...
 ```
 
 These checks will run on GitHub Actions when you open your Pull Request, but running them locally
@@ -96,6 +71,13 @@ after running `cargo test` like so:
 cargo insta review
 ```
 
+If you have `pre-commit` [installed](https://pre-commit.com/#installation) then you can use it to
+assist with formatting and linting. The following command will run the `pre-commit` hooks:
+
+```shell
+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.
 
@@ -110,134 +92,68 @@ The vast majority of the code, including all lint rules, lives in the `ruff` cra
 At time of writing, the repository includes the following crates:
 
 - `crates/ruff`: library crate containing all lint rules and the core logic for running them.
-    If you're working on a rule, this is the crate for you.
-- `crates/ruff_benchmark`: binary crate for running micro-benchmarks.
-- `crates/ruff_cache`: library crate for caching lint results.
 - `crates/ruff_cli`: binary crate containing Ruff's command-line interface.
-- `crates/ruff_dev`: binary crate containing utilities used in the development of Ruff itself (e.g.,
-    `cargo dev generate-all`), see the [`cargo dev`](#cargo-dev) section below.
-- `crates/ruff_diagnostics`: library crate for the rule-independent abstractions in the lint
-    diagnostics APIs.
-- `crates/ruff_formatter`: library crate for language agnostic code formatting logic based on an
-    intermediate representation. The backend for `ruff_python_formatter`.
-- `crates/ruff_index`: library crate inspired by `rustc_index`.
-- `crates/ruff_macros`: proc macro crate containing macros used by Ruff.
-- `crates/ruff_python_ast`: library crate containing Python-specific AST types and utilities. Note
-    that the AST schema itself is defined in the
-    [rustpython-ast](https://github.com/astral-sh/RustPython-Parser) crate.
-- `crates/ruff_python_formatter`: library crate implementing the Python formatter. Emits an
-    intermediate representation for each node, which `ruff_formatter` prints based on the configured
-    line length.
-- `crates/ruff_python_semantic`: library crate containing Python-specific semantic analysis logic,
-    including Ruff's semantic model. Used to resolve queries like "What import does this variable
-    refer to?"
-- `crates/ruff_python_stdlib`: library crate containing Python-specific standard library data, e.g.
-    the names of all built-in exceptions and which standard library types are immutable.
-- `crates/ruff_python_trivia`: library crate containing Python-specific trivia utilities (e.g.,
-    for analyzing indentation, newlines, etc.).
-- `crates/ruff_rustpython`: library crate containing `RustPython`-specific utilities.
-- `crates/ruff_textwrap`: library crate to indent and dedent Python source code.
-- `crates/ruff_wasm`: library crate for exposing Ruff as a WebAssembly module. Powers the
-    [Ruff Playground](https://play.ruff.rs/).
+- `crates/ruff_dev`: binary crate containing utilities used in the development of Ruff itself (e.g., `cargo dev generate-all`).
+- `crates/ruff_macros`: library crate containing macros used by Ruff.
+- `crates/ruff_python`: library crate implementing Python-specific functionality (e.g., lists of standard library modules by versionb).
+- `crates/flake8_to_ruff`: binary crate for generating Ruff configuration from Flake8 configuration.
 
 ### Example: Adding a new lint rule
 
 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)
-    (e.g., `AssertFalse`, as in, "allow `assert False`").
-
-1. Create a file for your rule (e.g., `crates/ruff/src/rules/flake8_bugbear/rules/assert_false.rs`).
-
-1. In that file, define a violation struct (e.g., `pub struct AssertFalse`). You can grep for
-    `#[violation]` to see examples.
-
-1. In that file, define a function that adds the violation to the diagnostic list as appropriate
-    (e.g., `pub(crate) fn assert_false`) based on whatever inputs are required for the rule (e.g.,
-    an `ast::StmtAssert` node).
-
-1. Define the logic for invoking the diagnostic in `crates/ruff/src/checkers/ast/analyze` (for
-    AST-based rules), `crates/ruff/src/checkers/tokens.rs` (for token-based rules),
-    `crates/ruff/src/checkers/physical_lines.rs` (for text-based rules),
-    `crates/ruff/src/checkers/filesystem.rs` (for filesystem-based rules), etc. For AST-based rules,
-    you'll likely want to modify `analyze/statement.rs` (if your rule is based on analyzing
-    statements, like imports) or `analyze/expression.rs` (if your rule is based on analyzing
-    expressions, like function calls).
-
-1. Map the violation struct to a rule code in `crates/ruff/src/codes.rs` (e.g., `B011`).
-
-1. Add proper [testing](#rule-testing-fixtures-and-snapshots) for your rule.
-
+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 `#[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/mod.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).
 
-To trigger the violation, you'll likely want to augment the logic in `crates/ruff/src/checkers/ast.rs`
-to call your new function at the appropriate time and with the appropriate inputs. The `Checker`
-defined therein is a Python AST visitor, which iterates over the AST, building up a semantic model,
-and calling out to lint rule analyzer functions as it goes.
+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
+contain a struct defined via `#[violation]`, along with a function that creates the violation
+based on any required inputs.
+
+To trigger the violation, you'll likely want to augment the logic in `crates/ruff/src/checkers/ast.rs`,
+which defines the Python AST visitor, responsible for iterating over the abstract syntax tree and
+collecting diagnostics as it goes.
 
 If you need to inspect the AST, you can run `cargo dev print-ast` with a Python file. Grep
-for the `Diagnostic::new` invocations to understand how other, similar rules are implemented.
+for the `Check::new` invocations to understand how other, similar rules are implemented.
 
-Once you're satisfied with your code, add tests for your rule. See [rule testing](#rule-testing-fixtures-and-snapshots)
-for more details.
+To add a test fixture, create a file under `crates/ruff/resources/test/fixtures/[linter]`, named to match
+the code you defined earlier (e.g., `crates/ruff/resources/test/fixtures/pycodestyle/E402.py`). This file should
+contain a variety of violations and non-violations designed to evaluate and demonstrate the behavior
+of your lint rule.
 
-Finally, regenerate the documentation and other generated assets (like our JSON Schema) with:
-`cargo dev generate-all`.
+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`.
+
+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/rules/[linter]/mod.rs` file. Then, run `cargo test`.
+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.
+
+Finally, regenerate the documentation and generated code with `cargo dev generate-all`.
 
 #### Rule naming convention
 
-Like Clippy, Ruff's rule names should make grammatical and logical sense when read as "allow
-${rule}" or "allow ${rule} items", as in the context of suppression comments.
+The rule name should make sense when read as "allow _rule-name_" or "allow _rule-name_ items".
 
-For example, `AssertFalse` fits this convention: it flags `assert False` statements, and so a
-suppression comment would be framed as "allow `assert False`".
+This implies that rule names:
 
-As such, rule names should...
+- should state the bad thing being checked for
 
-- Highlight the pattern that is being linted against, rather than the preferred alternative.
-    For example, `AssertFalse` guards against `assert False` statements.
+- should not contain instructions on what you should use instead
+  (these belong in the rule documentation and the `autofix_title` for rules that have autofix)
 
-- _Not_ contain instructions on how to fix the violation, which instead belong in the rule
-    documentation and the `autofix_title`.
-
-- _Not_ contain a redundant prefix, like `Disallow` or `Banned`, which are already implied by the
-    convention.
-
-When re-implementing rules from other linters, we prioritize adhering to this convention over
+When re-implementing rules from other linters, this convention is given more importance than
 preserving the original rule name.
 
-#### Rule testing: fixtures and snapshots
-
-To test rules, Ruff uses snapshots of Ruff's output for a given file (fixture). Generally, there
-will be one file per rule (e.g., `E402.py`), and each file will contain all necessary examples of
-both violations and non-violations. `cargo insta review` will generate a snapshot file containing
-Ruff's output for each fixture, which you can then commit alongside your changes.
-
-Once you've completed the code for the rule itself, you can define tests with the following steps:
-
-1. Add a Python file to `crates/ruff/resources/test/fixtures/[linter]` that contains the code you
-    want to test. The file name should match the rule name (e.g., `E402.py`), and it should include
-    examples of both violations and non-violations.
-
-1. Run Ruff locally against your file and verify the output is as expected. Once you're satisfied
-    with the output (you see the violations you expect, and no others), proceed to the next step.
-    For example, if you're adding a new rule named `E402`, you would run:
-
-    ```shell
-    cargo run -p ruff_cli -- check crates/ruff/resources/test/fixtures/pycodestyle/E402.py --no-cache
-    ```
-
-1. Add the test to the relevant `crates/ruff/src/rules/[linter]/mod.rs` file. If you're contributing
-    a rule to a pre-existing set, you should be able to find a similar example to pattern-match
-    against. If you're adding a new linter, you'll need to create a new `mod.rs` file (see,
-    e.g., `crates/ruff/src/rules/flake8_bugbear/mod.rs`)
-
-1. Run `cargo test`. Your test will fail, but you'll be prompted to follow-up
-    with `cargo insta review`. Run `cargo insta review`, review and accept the generated snapshot,
-    then commit the snapshot file alongside the rest of your changes.
-
-1. Run `cargo test` again to ensure that your test passes.
-
 ### Example: Adding a new configuration option
 
 Ruff's user-facing settings live in a few different places.
@@ -268,29 +184,23 @@ Finally, regenerate the documentation and generated code with `cargo dev generat
 
 To preview any changes to the documentation locally:
 
-1. Install the [Rust toolchain](https://www.rust-lang.org/tools/install).
-
 1. Install MkDocs and Material for MkDocs with:
 
-    ```shell
-    pip install -r docs/requirements.txt
-    ```
+   ```shell
+   pip install -r docs/requirements.txt
+   ```
 
 1. Generate the MkDocs site with:
 
-    ```shell
-    python scripts/generate_mkdocs.py
-    ```
+   ```shell
+   python scripts/generate_mkdocs.py
+   ```
 
 1. Run the development server with:
 
-    ```shell
-    # For contributors.
-    mkdocs serve -f mkdocs.generated.yml
-
-    # For members of the Astral org, which has access to MkDocs Insiders via sponsorship.
-    mkdocs serve -f mkdocs.insiders.yml
-    ```
+   ```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/).
@@ -304,27 +214,6 @@ them to [PyPI](https://pypi.org/project/ruff/).
 Ruff follows the [semver](https://semver.org/) versioning standard. However, as pre-1.0 software,
 even patch releases may contain [non-backwards-compatible changes](https://semver.org/#spec-item-4).
 
-### Creating a new release
-
-1. Update the version with `rg 0.0.269 --files-with-matches | xargs sed -i 's/0.0.269/0.0.270/g'`
-1. Update `BREAKING_CHANGES.md`
-1. Create a PR with the version and `BREAKING_CHANGES.md` updated
-1. Merge the PR
-1. Run the release workflow with the version number (without starting `v`) as input. Make sure
-    main has your merged PR as last commit
-1. The release workflow will do the following:
-    1. Build all the assets. If this fails (even though we tested in step 4), we haven’t tagged or
-        uploaded anything, you can restart after pushing a fix.
-    1. Upload to PyPI.
-    1. Create and push the Git tag (as extracted from `pyproject.toml`). We create the Git tag only
-        after building the wheels and uploading to PyPI, since we can't delete or modify the tag ([#4468](https://github.com/charliermarsh/ruff/issues/4468)).
-    1. Attach artifacts to draft GitHub release
-    1. Trigger downstream repositories. This can fail non-catastrophically, as we can run any
-        downstream jobs manually if needed.
-1. Create release notes in GitHub UI and promote from draft.
-1. If needed, [update the schemastore](https://github.com/charliermarsh/ruff/blob/main/scripts/update_schemastore.py)
-1. If needed, update the `ruff-lsp` and `ruff-vscode` repositories.
-
 ## Ecosystem CI
 
 GitHub Actions will run your changes against a number of real-world projects from GitHub and
@@ -336,18 +225,10 @@ python scripts/check_ecosystem.py path/to/your/ruff path/to/older/ruff
 
 You can also run the Ecosystem CI check in a Docker container across a larger set of projects by
 downloading the [`known-github-tomls.json`](https://github.com/akx/ruff-usage-aggregate/blob/master/data/known-github-tomls.jsonl)
-as `github_search.jsonl` and following the instructions in [scripts/Dockerfile.ecosystem](https://github.com/astral-sh/ruff/blob/main/scripts/Dockerfile.ecosystem).
+as `github_search.jsonl` and following the instructions in [scripts/Dockerfile.ecosystem](https://github.com/charliermarsh/ruff/blob/main/scripts/Dockerfile.ecosystem).
 Note that this check will take a while to run.
 
-## Benchmarking and Profiling
-
-We have several ways of benchmarking and profiling Ruff:
-
-- Our main performance benchmark comparing Ruff with other tools on the CPython codebase
-- Microbenchmarks which the linter or the formatter on individual files. There run on pull requests.
-- Profiling the linter on either the microbenchmarks or entire projects
-
-### CPython Benchmark
+## Benchmarks
 
 First, clone [CPython](https://github.com/python/cpython). It's a large and diverse Python codebase,
 which makes it a good target for benchmarking.
@@ -359,18 +240,22 @@ git clone --branch 3.10 https://github.com/python/cpython.git crates/ruff/resour
 To benchmark the release build:
 
 ```shell
-cargo build --release && hyperfine --warmup 10 \
-  "./target/release/ruff ./crates/ruff/resources/test/cpython/ --no-cache -e" \
-  "./target/release/ruff ./crates/ruff/resources/test/cpython/ -e"
+cargo build --release && hyperfine --ignore-failure --warmup 10 \
+  "./target/release/ruff ./crates/ruff/resources/test/cpython/ --no-cache" \
+  "./target/release/ruff ./crates/ruff/resources/test/cpython/"
 
 Benchmark 1: ./target/release/ruff ./crates/ruff/resources/test/cpython/ --no-cache
   Time (mean ± σ):     293.8 ms ±   3.2 ms    [User: 2384.6 ms, System: 90.3 ms]
   Range (min … max):   289.9 ms … 301.6 ms    10 runs
 
+  Warning: Ignoring non-zero exit code.
+
 Benchmark 2: ./target/release/ruff ./crates/ruff/resources/test/cpython/
   Time (mean ± σ):      48.0 ms ±   3.1 ms    [User: 65.2 ms, System: 124.7 ms]
   Range (min … max):    45.0 ms …  66.7 ms    62 runs
 
+  Warning: Ignoring non-zero exit code.
+
 Summary
   './target/release/ruff ./crates/ruff/resources/test/cpython/' ran
     6.12 ± 0.41 times faster than './target/release/ruff ./crates/ruff/resources/test/cpython/ --no-cache'
@@ -422,16 +307,9 @@ Summary
   159.43 ± 2.48 times faster than 'pycodestyle crates/ruff/resources/test/cpython'
 ```
 
-To benchmark a subset of rules, e.g. `LineTooLong` and `DocLineTooLong`:
-
-```shell
-cargo build --release && hyperfine --warmup 10 \
-  "./target/release/ruff ./crates/ruff/resources/test/cpython/ --no-cache -e --select W505,E501"
-```
-
-You can run `poetry install` from `./scripts/benchmarks` to create a working environment for the
-above. All reported benchmarks were computed using the versions specified by
-`./scripts/benchmarks/pyproject.toml` on Python 3.11.
+You can run `poetry install` from `./scripts` to create a working environment for the above. All
+reported benchmarks were computed using the versions specified by `./scripts/pyproject.toml`
+on Python 3.11.
 
 To benchmark Pylint, remove the following files from the CPython repository:
 
@@ -472,288 +350,3 @@ Benchmark 1: find . -type f -name "*.py" | xargs -P 0 pyupgrade --py311-plus
   Time (mean ± σ):     30.119 s ±  0.195 s    [User: 28.638 s, System: 0.390 s]
   Range (min … max):   29.813 s … 30.356 s    10 runs
 ```
-
-### Microbenchmarks
-
-The `ruff_benchmark` crate benchmarks the linter and the formatter on individual files.
-
-You can run the benchmarks with
-
-```shell
-cargo benchmark
-```
-
-#### Benchmark-driven Development
-
-Ruff uses [Criterion.rs](https://bheisler.github.io/criterion.rs/book/) for benchmarks. You can use
-`--save-baseline=<name>` to store an initial baseline benchmark (e.g. on `main`) and then use
-`--benchmark=<name>` to compare against that benchmark. Criterion will print a message telling you
-if the benchmark improved/regressed compared to that baseline.
-
-```shell
-# Run once on your "baseline" code
-cargo benchmark --save-baseline=main
-
-# Then iterate with
-cargo benchmark --baseline=main
-```
-
-#### PR Summary
-
-You can use `--save-baseline` and `critcmp` to get a pretty comparison between two recordings.
-This is useful to illustrate the improvements of a PR.
-
-```shell
-# On main
-cargo benchmark --save-baseline=main
-
-# After applying your changes
-cargo benchmark --save-baseline=pr
-
-critcmp main pr
-```
-
-You must install [`critcmp`](https://github.com/BurntSushi/critcmp) for the comparison.
-
-```bash
-cargo install critcmp
-```
-
-#### Tips
-
-- Use `cargo benchmark <filter>` to only run specific benchmarks. For example: `cargo benchmark linter/pydantic`
-    to only run the pydantic tests.
-- Use `cargo benchmark --quiet` for a more cleaned up output (without statistical relevance)
-- Use `cargo benchmark --quick` to get faster results (more prone to noise)
-
-### Profiling Projects
-
-You can either use the microbenchmarks from above or a project directory for benchmarking. There
-are a lot of profiling tools out there,
-[The Rust Performance Book](https://nnethercote.github.io/perf-book/profiling.html) lists some
-examples.
-
-#### Linux
-
-Install `perf` and build `ruff_benchmark` with the `release-debug` profile and then run it with perf
-
-```shell
-cargo bench -p ruff_benchmark --no-run --profile=release-debug && perf record --call-graph dwarf -F 9999 cargo bench -p ruff_benchmark --profile=release-debug -- --profile-time=1
-```
-
-You can also use the `ruff_dev` launcher to run `ruff check` multiple times on a repository to
-gather enough samples for a good flamegraph (change the 999, the sample rate, and the 30, the number
-of checks, to your liking)
-
-```shell
-cargo build --bin ruff_dev --profile=release-debug
-perf record -g -F 999 target/release-debug/ruff_dev repeat --repeat 30 --exit-zero --no-cache path/to/cpython > /dev/null
-```
-
-Then convert the recorded profile
-
-```shell
-perf script -F +pid > /tmp/test.perf
-```
-
-You can now view the converted file with [firefox profiler](https://profiler.firefox.com/), with a
-more in-depth guide [here](https://profiler.firefox.com/docs/#/./guide-perf-profiling)
-
-An alternative is to convert the perf data to `flamegraph.svg` using
-[flamegraph](https://github.com/flamegraph-rs/flamegraph) (`cargo install flamegraph`):
-
-```shell
-flamegraph --perfdata perf.data
-```
-
-#### Mac
-
-Install [`cargo-instruments`](https://crates.io/crates/cargo-instruments):
-
-```shell
-cargo install cargo-instruments
-```
-
-Then run the profiler with
-
-```shell
-cargo instruments -t time --bench linter --profile release-debug -p ruff_benchmark -- --profile-time=1
-```
-
-- `-t`: Specifies what to profile. Useful options are `time` to profile the wall time and `alloc`
-    for profiling the allocations.
-- You may want to pass an additional filter to run a single test file
-
-Otherwise, follow the instructions from the linux section.
-
-## `cargo dev`
-
-`cargo dev` is a shortcut for `cargo run --package ruff_dev --bin ruff_dev`. You can run some useful
-utils with it:
-
-- `cargo dev print-ast <file>`: Print the AST of a python file using the
-    [RustPython parser](https://github.com/astral-sh/RustPython-Parser/tree/main/parser) that is
-    mainly used in Ruff. For `if True: pass # comment`, you can see the syntax tree, the byte offsets
-    for start and stop of each node and also how the `:` token, the comment and whitespace are not
-    represented anymore:
-
-```text
-[
-    If(
-        StmtIf {
-            range: 0..13,
-            test: Constant(
-                ExprConstant {
-                    range: 3..7,
-                    value: Bool(
-                        true,
-                    ),
-                    kind: None,
-                },
-            ),
-            body: [
-                Pass(
-                    StmtPass {
-                        range: 9..13,
-                    },
-                ),
-            ],
-            orelse: [],
-        },
-    ),
-]
-```
-
-- `cargo dev print-tokens <file>`: Print the tokens that the AST is built upon. Again for
-    `if True: pass # comment`:
-
-```text
-0 If 2
-3 True 7
-7 Colon 8
-9 Pass 13
-14 Comment(
-    "# comment",
-) 23
-23 Newline 24
-```
-
-- `cargo dev print-cst <file>`: Print the CST of a python file using
-    [LibCST](https://github.com/Instagram/LibCST), which is used in addition to the RustPython parser
-    in Ruff. E.g. for `if True: pass # comment` everything including the whitespace is represented:
-
-```text
-Module {
-    body: [
-        Compound(
-            If(
-                If {
-                    test: Name(
-                        Name {
-                            value: "True",
-                            lpar: [],
-                            rpar: [],
-                        },
-                    ),
-                    body: SimpleStatementSuite(
-                        SimpleStatementSuite {
-                            body: [
-                                Pass(
-                                    Pass {
-                                        semicolon: None,
-                                    },
-                                ),
-                            ],
-                            leading_whitespace: SimpleWhitespace(
-                                " ",
-                            ),
-                            trailing_whitespace: TrailingWhitespace {
-                                whitespace: SimpleWhitespace(
-                                    " ",
-                                ),
-                                comment: Some(
-                                    Comment(
-                                        "# comment",
-                                    ),
-                                ),
-                                newline: Newline(
-                                    None,
-                                    Real,
-                                ),
-                            },
-                        },
-                    ),
-                    orelse: None,
-                    leading_lines: [],
-                    whitespace_before_test: SimpleWhitespace(
-                        " ",
-                    ),
-                    whitespace_after_test: SimpleWhitespace(
-                        "",
-                    ),
-                    is_elif: false,
-                },
-            ),
-        ),
-    ],
-    header: [],
-    footer: [],
-    default_indent: "    ",
-    default_newline: "\n",
-    has_trailing_newline: true,
-    encoding: "utf-8",
-}
-```
-
-- `cargo dev generate-all`: Update `ruff.schema.json`, `docs/configuration.md` and `docs/rules`.
-    You can also set `RUFF_UPDATE_SCHEMA=1` to update `ruff.schema.json` during `cargo test`.
-- `cargo dev generate-cli-help`, `cargo dev generate-docs` and `cargo dev generate-json-schema`:
-    Update just `docs/configuration.md`, `docs/rules` and `ruff.schema.json` respectively.
-- `cargo dev generate-options`: Generate a markdown-compatible table of all `pyproject.toml`
-    options. Used for <https://beta.ruff.rs/docs/settings/>
-- `cargo dev generate-rules-table`: Generate a markdown-compatible table of all rules. Used for <https://beta.ruff.rs/docs/rules/>
-- `cargo dev round-trip <python file or jupyter notebook>`: Read a Python file or Jupyter Notebook,
-    parse it, serialize the parsed representation and write it back. Used to check how good our
-    representation is so that fixes don't rewrite irrelevant parts of a file.
-- `cargo dev format_dev`: See ruff_python_formatter README.md
-
-## Subsystems
-
-### Compilation Pipeline
-
-If we view Ruff as a compiler, in which the inputs are paths to Python files and the outputs are
-diagnostics, then our current compilation pipeline proceeds as follows:
-
-1. **File discovery**: Given paths like `foo/`, locate all Python files in any specified subdirectories, taking into account our hierarchical settings system and any `exclude` options.
-
-1. **Package resolution**: Determine the “package root” for every file by traversing over its parent directories and looking for `__init__.py` files.
-
-1. **Cache initialization**: For every “package root”, initialize an empty cache.
-
-1. **Analysis**: For every file, in parallel:
-
-    1. **Cache read**: If the file is cached (i.e., its modification timestamp hasn't changed since it was last analyzed), short-circuit, and return the cached diagnostics.
-
-    1. **Tokenization**: Run the lexer over the file to generate a token stream.
-
-    1. **Indexing**: Extract metadata from the token stream, such as: comment ranges, `# noqa` locations, `# isort: off` locations, “doc lines”, etc.
-
-    1. **Token-based rule evaluation**: Run any lint rules that are based on the contents of the token stream (e.g., commented-out code).
-
-    1. **Filesystem-based rule evaluation**: Run any lint rules that are based on the contents of the filesystem (e.g., lack of `__init__.py` file in a package).
-
-    1. **Logical line-based rule evaluation**: Run any lint rules that are based on logical lines (e.g., stylistic rules).
-
-    1. **Parsing**: Run the parser over the token stream to produce an AST. (This consumes the token stream, so anything that relies on the token stream needs to happen before parsing.)
-
-    1. **AST-based rule evaluation**: Run any lint rules that are based on the AST. This includes the vast majority of lint rules. As part of this step, we also build the semantic model for the current file as we traverse over the AST. Some lint rules are evaluated eagerly, as we iterate over the AST, while others are evaluated in a deferred manner (e.g., unused imports, since we can’t determine whether an import is unused until we’ve finished analyzing the entire file), after we’ve finished the initial traversal.
-
-    1. **Import-based rule evaluation**: Run any lint rules that are based on the module’s imports (e.g., import sorting). These could, in theory, be included in the AST-based rule evaluation phase — they’re just separated for simplicity.
-
-    1. **Physical line-based rule evaluation**: Run any lint rules that are based on physical lines (e.g., line-length).
-
-    1. **Suppression enforcement**: Remove any violations that are suppressed via `# noqa` directives or `per-file-ignores`.
-
-    1. **Cache write**: Write the generated diagnostics to the package cache using the file as a key.
-
-1. **Reporting**: Print diagnostics in the specified format (text, JSON, etc.), to the specified output channel (stdout, a file, etc.).

Cargo.toml

@@ -1,15 +1,13 @@
 [workspace]
 members = ["crates/*"]
-resolver = "2"
 
 [workspace.package]
 edition = "2021"
-rust-version = "1.70"
-homepage = "https://beta.ruff.rs/docs"
-documentation = "https://beta.ruff.rs/docs"
-repository = "https://github.com/astral-sh/ruff"
+rust-version = "1.69"
+homepage = "https://beta.ruff.rs/docs/"
+documentation = "https://beta.ruff.rs/docs/"
+repository = "https://github.com/charliermarsh/ruff"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
-license = "MIT"
 
 [workspace.dependencies]
 anyhow = { version = "1.0.69" }
@@ -21,45 +19,37 @@ filetime = { version = "0.2.20" }
 glob = { version = "0.3.1" }
 globset = { version = "0.4.10" }
 ignore = { version = "0.4.20" }
-insta = { version = "1.31.0", feature = ["filters", "glob"] }
+insta = { version = "1.28.0" }
 is-macro = { version = "0.2.2" }
 itertools = { version = "0.10.5" }
+libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "80e4c1399f95e5beb532fdd1e209ad2dbb470438" }
 log = { version = "0.4.17" }
-memchr = "2.5.0"
-num-bigint = { version = "0.4.3" }
-num-traits = { version = "0.2.15" }
+nohash-hasher = { version = "0.2.0" }
 once_cell = { version = "1.17.1" }
 path-absolutize = { version = "3.0.14" }
 proc-macro2 = { version = "1.0.51" }
 quote = { version = "1.0.23" }
 regex = { version = "1.7.1" }
 rustc-hash = { version = "1.1.0" }
+ruff_text_size = { git = "https://github.com/RustPython/Parser.git", rev = "3654cf0bdfc270df6b2b83e2df086843574ad082" }
+rustpython-format = { git = "https://github.com/RustPython/Parser.git", rev = "3654cf0bdfc270df6b2b83e2df086843574ad082" }
+rustpython-literal = { git = "https://github.com/RustPython/Parser.git", rev = "3654cf0bdfc270df6b2b83e2df086843574ad082" }
+rustpython-parser = { git = "https://github.com/RustPython/Parser.git", rev = "3654cf0bdfc270df6b2b83e2df086843574ad082", default-features = false, features = ["full-lexer", "all-nodes-with-ranges"] }
 schemars = { version = "0.8.12" }
 serde = { version = "1.0.152", features = ["derive"] }
-serde_json = { version = "1.0.93" }
+serde_json = { version = "1.0.93", features = ["preserve_order"] }
 shellexpand = { version = "3.0.0" }
-similar = { version = "2.2.1", features = ["inline"] }
+similar = { version = "2.2.1" }
 smallvec = { version = "1.10.0" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
 syn = { version = "2.0.15" }
 test-case = { version = "3.0.0" }
-thiserror = { version = "1.0.43" }
+textwrap = { version = "0.16.0" }
 toml = { version = "0.7.2" }
-wsl = { version = "0.1.0" }
-
-# v1.0.1
-libcst = { git = "https://github.com/Instagram/LibCST.git", rev = "3cacca1a1029f05707e50703b49fe3dd860aa839", default-features = false }
-
-ruff_text_size = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "4d03b9b5b212fc869e4cfda151414438186a7779" }
-rustpython-ast = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "4d03b9b5b212fc869e4cfda151414438186a7779" , default-features = false, features = ["num-bigint"]}
-rustpython-format = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "4d03b9b5b212fc869e4cfda151414438186a7779", default-features = false, features = ["num-bigint"] }
-rustpython-literal = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "4d03b9b5b212fc869e4cfda151414438186a7779", default-features = false }
-rustpython-parser = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "4d03b9b5b212fc869e4cfda151414438186a7779" , default-features = false, features = ["full-lexer", "num-bigint"] }
 
 [profile.release]
 lto = "fat"
-codegen-units = 1
 
 [profile.dev.package.insta]
 opt-level = 3

LICENSE

@@ -354,29 +354,6 @@ are:
     SOFTWARE.
   """
 
-- flake8-slots, licensed as follows:
-  """
-    Copyright (c) 2021 Dominic Davis-Foster
-
-    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.
-  """
-
 - flake8-todos, licensed as follows:
   """
     Copyright (c) 2019 EclecticIQ. All rights reserved.
@@ -1199,57 +1176,6 @@ are:
 
 - flake8-django, licensed under the GPL license.
 
-- perflint, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2022 Anthony Shaw
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
-  """
-
-- Pyright, licensed as follows:
-  """
-    MIT License
-
-    Pyright - A static type checker for the Python language
-    Copyright (c) Microsoft Corporation. All rights reserved.
-
-    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
-  """
-
 - rust-analyzer/text-size, licensed under the MIT license:
   """
     Permission is hereby granted, free of charge, to any

README.md

@@ -2,11 +2,11 @@
 
 # Ruff
 
-[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/charliermarsh/ruff)
 [![image](https://img.shields.io/pypi/v/ruff.svg)](https://pypi.python.org/pypi/ruff)
 [![image](https://img.shields.io/pypi/l/ruff.svg)](https://pypi.python.org/pypi/ruff)
 [![image](https://img.shields.io/pypi/pyversions/ruff.svg)](https://pypi.python.org/pypi/ruff)
-[![Actions status](https://github.com/astral-sh/ruff/workflows/CI/badge.svg)](https://github.com/astral-sh/ruff/actions)
+[![Actions status](https://github.com/charliermarsh/ruff/workflows/CI/badge.svg)](https://github.com/charliermarsh/ruff/actions)
 
 [**Discord**](https://discord.gg/c9MhzV8aU5) | [**Docs**](https://beta.ruff.rs/docs/) | [**Playground**](https://play.ruff.rs/)
 
@@ -14,9 +14,9 @@ An extremely fast Python linter, written in Rust.
 
 <p align="center">
   <picture align="center">
-    <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/1309177/232603514-c95e9b0f-6b31-43de-9a80-9e844173fd6a.svg">
-    <source media="(prefers-color-scheme: light)" srcset="https://user-images.githubusercontent.com/1309177/232603516-4fb4892d-585c-4b20-b810-3db9161831e4.svg">
-    <img alt="Shows a bar chart with benchmark results." src="https://user-images.githubusercontent.com/1309177/232603516-4fb4892d-585c-4b20-b810-3db9161831e4.svg">
+    <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/1309177/212613422-7faaf278-706b-4294-ad92-236ffcab3430.svg">
+    <source media="(prefers-color-scheme: light)" srcset="https://user-images.githubusercontent.com/1309177/212613257-5f4bca12-6d6b-4c79-9bac-51a4c6d08928.svg">
+    <img alt="Shows a bar chart with benchmark results." src="https://user-images.githubusercontent.com/1309177/212613257-5f4bca12-6d6b-4c79-9bac-51a4c6d08928.svg">
   </picture>
 </p>
 
@@ -24,19 +24,17 @@ An extremely fast Python linter, written in Rust.
   <i>Linting the CPython codebase from scratch.</i>
 </p>
 
-- ⚡️ 10-100x faster than existing linters
-- 🐍 Installable via `pip`
-- 🛠️ `pyproject.toml` support
-- 🤝 Python 3.11 compatibility
-- 📦 Built-in caching, to avoid re-analyzing unchanged files
-- 🔧 Autofix support, for automatic error correction (e.g., automatically remove unused imports)
-- 📏 Over [500 built-in rules](https://beta.ruff.rs/docs/rules/)
-- ⚖️ [Near-parity](https://beta.ruff.rs/docs/faq/#how-does-ruff-compare-to-flake8) with the
-    built-in Flake8 rule set
-- 🔌 Native re-implementations of dozens of Flake8 plugins, like flake8-bugbear
-- ⌨️ First-party [editor integrations](https://beta.ruff.rs/docs/editor-integrations/) for
-    [VS Code](https://github.com/astral-sh/ruff-vscode) and [more](https://github.com/astral-sh/ruff-lsp)
-- 🌎 Monorepo-friendly, with [hierarchical and cascading configuration](https://beta.ruff.rs/docs/configuration/#pyprojecttoml-discovery)
+- ⚡️  10-100x faster than existing linters
+- 🐍  Installable via `pip`
+- 🛠️  `pyproject.toml` support
+- 🤝  Python 3.11 compatibility
+- 📦  Built-in caching, to avoid re-analyzing unchanged files
+- 🔧  Autofix support, for automatic error correction (e.g., automatically remove unused imports)
+- 📏  Over [500 built-in rules](https://beta.ruff.rs/docs/rules/)
+- ⚖️  [Near-parity](https://beta.ruff.rs/docs/faq/#how-does-ruff-compare-to-flake8) with the built-in Flake8 rule set
+- 🔌  Native re-implementations of dozens of Flake8 plugins, like flake8-bugbear
+- ⌨️  First-party editor integrations for [VS Code](https://github.com/charliermarsh/ruff-vscode) and [more](https://github.com/charliermarsh/ruff-lsp)
+- 🌎  Monorepo-friendly, with [hierarchical and cascading configuration](https://beta.ruff.rs/docs/configuration/#pyprojecttoml-discovery)
 
 Ruff aims to be orders of magnitude faster than alternative tools while integrating more
 functionality behind a single, common interface.
@@ -86,10 +84,9 @@ of [Conda](https://docs.conda.io/en/latest/):
 [**Timothy Crosley**](https://twitter.com/timothycrosley/status/1606420868514877440),
 creator of [isort](https://github.com/PyCQA/isort):
 
-> Just switched my first project to Ruff. Only one downside so far: it's so fast I couldn't believe
-> it was working till I intentionally introduced some errors.
+> Just switched my first project to Ruff. Only one downside so far: it's so fast I couldn't believe it was working till I intentionally introduced some errors.
 
-[**Tim Abbott**](https://github.com/astral-sh/ruff/issues/465#issuecomment-1317400028), lead
+[**Tim Abbott**](https://github.com/charliermarsh/ruff/issues/465#issuecomment-1317400028), lead
 developer of [Zulip](https://github.com/zulip/zulip):
 
 > This is just ridiculously fast... `ruff` is amazing.
@@ -138,15 +135,15 @@ ruff check path/to/code/to/file.py  # Lint `file.py`
 Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 
 ```yaml
-- repo: https://github.com/astral-sh/ruff-pre-commit
+- repo: https://github.com/charliermarsh/ruff-pre-commit
   # Ruff version.
-  rev: v0.0.280
+  rev: 'v0.0.269'
   hooks:
     - id: ruff
 ```
 
-Ruff can also be used as a [VS Code extension](https://github.com/astral-sh/ruff-vscode) or
-alongside any other editor through the [Ruff LSP](https://github.com/astral-sh/ruff-lsp).
+Ruff can also be used as a [VS Code extension](https://github.com/charliermarsh/ruff-vscode) or
+alongside any other editor through the [Ruff LSP](https://github.com/charliermarsh/ruff-lsp).
 
 Ruff can also be used as a [GitHub Action](https://github.com/features/actions) via
 [`ruff-action`](https://github.com/chartboost/ruff-action):
@@ -245,8 +242,6 @@ stylistic rules made obsolete by the use of an autoformatter, like
 If you're just getting started with Ruff, **the default rule set is a great place to start**: it
 catches a wide variety of common errors (like unused imports) with zero configuration.
 
-<!-- End section: Rules -->
-
 Beyond the defaults, Ruff re-implements some of the most popular Flake8 plugins and related code
 quality tools, including:
 
@@ -255,14 +250,13 @@ quality tools, including:
 - [flake8-2020](https://pypi.org/project/flake8-2020/)
 - [flake8-annotations](https://pypi.org/project/flake8-annotations/)
 - [flake8-async](https://pypi.org/project/flake8-async)
-- [flake8-bandit](https://pypi.org/project/flake8-bandit/) ([#1646](https://github.com/astral-sh/ruff/issues/1646))
+- [flake8-bandit](https://pypi.org/project/flake8-bandit/) ([#1646](https://github.com/charliermarsh/ruff/issues/1646))
 - [flake8-blind-except](https://pypi.org/project/flake8-blind-except/)
 - [flake8-boolean-trap](https://pypi.org/project/flake8-boolean-trap/)
 - [flake8-bugbear](https://pypi.org/project/flake8-bugbear/)
 - [flake8-builtins](https://pypi.org/project/flake8-builtins/)
 - [flake8-commas](https://pypi.org/project/flake8-commas/)
 - [flake8-comprehensions](https://pypi.org/project/flake8-comprehensions/)
-- [flake8-copyright](https://pypi.org/project/flake8-copyright/)
 - [flake8-datetimez](https://pypi.org/project/flake8-datetimez/)
 - [flake8-debugger](https://pypi.org/project/flake8-debugger/)
 - [flake8-django](https://pypi.org/project/flake8-django/)
@@ -285,24 +279,24 @@ quality tools, including:
 - [flake8-return](https://pypi.org/project/flake8-return/)
 - [flake8-self](https://pypi.org/project/flake8-self/)
 - [flake8-simplify](https://pypi.org/project/flake8-simplify/)
-- [flake8-slots](https://pypi.org/project/flake8-slots/)
 - [flake8-super](https://pypi.org/project/flake8-super/)
 - [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports/)
 - [flake8-todos](https://pypi.org/project/flake8-todos/)
 - [flake8-type-checking](https://pypi.org/project/flake8-type-checking/)
 - [flake8-use-pathlib](https://pypi.org/project/flake8-use-pathlib/)
-- [flynt](https://pypi.org/project/flynt/) ([#2102](https://github.com/astral-sh/ruff/issues/2102))
+- [flynt](https://pypi.org/project/flynt/) ([#2102](https://github.com/charliermarsh/ruff/issues/2102))
 - [isort](https://pypi.org/project/isort/)
 - [mccabe](https://pypi.org/project/mccabe/)
 - [pandas-vet](https://pypi.org/project/pandas-vet/)
 - [pep8-naming](https://pypi.org/project/pep8-naming/)
 - [pydocstyle](https://pypi.org/project/pydocstyle/)
 - [pygrep-hooks](https://github.com/pre-commit/pygrep-hooks)
-- [pylint-airflow](https://pypi.org/project/pylint-airflow/)
 - [pyupgrade](https://pypi.org/project/pyupgrade/)
 - [tryceratops](https://pypi.org/project/tryceratops/)
 - [yesqa](https://pypi.org/project/yesqa/)
 
+<!-- End section: Rules -->
+
 For a complete enumeration of the supported rules, see [_Rules_](https://beta.ruff.rs/docs/rules/).
 
 ## Contributing
@@ -314,8 +308,8 @@ You can also join us on [**Discord**](https://discord.gg/c9MhzV8aU5).
 
 ## Support
 
-Having trouble? Check out the existing issues on [**GitHub**](https://github.com/astral-sh/ruff/issues),
-or feel free to [**open a new one**](https://github.com/astral-sh/ruff/issues/new).
+Having trouble? Check out the existing issues on [**GitHub**](https://github.com/charliermarsh/ruff/issues),
+or feel free to [**open a new one**](https://github.com/charliermarsh/ruff/issues/new).
 
 You can also ask for help on [**Discord**](https://discord.gg/c9MhzV8aU5).
 
@@ -331,15 +325,13 @@ We're grateful to the maintainers of these tools for their work, and for all
 the value they've provided to the Python community.
 
 Ruff's autoformatter is built on a fork of Rome's [`rome_formatter`](https://github.com/rome/tools/tree/main/crates/rome_formatter),
-and again draws on both API and implementation details from [Rome](https://github.com/rome/tools),
+and again draws on both the APIs and implementation details of [Rome](https://github.com/rome/tools),
 [Prettier](https://github.com/prettier/prettier), and [Black](https://github.com/psf/black).
 
-Ruff's import resolver is based on the import resolution algorithm from [Pyright](https://github.com/microsoft/pyright).
-
 Ruff is also influenced by a number of tools outside the Python ecosystem, like
 [Clippy](https://github.com/rust-lang/rust-clippy) and [ESLint](https://github.com/eslint/eslint).
 
-Ruff is the beneficiary of a large number of [contributors](https://github.com/astral-sh/ruff/graphs/contributors).
+Ruff is the beneficiary of a large number of [contributors](https://github.com/charliermarsh/ruff/graphs/contributors).
 
 Ruff is released under the MIT license.
 
@@ -348,7 +340,6 @@ Ruff is released under the MIT license.
 Ruff is used by a number of major open-source projects and companies, including:
 
 - Amazon ([AWS SAM](https://github.com/aws/serverless-application-model))
-- Anthropic ([Python SDK](https://github.com/anthropics/anthropic-sdk-python))
 - [Apache Airflow](https://github.com/apache/airflow)
 - AstraZeneca ([Magnus](https://github.com/AstraZeneca/magnus-core))
 - Benchling ([Refac](https://github.com/benchling/refac))
@@ -358,30 +349,22 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [DVC](https://github.com/iterative/dvc)
 - [Dagger](https://github.com/dagger/dagger)
 - [Dagster](https://github.com/dagster-io/dagster)
-- Databricks ([MLflow](https://github.com/mlflow/mlflow))
 - [FastAPI](https://github.com/tiangolo/fastapi)
 - [Gradio](https://github.com/gradio-app/gradio)
 - [Great Expectations](https://github.com/great-expectations/great_expectations)
-- [HTTPX](https://github.com/encode/httpx)
-- Hugging Face ([Transformers](https://github.com/huggingface/transformers),
-    [Datasets](https://github.com/huggingface/datasets),
-    [Diffusers](https://github.com/huggingface/diffusers))
+- Hugging Face ([Transformers](https://github.com/huggingface/transformers), [Datasets](https://github.com/huggingface/datasets), [Diffusers](https://github.com/huggingface/diffusers))
 - [Hatch](https://github.com/pypa/hatch)
 - [Home Assistant](https://github.com/home-assistant/core)
-- ING Bank ([popmon](https://github.com/ing-bank/popmon), [probatus](https://github.com/ing-bank/probatus))
 - [Ibis](https://github.com/ibis-project/ibis)
 - [Jupyter](https://github.com/jupyter-server/jupyter_server)
 - [LangChain](https://github.com/hwchase17/langchain)
 - [LlamaIndex](https://github.com/jerryjliu/llama_index)
 - Matrix ([Synapse](https://github.com/matrix-org/synapse))
-- [MegaLinter](https://github.com/oxsecurity/megalinter)
 - Meltano ([Meltano CLI](https://github.com/meltano/meltano), [Singer SDK](https://github.com/meltano/sdk))
-- Microsoft ([Semantic Kernel](https://github.com/microsoft/semantic-kernel),
-    [ONNX Runtime](https://github.com/microsoft/onnxruntime),
-    [LightGBM](https://github.com/microsoft/LightGBM))
 - Modern Treasury ([Python SDK](https://github.com/Modern-Treasury/modern-treasury-python-sdk))
 - Mozilla ([Firefox](https://github.com/mozilla/gecko-dev))
-- [Mypy](https://github.com/python/mypy)
+- [MegaLinter](https://github.com/oxsecurity/megalinter)
+- Microsoft ([Semantic Kernel](https://github.com/microsoft/semantic-kernel), [ONNX Runtime](https://github.com/microsoft/onnxruntime), [LightGBM](https://github.com/microsoft/LightGBM))
 - Netflix ([Dispatch](https://github.com/Netflix/dispatch))
 - [Neon](https://github.com/neondatabase/neon)
 - [ONNX](https://github.com/onnx/onnx)
@@ -397,7 +380,7 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [PyTorch](https://github.com/pytorch/pytorch)
 - [Pydantic](https://github.com/pydantic/pydantic)
 - [Pylint](https://github.com/PyCQA/pylint)
-- [Reflex](https://github.com/reflex-dev/reflex)
+- [Pynecone](https://github.com/pynecone-io/pynecone)
 - [Robyn](https://github.com/sansyrox/robyn)
 - Scale AI ([Launch SDK](https://github.com/scaleapi/launch-python-client))
 - Snowflake ([SnowCLI](https://github.com/Snowflake-Labs/snowcli))
@@ -417,28 +400,27 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [featuretools](https://github.com/alteryx/featuretools)
 - [meson-python](https://github.com/mesonbuild/meson-python)
 - [nox](https://github.com/wntrblm/nox)
-- [pip](https://github.com/pypa/pip)
 
 ### Show Your Support
 
 If you're using Ruff, consider adding the Ruff badge to project's `README.md`:
 
 ```md
-[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/charliermarsh/ruff)
 ```
 
 ...or `README.rst`:
 
 ```rst
 .. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
-    :target: https://github.com/astral-sh/ruff
+    :target: https://github.com/charliermarsh/ruff
     :alt: Ruff
 ```
 
 ...or, as HTML:
 
 ```html
-<a href="https://github.com/astral-sh/ruff"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json" alt="Ruff" style="max-width:100%;"></a>
+<a href="https://github.com/charliermarsh/ruff"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json" alt="Ruff" style="max-width:100%;"></a>
 ```
 
 ## License

_typos.toml

@@ -1,10 +1,10 @@
 [files]
-extend-exclude = ["resources", "snapshots"]
+extend-exclude = ["snapshots", "black"]
 
 [default.extend-words]
+trivias = "trivias"
 hel = "hel"
 whos = "whos"
 spawnve = "spawnve"
 ned = "ned"
 poit = "poit"
-BA = "BA" # acronym for "Bad Allowed", used in testing.

crates/flake8_to_ruff/Cargo.toml

@@ -1,16 +1,8 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.280"
-description = """
-Convert Flake8 configuration files to Ruff configuration files.
-"""
-authors = { workspace = true }
+version = "0.0.269"
 edition = { workspace = true }
 rust-version = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-repository = { workspace = true }
-license = { workspace = true }
 
 [dependencies]
 ruff = { path = "../ruff", default-features = false }

crates/flake8_to_ruff/README.md

@@ -1,7 +1,7 @@
 # flake8-to-ruff
 
 Convert existing Flake8 configuration files (`setup.cfg`, `tox.ini`, or `.flake8`) for use with
-[Ruff](https://github.com/astral-sh/ruff).
+[Ruff](https://github.com/charliermarsh/ruff).
 
 Generates a Ruff-compatible `pyproject.toml` section.
 
@@ -82,12 +82,12 @@ flake8-to-ruff path/to/.flake8 --plugin flake8-builtins --plugin flake8-quotes
 ## Limitations
 
 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.)
+   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
-    codes from unsupported plugins. (See the
-    [documentation](https://beta.ruff.rs/docs/faq/#how-does-ruff-compare-to-flake8) for the complete
-    list of supported plugins.)
+   codes from unsupported plugins. (See the
+   [documentation](https://beta.ruff.rs/docs/faq/#how-does-ruff-compare-to-flake8) for the complete
+   list of supported plugins.)
 
 ## License
 
@@ -96,4 +96,4 @@ MIT
 ## Contributing
 
 Contributions are welcome and hugely appreciated. To get started, check out the
-[contributing guidelines](https://github.com/astral-sh/ruff/blob/main/CONTRIBUTING.md).
+[contributing guidelines](https://github.com/charliermarsh/ruff/blob/main/CONTRIBUTING.md).

crates/flake8_to_ruff/pyproject.toml

@@ -23,10 +23,10 @@ description = "Convert existing Flake8 configuration to Ruff."
 requires-python = ">=3.7"
 
 [project.urls]
-repository = "https://github.com/astral-sh/ruff#subdirectory=crates/flake8_to_ruff"
+repository = "https://github.com/charliermarsh/ruff#subdirectory=crates/flake8_to_ruff"
 
 [build-system]
-requires = ["maturin>=1.0,<2.0"]
+requires = ["maturin>=0.15.2,<0.16"]
 build-backend = "maturin"
 
 [tool.maturin]

crates/ruff/Cargo.toml

@@ -1,15 +1,14 @@
 [package]
 name = "ruff"
-version = "0.0.280"
-publish = false
-authors = { workspace = true }
-edition = { workspace = true }
-rust-version = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-repository = { workspace = true }
-license = { workspace = true }
+version = "0.0.269"
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+documentation.workspace = true
+homepage.workspace = true
+repository.workspace = true
 readme = "README.md"
+license = "MIT"
 
 [lib]
 name = "ruff"
@@ -17,15 +16,12 @@ name = "ruff"
 [dependencies]
 ruff_cache = { path = "../ruff_cache" }
 ruff_diagnostics = { path = "../ruff_diagnostics", features = ["serde"] }
-ruff_index = { path = "../ruff_index" }
 ruff_macros = { path = "../ruff_macros" }
-ruff_python_trivia = { path = "../ruff_python_trivia" }
 ruff_python_ast = { path = "../ruff_python_ast", features = ["serde"] }
 ruff_python_semantic = { path = "../ruff_python_semantic" }
 ruff_python_stdlib = { path = "../ruff_python_stdlib" }
 ruff_rustpython = { path = "../ruff_rustpython" }
 ruff_text_size = { workspace = true }
-ruff_textwrap = { path = "../ruff_textwrap" }
 
 annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { workspace = true }
@@ -43,10 +39,10 @@ is-macro = { workspace = true }
 itertools = { workspace = true }
 libcst = { workspace = true }
 log = { workspace = true }
-memchr = { workspace = true }
 natord = { version = "1.0.9" }
-num-bigint = { workspace = true }
-num-traits = { workspace = true }
+nohash-hasher = { workspace = true }
+num-bigint = { version = "0.4.3" }
+num-traits = { version = "0.2.15" }
 once_cell = { workspace = true }
 path-absolutize = { workspace = true, features = [
   "once_cell_cache",
@@ -54,7 +50,6 @@ path-absolutize = { workspace = true, features = [
 ] }
 pathdiff = { version = "0.2.1" }
 pep440_rs = { version = "0.3.1", features = ["serde"] }
-pyproject-toml = { version = "0.6.0" }
 quick-junit = { version = "0.3.2" }
 regex = { workspace = true }
 result-like = { version = "0.4.6" }
@@ -65,18 +60,16 @@ schemars = { workspace = true, optional = true }
 semver = { version = "1.0.16" }
 serde = { workspace = true }
 serde_json = { workspace = true }
-serde_with = { version = "3.0.0" }
-similar = { workspace = true }
+similar = { workspace = true, features = ["inline"] }
 shellexpand = { workspace = true }
 smallvec = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
-thiserror = { version = "1.0.43" }
+textwrap = { workspace = true }
+thiserror = { version = "1.0.38" }
 toml = { workspace = true }
 typed-arena = { version = "2.0.2" }
 unicode-width = { version = "0.1.10" }
-unicode_names2 = { version = "0.6.0", git = "https://github.com/youknowone/unicode_names2.git", rev = "4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" }
-wsl = { version = "0.1.0" }
 
 [dev-dependencies]
 insta = { workspace = true }
@@ -84,10 +77,9 @@ pretty_assertions = "1.3.0"
 test-case = { workspace = true }
 # Disable colored output in tests
 colored = { workspace = true, features = ["no-color"] }
-tempfile = "3.6.0"
 
 [features]
 default = []
 schemars = ["dep:schemars"]
-# Enables the UnreachableCode rule
-unreachable-code = []
+jupyter_notebook = []
+ecosystem_ci = []

crates/ruff/resources/test/fixtures/airflow/AIR001.py

@@ -1,16 +0,0 @@
-from airflow.operators import PythonOperator
-
-
-def my_callable():
-    pass
-
-
-my_task = PythonOperator(task_id="my_task", callable=my_callable)
-my_task_2 = PythonOperator(callable=my_callable, task_id="my_task_2")
-
-incorrect_name = PythonOperator(task_id="my_task")
-incorrect_name_2 = PythonOperator(callable=my_callable, task_id="my_task_2")
-
-from my_module import MyClass
-
-incorrect_name = MyClass(task_id="my_task")

crates/ruff/resources/test/fixtures/control-flow-graph/assert.py

@@ -1,11 +0,0 @@
-def func():
-    assert True
-
-def func():
-    assert False
-
-def func():
-    assert True, "oops"
-
-def func():
-    assert False, "oops"

crates/ruff/resources/test/fixtures/control-flow-graph/async-for.py

@@ -1,41 +0,0 @@
-def func():
-    async for i in range(5):
-        print(i)
-
-def func():
-    async for i in range(20):
-        print(i)
-    else:
-        return 0
-
-def func():
-    async for i in range(10):
-        if i == 5:
-            return 1
-    return 0
-
-def func():
-    async for i in range(111):
-        if i == 5:
-            return 1
-    else:
-        return 0
-    return 2
-
-def func():
-    async for i in range(12):
-        continue
-
-def func():
-    async for i in range(1110):
-        if True:
-            continue
-
-def func():
-    async for i in range(13):
-        break
-
-def func():
-    async for i in range(1110):
-        if True:
-            break

crates/ruff/resources/test/fixtures/control-flow-graph/for.py

@@ -1,41 +0,0 @@
-def func():
-    for i in range(5):
-        print(i)
-
-def func():
-    for i in range(20):
-        print(i)
-    else:
-        return 0
-
-def func():
-    for i in range(10):
-        if i == 5:
-            return 1
-    return 0
-
-def func():
-    for i in range(111):
-        if i == 5:
-            return 1
-    else:
-        return 0
-    return 2
-
-def func():
-    for i in range(12):
-        continue
-
-def func():
-    for i in range(1110):
-        if True:
-            continue
-
-def func():
-    for i in range(13):
-        break
-
-def func():
-    for i in range(1110):
-        if True:
-            break

crates/ruff/resources/test/fixtures/control-flow-graph/if.py

@@ -1,108 +0,0 @@
-def func():
-    if False:
-        return 0
-    return 1
-
-def func():
-    if True:
-        return 1
-    return 0
-
-def func():
-    if False:
-        return 0
-    else:
-        return 1
-
-def func():
-    if True:
-        return 1
-    else:
-        return 0
-
-def func():
-    if False:
-        return 0
-    else:
-        return 1
-    return "unreachable"
-
-def func():
-    if True:
-        return 1
-    else:
-        return 0
-    return "unreachable"
-
-def func():
-    if True:
-        if True:
-            return 1
-        return 2
-    else:
-        return 3
-    return "unreachable2"
-
-def func():
-    if False:
-        return 0
-
-def func():
-    if True:
-        return 1
-
-def func():
-    if True:
-        return 1
-    elif False:
-        return 2
-    else:
-        return 0
-
-def func():
-    if False:
-        return 1
-    elif True:
-        return 2
-    else:
-        return 0
-
-def func():
-    if True:
-        if False:
-            return 0
-        elif True:
-            return 1
-        else:
-            return 2
-        return 3
-    elif True:
-        return 4
-    else:
-        return 5
-    return 6
-
-def func():
-    if False:
-        return "unreached"
-    elif False:
-        return "also unreached"
-    return "reached"
-
-# Test case found in the Bokeh repository that trigger a false positive.
-def func(self, obj: BytesRep) -> bytes:
-    data = obj["data"]
-
-    if isinstance(data, str):
-        return base64.b64decode(data)
-    elif isinstance(data, Buffer):
-        buffer = data
-    else:
-        id = data["id"]
-
-        if id in self._buffers:
-            buffer = self._buffers[id]
-        else:
-            self.error(f"can't resolve buffer '{id}'")
-
-    return buffer.data

crates/ruff/resources/test/fixtures/control-flow-graph/match.py

@@ -1,131 +0,0 @@
-def func(status):
-    match status:
-        case _:
-            return 0
-    return "unreachable"
-
-def func(status):
-    match status:
-        case 1:
-            return 1
-    return 0
-
-def func(status):
-    match status:
-        case 1:
-            return 1
-        case _:
-            return 0
-
-def func(status):
-    match status:
-        case 1 | 2 | 3:
-            return 5
-    return 6
-
-def func(status):
-    match status:
-        case 1 | 2 | 3:
-            return 5
-        case _:
-            return 10
-    return 0
-
-def func(status):
-    match status:
-        case 0:
-            return 0
-        case 1:
-            return 1
-        case 1:
-            return "1 again"
-        case _:
-            return 3
-
-def func(status):
-    i = 0
-    match status, i:
-        case _, _:
-            return 0
-
-def func(status):
-    i = 0
-    match status, i:
-        case _, 0:
-            return 0
-        case _, 2:
-            return 0
-
-def func(point):
-    match point:
-        case (0, 0):
-            print("Origin")
-        case _:
-            raise ValueError("oops")
-
-def func(point):
-    match point:
-        case (0, 0):
-            print("Origin")
-        case (0, y):
-            print(f"Y={y}")
-        case (x, 0):
-            print(f"X={x}")
-        case (x, y):
-            print(f"X={x}, Y={y}")
-        case _:
-            raise ValueError("Not a point")
-
-def where_is(point):
-    class Point:
-        x: int
-        y: int
-
-    match point:
-        case Point(x=0, y=0):
-            print("Origin")
-        case Point(x=0, y=y):
-            print(f"Y={y}")
-        case Point(x=x, y=0):
-            print(f"X={x}")
-        case Point():
-            print("Somewhere else")
-        case _:
-            print("Not a point")
-
-def func(points):
-    match points:
-        case []:
-            print("No points")
-        case [Point(0, 0)]:
-            print("The origin")
-        case [Point(x, y)]:
-            print(f"Single point {x}, {y}")
-        case [Point(0, y1), Point(0, y2)]:
-            print(f"Two on the Y axis at {y1}, {y2}")
-        case _:
-            print("Something else")
-
-def func(point):
-    match point:
-        case Point(x, y) if x == y:
-            print(f"Y=X at {x}")
-        case Point(x, y):
-            print(f"Not on the diagonal")
-
-def func():
-    from enum import Enum
-    class Color(Enum):
-        RED = 'red'
-        GREEN = 'green'
-        BLUE = 'blue'
-
-    color = Color(input("Enter your choice of 'red', 'blue' or 'green': "))
-
-    match color:
-        case Color.RED:
-            print("I see red!")
-        case Color.GREEN:
-            print("Grass is green")
-        case Color.BLUE:
-            print("I'm feeling the blues :(")

crates/ruff/resources/test/fixtures/control-flow-graph/raise.py

@@ -1,5 +0,0 @@
-def func():
-    raise Exception
-
-def func():
-    raise "a glass!"

crates/ruff/resources/test/fixtures/control-flow-graph/simple.py

@@ -1,23 +0,0 @@
-def func():
-    pass
-
-def func():
-    pass
-
-def func():
-    return
-
-def func():
-    return 1
-
-def func():
-    return 1
-    return "unreachable"
-
-def func():
-    i = 0
-
-def func():
-    i = 0
-    i += 2
-    return i

crates/ruff/resources/test/fixtures/control-flow-graph/try.py

@@ -1,41 +0,0 @@
-def func():
-    try:
-       ...
-    except Exception:
-       ...
-    except OtherException as e:
-       ...
-    else:
-       ...
-    finally:
-       ...
-
-def func():
-    try:
-       ...
-    except Exception:
-       ...
-
-def func():
-    try:
-       ...
-    except Exception:
-       ...
-    except OtherException as e:
-       ...
-
-def func():
-    try:
-       ...
-    except Exception:
-       ...
-    except OtherException as e:
-       ...
-    else:
-       ...
-
-def func():
-    try:
-       ...
-    finally:
-       ...

crates/ruff/resources/test/fixtures/control-flow-graph/while.py

@@ -1,121 +0,0 @@
-def func():
-    while False:
-        return "unreachable"
-    return 1
-
-def func():
-    while False:
-        return "unreachable"
-    else:
-        return 1
-
-def func():
-    while False:
-        return "unreachable"
-    else:
-        return 1
-    return "also unreachable"
-
-def func():
-    while True:
-        return 1
-    return "unreachable"
-
-def func():
-    while True:
-        return 1
-    else:
-        return "unreachable"
-
-def func():
-    while True:
-        return 1
-    else:
-        return "unreachable"
-    return "also unreachable"
-
-def func():
-    i = 0
-    while False:
-        i += 1
-    return i
-
-def func():
-    i = 0
-    while True:
-        i += 1
-    return i
-
-def func():
-    while True:
-        pass
-    return 1
-
-def func():
-    i = 0
-    while True:
-        if True:
-            print("ok")
-        i += 1
-    return i
-
-def func():
-    i = 0
-    while True:
-        if False:
-            print("ok")
-        i += 1
-    return i
-
-def func():
-    while True:
-        if True:
-            return 1
-    return 0
-
-def func():
-    while True:
-        continue
-
-def func():
-    while False:
-        continue
-
-def func():
-    while True:
-        break
-
-def func():
-    while False:
-        break
-
-def func():
-    while True:
-        if True:
-            continue
-
-def func():
-    while True:
-        if True:
-            break
-
-'''
-TODO: because `try` statements aren't handled this triggers a false positive as
-the last statement is reached, but the rules thinks it isn't (it doesn't
-see/process the break statement).
-
-# Test case found in the Bokeh repository that trigger a false positive.
-def bokeh2(self, host: str = DEFAULT_HOST, port: int = DEFAULT_PORT) -> None:
-    self.stop_serving = False
-    while True:
-        try:
-            self.server = HTTPServer((host, port), HtmlOnlyHandler)
-            self.host = host
-            self.port = port
-            break
-        except OSError:
-            log.debug(f"port {port} is in use, trying to next one")
-            port += 1
-
-    self.thread = threading.Thread(target=self._run_web_server)
-'''

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

@@ -1,4 +1,4 @@
-from typing import Annotated, Any, Optional, Type, Union
+from typing import Any, Type
 from typing_extensions import override
 
 # Error
@@ -95,27 +95,27 @@ class Foo:
     def foo(self: "Foo", a: int, *params: str, **options: Any) -> int:
         pass
 
-    # OK
+    # ANN401
     @override
     def foo(self: "Foo", a: Any, *params: str, **options: str) -> int:
         pass
 
-    # OK
+    # ANN401
     @override
     def foo(self: "Foo", a: int, *params: str, **options: str) -> Any:
         pass
 
-    # OK
+    # ANN401
     @override
     def foo(self: "Foo", a: int, *params: Any, **options: Any) -> int:
         pass
 
-    # OK
+    # ANN401
     @override
     def foo(self: "Foo", a: int, *params: Any, **options: str) -> int:
         pass
 
-    # OK
+    # ANN401
     @override
     def foo(self: "Foo", a: int, *params: str, **options: Any) -> int:
         pass
@@ -137,18 +137,3 @@ class Foo:
 
 # OK
 def f(*args: *tuple[int]) -> None: ...
-def f(a: object) -> None: ...
-def f(a: str | bytes) -> None: ...
-def f(a: Union[str, bytes]) -> None: ...
-def f(a: Optional[str]) -> None: ...
-def f(a: Annotated[str, ...]) -> None: ...
-def f(a: "Union[str, bytes]") -> None: ...
-def f(a: int + int) -> None: ...
-
-# ANN401
-def f(a: Any | int) -> None: ...
-def f(a: int | Any) -> None: ...
-def f(a: Union[str, bytes, Any]) -> None: ...
-def f(a: Optional[Any]) -> None: ...
-def f(a: Annotated[Any, ...]) -> None: ...
-def f(a: "Union[str, bytes, Any]") -> None: ...

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

@@ -1,12 +0,0 @@
-import os
-
-print(eval("1+1"))  # S307
-print(eval("os.getcwd()"))  # S307
-
-
-class Class(object):
-    def eval(self):
-        print("hi")
-
-    def foo(self):
-        self.eval()  # OK

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

@@ -1,8 +0,0 @@
-import os
-import subprocess
-
-os.popen("chmod +w foo*")
-subprocess.Popen("/bin/chown root: *", shell=True)
-subprocess.Popen(["/usr/local/bin/rsync", "*", "some_where:"], shell=True)
-subprocess.Popen("/usr/local/bin/rsync * no_injection_here:")
-os.system("tar cf foo.tar bar/*")

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

@@ -57,16 +57,12 @@ dict.fromkeys(("world",), True)
 {}.deploy(True, False)
 getattr(someobj, attrname, False)
 mylist.index(True)
-bool(False)
 int(True)
 str(int(False))
 cfg.get("hello", True)
 cfg.getint("hello", True)
 cfg.getfloat("hello", True)
 cfg.getboolean("hello", True)
-os.set_blocking(0, False)
-g_action.set_enabled(True)
-settings.set_enable_developer_extras(True)
 
 
 class Registry:
@@ -84,6 +80,3 @@ class Registry:
     # FBT001: Boolean positional arg in function definition
     def foo(self, value: bool) -> None:
         pass
-
-    def foo(self) -> None:
-        object.__setattr__(self, "flag", True)

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

@@ -1,6 +1,6 @@
 """
 Should emit:
-B002 - on lines 18, 19, and 24
+B002 - on lines 15 and 20
 """
 
 
@@ -8,17 +8,13 @@ def this_is_all_fine(n):
     x = n + 1
     y = 1 + n
     z = +x + y
-    a = n - 1
-    b = 1 - n
-    c = -a - b
-    return +z, -c
+    return +z
 
 
 def this_is_buggy(n):
     x = ++n
-    y = --n
-    return x, y
+    return x
 
 
 def this_is_buggy_too(n):
-    return ++n, --n
+    return ++n

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

@@ -1,7 +1,6 @@
 import collections
 import datetime as dt
 from decimal import Decimal
-from fractions import Fraction
 import logging
 import operator
 from pathlib import Path
@@ -159,40 +158,12 @@ def float_infinity_literal(value=float("1e999")):
     pass
 
 
-# Allow standard floats
-def float_int_okay(value=float(3)):
+# But don't allow standard floats
+def float_int_is_wrong(value=float(3)):
     pass
 
 
-def float_str_not_inf_or_nan_okay(value=float("3.14")):
-    pass
-
-
-# Allow immutable str() value
-def str_okay(value=str("foo")):
-    pass
-
-
-# Allow immutable bool() value
-def bool_okay(value=bool("bar")):
-    pass
-
-# Allow immutable bytes() value
-def bytes_okay(value=bytes(1)):
-    pass
-
-# Allow immutable int() value
-def int_okay(value=int("12")):
-    pass
-
-
-# Allow immutable complex() value
-def complex_okay(value=complex(1,2)):
-    pass
-
-
-# Allow immutable Fraction() value
-def fraction_okay(value=Fraction(1,2)):
+def float_str_not_inf_or_nan_is_wrong(value=float("3.14")):
     pass
 
 

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

@@ -73,18 +73,7 @@ def f():
 
 
 def f():
-    # Unfixable.
-    for foo, bar, baz in (["1", "2", "3"],):
-        if foo or baz:
-            break
-    else:
-        bar = 1
-
-    print(bar)
-
-
-def f():
-    # Unfixable (false negative) due to usage of `bar` outside of loop.
+    # Fixable.
     for foo, bar, baz in (["1", "2", "3"],):
         if foo or baz:
             break
@@ -96,11 +85,4 @@ def f():
 # Unfixable due to trailing underscore (`_line_` wouldn't be considered an ignorable
 # variable name).
 for line_ in range(self.header_lines):
-    fp.readline()
-
-# Regression test: visitor didn't walk the elif test
-for key, value in current_crawler_tags.items():
-    if key:
-        pass
-    elif wanted_tag_value != value:
-        pass
+     fp.readline()

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

@@ -23,10 +23,6 @@ class Foobar(unittest.TestCase):
         with self.assertRaises(Exception):
             raise Exception("Evil I say!")
 
-    def also_evil_raises(self) -> None:
-        with self.assertRaises(BaseException):
-            raise Exception("Evil I say!")
-
     def context_manager_raises(self) -> None:
         with self.assertRaises(Exception) as ex:
             raise Exception("Context manager is good")
@@ -45,9 +41,6 @@ def test_pytest_raises():
     with pytest.raises(Exception):
         raise ValueError("Hello")
 
-    with pytest.raises(Exception), pytest.raises(ValueError):
-        raise ValueError("Hello")
-
     with pytest.raises(Exception, "hello"):
         raise ValueError("This is fine")
 

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

@@ -120,11 +120,3 @@ class AbstractClass(ABC):
     @abstractmethod
     def empty_1(self, foo: Union[str, int, list, float]):
         ...
-
-
-from dataclasses import dataclass
-
-
-@dataclass
-class Foo(ABC):  # noqa: B024
-    ...

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

@@ -149,7 +149,7 @@ for group in groupby(items, key=lambda p: p[1]):
     collect_shop_items("Joe", group[1])
 
 
-# https://github.com/astral-sh/ruff/issues/4050
+# https://github.com/charliermarsh/ruff/issues/4050
 for _section, section_items in itertools.groupby(items, key=lambda p: p[1]):
     if _section == "greens":
         for item in section_items:

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

@@ -1,27 +0,0 @@
-import re
-from re import sub
-
-# B034
-re.sub("a", "b", "aaa", re.IGNORECASE)
-re.sub("a", "b", "aaa", 5)
-re.sub("a", "b", "aaa", 5, re.IGNORECASE)
-re.subn("a", "b", "aaa", re.IGNORECASE)
-re.subn("a", "b", "aaa", 5)
-re.subn("a", "b", "aaa", 5, re.IGNORECASE)
-re.split(" ", "a a a a", re.I)
-re.split(" ", "a a a a", 2)
-re.split(" ", "a a a a", 2, re.I)
-sub("a", "b", "aaa", re.IGNORECASE)
-
-# OK
-re.sub("a", "b", "aaa")
-re.sub("a", "b", "aaa", flags=re.IGNORECASE)
-re.sub("a", "b", "aaa", count=5)
-re.sub("a", "b", "aaa", count=5, flags=re.IGNORECASE)
-re.subn("a", "b", "aaa")
-re.subn("a", "b", "aaa", flags=re.IGNORECASE)
-re.subn("a", "b", "aaa", count=5)
-re.subn("a", "b", "aaa", count=5, flags=re.IGNORECASE)
-re.split(" ", "a a a a", flags=re.I)
-re.split(" ", "a a a a", maxsplit=2)
-re.split(" ", "a a a a", maxsplit=2, flags=re.I)

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

@@ -14,10 +14,9 @@ except AssertionError:
 except Exception as err:
     assert err
     raise Exception("No cause here...")
-except BaseException as err:
-    raise err
-except BaseException as err:
-    raise some_other_err
+except BaseException as base_err:
+    # Might use this instead of bare raise with the `.with_traceback()` method
+    raise base_err
 finally:
     raise Exception("Nothing to chain from, so no warning here")
 

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

@@ -1,6 +1,3 @@
-from itertools import count, cycle, repeat
-
-# Errors
 zip()
 zip(range(3))
 zip("a", "b")
@@ -8,18 +5,6 @@ zip("a", "b", *zip("c"))
 zip(zip("a"), strict=False)
 zip(zip("a", strict=True))
 
-# OK
 zip(range(3), strict=True)
 zip("a", "b", strict=False)
 zip("a", "b", "c", strict=True)
-
-# OK (infinite iterators).
-zip([1, 2, 3], cycle("ABCDEF"))
-zip([1, 2, 3], count())
-zip([1, 2, 3], repeat(1))
-zip([1, 2, 3], repeat(1, None))
-zip([1, 2, 3], repeat(1, times=None))
-
-# Errors (limited iterators).
-zip([1, 2, 3], repeat(1, 1))
-zip([1, 2, 3], repeat(1, times=4))

crates/ruff/resources/test/fixtures/flake8_builtins/A003.py

@@ -1,6 +1,6 @@
 class MyClass:
     ImportError = 4
-    id: int
+    id = 5
     dir = "/"
 
     def __init__(self):
@@ -10,44 +10,3 @@ class MyClass:
 
     def str(self):
         pass
-
-
-from typing import TypedDict
-
-
-class MyClass(TypedDict):
-    id: int
-
-
-from threading import Event
-
-
-class CustomEvent(Event):
-    def set(self) -> None:
-        ...
-
-    def str(self) -> None:
-        ...
-
-
-from logging import Filter, LogRecord
-
-
-class CustomFilter(Filter):
-    def filter(self, record: LogRecord) -> bool:
-        ...
-
-    def str(self) -> None:
-        ...
-
-
-from typing_extensions import override
-
-
-class MyClass:
-    @override
-    def str(self):
-        pass
-
-    def int(self):
-        pass

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

@@ -1,20 +1,13 @@
 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")
+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
 
 
-def f(x):
-    return x
-
-
-print(f'Hello {set(a for a in "abc")} World')
-print(f"Hello {set(a for a in 'abc')} World")
-print(f"Hello {set(f(a) for a in 'abc')} World")
-print(f"{set(a for a in 'abc') - set(a for a in 'ab')}")
-print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
-
-# The fix generated for this diagnostic is incorrect, as we add additional space
-# around the set comprehension.
-print(f"{ {set(a for a in 'abc')} }")
+set(x for x in range(3))

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

@@ -5,14 +5,3 @@ dict(
 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')
-print(f"Hello {dict((x, x) for x in 'abc')} World")
-print(f'Hello {dict((x, x) for x in "abc")} World')
-print(f'Hello {dict((x,x) for x in "abc")} World')
-
-f'{dict((x, x) for x in range(3)) | dict((x, x) for x in range(3))}'
-f'{ dict((x, x) for x in range(3)) | dict((x, x) for x in range(3)) }'
-
-def f(x):
-    return x
-
-print(f'Hello {dict((x,f(x)) for x in "abc")} World')

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

@@ -2,14 +2,3 @@ s = set([x for x in range(3)])
 s = set(
     [x for x in range(3)]
 )
-
-s = f"{set([x for x in 'ab'])}"
-s = f'{set([x for x in "ab"])}'
-
-def f(x):
-    return x
-
-s = f"{set([f(x) for x in 'ab'])}"
-
-s = f"{ set([x for x in 'ab']) | set([x for x in 'ab']) }"
-s = f"{set([x for x in 'ab']) | set([x for x in 'ab'])}"

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

@@ -1,13 +1,2 @@
 dict([(i, i) for i in range(3)])
 dict([(i, i) for i in range(3)], z=4)
-
-def f(x):
-    return x
-
-f'{dict([(s,s) for s in "ab"])}'
-f"{dict([(s,s) for s in 'ab'])}"
-f"{dict([(s, s) for s in 'ab'])}"
-f"{dict([(s,f(s)) for s in 'ab'])}"
-
-f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
-f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'

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

@@ -16,11 +16,3 @@ set(
 set(
     [1,]
 )
-f"{set([1,2,3])}"
-f"{set(['a', 'b'])}"
-f'{set(["a", "b"])}'
-
-f"{set(['a', 'b']) - set(['a'])}"
-f"{ set(['a', 'b']) - set(['a']) }"
-f"a {set(['a', 'b']) - set(['a'])} b"
-f"a { set(['a', 'b']) - set(['a']) } b"

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

@@ -10,13 +10,3 @@ def list():
 
 
 a = list()
-
-f"{dict(x='y')}"
-f'{dict(x="y")}'
-f"{dict()}"
-f"a {dict()} b"
-
-f"{dict(x='y') | dict(y='z')}"
-f"{ dict(x='y') | dict(y='z') }"
-f"a {dict(x='y') | dict(y='z')} b"
-f"a { dict(x='y') | dict(y='z') } b"

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

@@ -12,8 +12,7 @@ set(reversed(x))
 sorted(list(x))
 sorted(tuple(x))
 sorted(sorted(x))
-sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
-sorted(sorted(x, reverse=True), reverse=True)
+sorted(sorted(x, key=lambda y: y))
 sorted(reversed(x))
 sorted(list(x), key=lambda y: y)
 tuple(
@@ -22,9 +21,3 @@ tuple(
         "o"]
     )
 )
-
-# Nested sorts with differing keyword arguments. Not flagged.
-sorted(sorted(x, key=lambda y: y))
-sorted(sorted(x, key=lambda y: y), key=lambda x: x)
-sorted(sorted(x), reverse=True)
-sorted(sorted(x, reverse=False), reverse=True)

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

@@ -25,15 +25,10 @@ map(lambda x=2, y=1: x + y, nums, nums)
 set(map(lambda x, y: x, nums, nums))
 
 
-def func(arg1: int, arg2: int = 4):
+def myfunc(arg1: int, arg2: int = 4):
     return 2 * arg1 + arg2
 
 
-# Non-error: `func` is not a lambda.
-list(map(func, nums))
+list(map(myfunc, nums))
 
-# False positive: need to preserve the late-binding of `x` in the inner lambda.
-map(lambda x: lambda: x, range(4))
-
-# Error: the `x` is overridden by the inner lambda.
-map(lambda x: lambda x: x, range(4))
+[x for x in nums]

crates/ruff/resources/test/fixtures/flake8_datetimez/DTZ001.py

@@ -19,6 +19,3 @@ from datetime import datetime
 
 # no args unqualified
 datetime(2000, 1, 1, 0, 0, 0)
-
-# uses `astimezone` method
-datetime(2000, 1, 1, 0, 0, 0).astimezone()

crates/ruff/resources/test/fixtures/flake8_datetimez/DTZ002.py

@@ -7,6 +7,3 @@ from datetime import datetime
 
 # unqualified
 datetime.today()
-
-# uses `astimezone` method
-datetime.today().astimezone()

crates/ruff/resources/test/fixtures/flake8_datetimez/DTZ003.py

@@ -7,6 +7,3 @@ from datetime import datetime
 
 # unqualified
 datetime.utcnow()
-
-# uses `astimezone` method
-datetime.utcnow().astimezone()

crates/ruff/resources/test/fixtures/flake8_datetimez/DTZ004.py

@@ -7,6 +7,3 @@ from datetime import datetime
 
 # unqualified
 datetime.utcfromtimestamp(1234)
-
-# uses `astimezone` method
-datetime.utcfromtimestamp(1234).astimezone()

crates/ruff/resources/test/fixtures/flake8_datetimez/DTZ005.py

@@ -16,6 +16,3 @@ from datetime import datetime
 
 # no args unqualified
 datetime.now()
-
-# uses `astimezone` method
-datetime.now().astimezone()

crates/ruff/resources/test/fixtures/flake8_datetimez/DTZ006.py

@@ -16,6 +16,3 @@ from datetime import datetime
 
 # no args unqualified
 datetime.fromtimestamp(1234)
-
-# uses `astimezone` method
-datetime.fromtimestamp(1234).astimezone()

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

@@ -111,19 +111,3 @@ class PerfectlyFine(models.Model):
     @property
     def random_property(self):
         return "%s" % self
-
-
-class MultipleConsecutiveFields(models.Model):
-    """Model that contains multiple out-of-order field definitions in a row."""
-
-
-    class Meta:
-        verbose_name = "test"
-
-    first_name = models.CharField(max_length=32)
-    last_name = models.CharField(max_length=32)
-
-    def get_absolute_url(self):
-        pass
-
-    middle_name = models.CharField(max_length=32)

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

@@ -9,10 +9,6 @@ def f_a_short():
     raise RuntimeError("Error")
 
 
-def f_a_empty():
-    raise RuntimeError("")
-
-
 def f_b():
     example = "example"
     raise RuntimeError(f"This is an {example} exception")

crates/ruff/resources/test/fixtures/flake8_executable/EXE004_4.py

@@ -1,2 +0,0 @@
-
-    #!/usr/bin/env python

crates/ruff/resources/test/fixtures/flake8_fixme/T00.py

@@ -1,8 +0,0 @@
-# TODO: todo
-# todo: todo
-# XXX: xxx
-# xxx: xxx
-# HACK: hack
-# hack: hack
-# FIXME: fixme
-# fixme: fixme

crates/ruff/resources/test/fixtures/flake8_implicit_str_concat/ISC.py

@@ -34,19 +34,3 @@ _ = (
   b"abc"
   b"def"
 )
-
-_ = """a""" """b"""
-
-_ = """a
-b""" """c
-d"""
-
-_ = f"""a""" f"""b"""
-
-_ = f"a" "b"
-
-_ = """a""" "b"
-
-_ = 'a' "b"
-
-_ = rf"a" rf"b"

crates/ruff/resources/test/fixtures/flake8_import_conventions/defaults.py

@@ -5,18 +5,15 @@ import matplotlib.pyplot  # unconventional
 import numpy  # unconventional
 import pandas  # unconventional
 import seaborn  # unconventional
-import tkinter  # unconventional
 
 import altair as altr  # unconventional
 import matplotlib.pyplot as plot  # unconventional
 import numpy as nmp  # unconventional
 import pandas as pdas  # unconventional
 import seaborn as sbrn  # unconventional
-import tkinter as tkr  # unconventional
 
 import altair as alt  # conventional
 import matplotlib.pyplot as plt  # conventional
 import numpy as np  # conventional
 import pandas as pd  # conventional
 import seaborn as sns  # conventional
-import tkinter as tk  # conventional

crates/ruff/resources/test/fixtures/flake8_logging_format/G010.py

@@ -1,10 +1,5 @@
 import logging
 from distutils import log
 
-from logging_setup import logger
-
 logging.warn("Hello World!")
 log.warn("Hello world!")  # This shouldn't be considered as a logger candidate
-logger.warn("Hello world!")
-
-logging . warn("Hello World!")

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

@@ -1,6 +0,0 @@
-import sys
-
-if sys.version == 'Python 2.7.10': ...  # Y002 If test must be a simple comparison against sys.platform or sys.version_info
-if 'linux' == sys.platform: ...  # Y002 If test must be a simple comparison against sys.platform or sys.version_info
-if hasattr(sys, 'maxint'): ...  # Y002 If test must be a simple comparison against sys.platform or sys.version_info
-if sys.maxsize == 42: ...  # Y002 If test must be a simple comparison against sys.platform or sys.version_info

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

@@ -1,6 +0,0 @@
-import sys
-
-if sys.version == 'Python 2.7.10': ...  # Y002 If test must be a simple comparison against sys.platform or sys.version_info
-if 'linux' == sys.platform: ...  # Y002 If test must be a simple comparison against sys.platform or sys.version_info
-if hasattr(sys, 'maxint'): ...  # Y002 If test must be a simple comparison against sys.platform or sys.version_info
-if sys.maxsize == 42: ...  # Y002 If test must be a simple comparison against sys.platform or sys.version_info

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

@@ -1,31 +0,0 @@
-import sys
-
-if sys.version_info[0] == 2: ...
-if sys.version_info[0] == True: ...  # Y003 Unrecognized sys.version_info check  # E712 comparison to True should be 'if cond is True:' or 'if cond:'
-if sys.version_info[0.0] == 2: ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[False] == 2: ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[0j] == 2: ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[0] == (2, 7): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[0] == '2': ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[1:] >= (7, 11): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[::-1] < (11, 7): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[:3] >= (2, 7): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[:True] >= (2, 7): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[:1] == (2,): ...
-if sys.version_info[:1] == (True,): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[:1] == (2, 7): ...  # Y005 Version comparison must be against a length-1 tuple
-if sys.version_info[:2] == (2, 7): ...
-if sys.version_info[:2] == (2,): ...  # Y005 Version comparison must be against a length-2 tuple
-if sys.version_info[:2] == "lol": ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[:2.0] >= (3, 9): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[:2j] >= (3, 9): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[:, :] >= (2, 7): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info < [3, 0]: ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info < ('3', '0'): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info >= (3, 4, 3): ...  # Y004 Version comparison must use only major and minor version
-if sys.version_info == (3, 4): ...  # Y006 Use only < and >= for version comparisons
-if sys.version_info > (3, 0): ...  # Y006 Use only < and >= for version comparisons
-if sys.version_info <= (3, 0): ...  # Y006 Use only < and >= for version comparisons
-if sys.version_info < (3, 5): ...
-if sys.version_info >= (3, 5): ...
-if (2, 7) <= sys.version_info < (3, 5): ...  # Y002 If test must be a simple comparison against sys.platform or sys.version_info

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

@@ -1,31 +0,0 @@
-import sys
-
-if sys.version_info[0] == 2: ...
-if sys.version_info[0] == True: ...  # Y003 Unrecognized sys.version_info check  # E712 comparison to True should be 'if cond is True:' or 'if cond:'
-if sys.version_info[0.0] == 2: ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[False] == 2: ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[0j] == 2: ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[0] == (2, 7): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[0] == '2': ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[1:] >= (7, 11): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[::-1] < (11, 7): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[:3] >= (2, 7): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[:True] >= (2, 7): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[:1] == (2,): ...
-if sys.version_info[:1] == (True,): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[:1] == (2, 7): ...  # Y005 Version comparison must be against a length-1 tuple
-if sys.version_info[:2] == (2, 7): ...
-if sys.version_info[:2] == (2,): ...  # Y005 Version comparison must be against a length-2 tuple
-if sys.version_info[:2] == "lol": ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[:2.0] >= (3, 9): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[:2j] >= (3, 9): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info[:, :] >= (2, 7): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info < [3, 0]: ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info < ('3', '0'): ...  # Y003 Unrecognized sys.version_info check
-if sys.version_info >= (3, 4, 3): ...  # Y004 Version comparison must use only major and minor version
-if sys.version_info == (3, 4): ...  # Y006 Use only < and >= for version comparisons
-if sys.version_info > (3, 0): ...  # Y006 Use only < and >= for version comparisons
-if sys.version_info <= (3, 0): ...  # Y006 Use only < and >= for version comparisons
-if sys.version_info < (3, 5): ...
-if sys.version_info >= (3, 5): ...
-if (2, 7) <= sys.version_info < (3, 5): ...  # Y002 If test must be a simple comparison against sys.platform or sys.version_info

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

@@ -1,15 +0,0 @@
-import sys
-from sys import version_info
-
-if sys.version_info >= (3, 4, 3): ...  # PYI004 
-if sys.version_info < (3, 4, 3): ...  # PYI004 
-if sys.version_info == (3, 4, 3): ...  # PYI004 
-if sys.version_info != (3, 4, 3): ...  # PYI004 
-
-if sys.version_info[0] == 2: ...
-if version_info[0] == 2: ...
-if sys.version_info < (3, 5): ...
-if version_info >= (3, 5): ...
-if sys.version_info[:2] == (2, 7): ...
-if sys.version_info[:1] == (2,): ...
-if sys.platform == 'linux': ...

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

@@ -1,15 +0,0 @@
-import sys
-from sys import version_info
-
-if sys.version_info >= (3, 4, 3): ...  # PYI004 
-if sys.version_info < (3, 4, 3): ...  # PYI004 
-if sys.version_info == (3, 4, 3): ...  # PYI004 
-if sys.version_info != (3, 4, 3): ...  # PYI004 
-
-if sys.version_info[0] == 2: ...
-if version_info[0] == 2: ...
-if sys.version_info < (3, 5): ...
-if version_info >= (3, 5): ...
-if sys.version_info[:2] == (2, 7): ...
-if sys.version_info[:1] == (2,): ...
-if sys.platform == 'linux': ...

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

@@ -1,14 +0,0 @@
-import sys
-from sys import platform, version_info
-
-if sys.version_info[:1] == (2, 7): ...  # Y005
-if sys.version_info[:2] == (2,): ...  # Y005
-
-
-if sys.version_info[0] == 2: ...
-if version_info[0] == 2: ...
-if sys.version_info < (3, 5): ...
-if version_info >= (3, 5): ...
-if sys.version_info[:2] == (2, 7): ...
-if sys.version_info[:1] == (2,): ...
-if platform == 'linux': ...

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

@@ -1,14 +0,0 @@
-import sys
-from sys import platform, version_info
-
-if sys.version_info[:1] == (2, 7): ...  # Y005
-if sys.version_info[:2] == (2,): ...  # Y005
-
-
-if sys.version_info[0] == 2: ...
-if version_info[0] == 2: ...
-if sys.version_info < (3, 5): ...
-if version_info >= (3, 5): ...
-if sys.version_info[:2] == (2, 7): ...
-if sys.version_info[:1] == (2,): ...
-if platform == 'linux': ...

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

@@ -91,4 +91,3 @@ field27 = list[str]
 field28 = builtins.str
 field29 = str
 field30 = str | bytes | None
-field31: typing.Final = field30

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

@@ -98,4 +98,3 @@ field27 = list[str]
 field28 = builtins.str
 field29 = str
 field30 = str | bytes | None
-field31: typing.Final = field30

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

@@ -1,5 +1,3 @@
-import typing
-
 # Shouldn't affect non-union field types.
 field1: str
 
@@ -32,45 +30,3 @@ field10: (str | int) | str  # PYI016: Duplicate union member `str`
 
 # Should emit for nested unions.
 field11: dict[int | int, str]
-
-# Should emit for unions with more than two cases
-field12: int | int | int  # Error
-field13: int | int | int | int  # Error
-
-# Should emit for unions with more than two cases, even if not directly adjacent
-field14: int | int | str | int  # Error
-
-# Should emit for duplicate literal types; also covered by PYI030
-field15: typing.Literal[1] | typing.Literal[1]  # Error
-
-# Shouldn't emit if in new parent type
-field16: int | dict[int, str]  # OK
-
-# Shouldn't emit if not in a union parent
-field17: dict[int, int]  # OK
-
-# Should emit in cases with newlines
-field18: typing.Union[
-    set[
-        int  # foo
-    ],
-    set[
-        int  # bar
-    ],
-]  # Error, newline and comment will not be emitted in message
-
-# Should emit in cases with `typing.Union` instead of `|`
-field19: typing.Union[int, int]  # Error
-
-# Should emit in cases with nested `typing.Union`
-field20: typing.Union[int, typing.Union[int, str]]  # Error
-
-# Should emit in cases with mixed `typing.Union` and `|`
-field21: typing.Union[int, int | str]  # Error
-
-# Should emit only once in cases with multiple nested `typing.Union`
-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-
-# Should emit in cases with newlines
-field23: set[  # foo
-    int] | set[int]

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

@@ -1,14 +0,0 @@
-var: int
-a = var  # OK
-
-b = c = int  # OK
-
-a.b = int  # OK
-
-d, e = int, str  # OK
-
-f, g, h = int, str, TypeVar("T")  # OK
-
-i: TypeAlias = int | str  # OK
-
-j: TypeAlias = int  # OK

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

@@ -1,14 +0,0 @@
-var: int
-a = var  # OK
-
-b = c = int  # PYI017
-
-a.b = int  # PYI017
-
-d, e = int, str  # PYI017
-
-f, g, h = int, str, TypeVar("T")  # PYI017
-
-i: TypeAlias = int | str  # OK
-
-j: TypeAlias = int  # OK

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

@@ -1,9 +0,0 @@
-import collections
-
-person: collections.namedtuple  # OK
-
-from collections import namedtuple
-
-person: namedtuple  # OK
-
-person = namedtuple("Person", ["name", "age"])  # OK

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

@@ -1,11 +0,0 @@
-import collections
-
-person: collections.namedtuple  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"
-
-from collections import namedtuple
-
-person: namedtuple  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"
-
-person = namedtuple(
-    "Person", ["name", "age"]
-)  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"

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

@@ -1,19 +0,0 @@
-def f():
-    from collections.abc import Set as AbstractSet  # Ok
-
-
-def f():
-    from collections.abc import Container, Sized, Set as AbstractSet, ValuesView  # Ok
-
-
-def f():
-    from collections.abc import Set  # PYI025
-
-
-def f():
-    from collections.abc import Container, Sized, Set, ValuesView  # PYI025
-
-    GLOBAL: Set[int] = set()
-
-    class Class:
-        member: Set[int]

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

@@ -1,50 +0,0 @@
-def f():
-    from collections.abc import Set as AbstractSet  # Ok
-
-def f():
-    from collections.abc import Container, Sized, Set as AbstractSet, ValuesView  # Ok
-
-def f():
-    from collections.abc import Set  # PYI025
-
-def f():
-    from collections.abc import Container, Sized, Set, ValuesView  # PYI025
-
-def f():
-    """Test: local symbol renaming."""
-    if True:
-        from collections.abc import Set
-    else:
-        Set = 1
-
-    x: Set = set()
-
-    x: Set
-
-    del Set
-
-    def f():
-        print(Set)
-
-        def Set():
-            pass
-        print(Set)
-
-from collections.abc import Set
-
-def f():
-    """Test: global symbol renaming."""
-    global Set
-
-    Set = 1
-    print(Set)
-
-def f():
-    """Test: nonlocal symbol renaming."""
-    from collections.abc import Set
-
-    def g():
-        nonlocal Set
-
-        Set = 1
-        print(Set)

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

@@ -1,19 +0,0 @@
-import typing
-from typing import TypeAlias, Literal, Any
-
-NewAny = Any
-OptionalStr = typing.Optional[str]
-Foo = Literal["foo"]
-IntOrStr = int | str
-AliasNone = None
-
-NewAny: typing.TypeAlias = Any
-OptionalStr: TypeAlias = typing.Optional[str]
-Foo: typing.TypeAlias = Literal["foo"]
-IntOrStr: TypeAlias = int | str
-IntOrFloat: Foo = int | float
-AliasNone: typing.TypeAlias = None
-
-# these are ok
-VarAlias = str
-AliasFoo = Foo

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

@@ -1,18 +0,0 @@
-from typing import Literal, Any
-
-NewAny = Any
-OptionalStr = typing.Optional[str]
-Foo = Literal["foo"]
-IntOrStr = int | str
-AliasNone = None
-
-NewAny: typing.TypeAlias = Any
-OptionalStr: TypeAlias = typing.Optional[str]
-Foo: typing.TypeAlias = Literal["foo"]
-IntOrStr: TypeAlias = int | str
-IntOrFloat: Foo = int | float
-AliasNone: typing.TypeAlias = None
-
-# these are ok
-VarAlias = str
-AliasFoo = Foo

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

@@ -1,57 +0,0 @@
-import builtins
-from abc import abstractmethod
-
-
-def __repr__(self) -> str:
-    ...
-
-
-def __str__(self) -> builtins.str:
-    ...
-
-
-def __repr__(self, /, foo) -> str:
-    ...
-
-
-def __repr__(self, *, foo) -> str:
-    ...
-
-
-class ShouldRemoveSingle:
-    def __str__(self) -> builtins.str:
-        ...
-
-
-class ShouldRemove:
-    def __repr__(self) -> str:
-        ...
-
-    def __str__(self) -> builtins.str:
-        ...
-
-
-class NoReturnSpecified:
-    def __str__(self):
-        ...
-
-    def __repr__(self):
-        ...
-
-
-class NonMatchingArgs:
-    def __str__(self, *, extra) -> builtins.str:
-        ...
-
-    def __repr__(self, /, extra) -> str:
-        ...
-
-
-class MatchingArgsButAbstract:
-    @abstractmethod
-    def __str__(self) -> builtins.str:
-        ...
-
-    @abstractmethod
-    def __repr__(self) -> str:
-        ...

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

@@ -1,28 +0,0 @@
-import builtins
-from abc import abstractmethod
-
-def __repr__(self) -> str: ...
-def __str__(self) -> builtins.str: ...
-def __repr__(self, /, foo) -> str: ...
-def __repr__(self, *, foo) -> str: ...
-
-class ShouldRemoveSingle:
-    def __str__(self) -> builtins.str: ...  # Error: PYI029
-
-class ShouldRemove:
-    def __repr__(self) -> str: ...  # Error: PYI029
-    def __str__(self) -> builtins.str: ...  # Error: PYI029
-
-class NoReturnSpecified:
-    def __str__(self): ...
-    def __repr__(self): ...
-
-class NonMatchingArgs:
-    def __str__(self, *, extra) -> builtins.str: ...
-    def __repr__(self, /, extra) -> str: ...
-
-class MatchingArgsButAbstract:
-    @abstractmethod
-    def __str__(self) -> builtins.str: ...
-    @abstractmethod
-    def __repr__(self) -> str: ...

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

@@ -1,24 +0,0 @@
-from typing import Literal
-# Shouldn't emit for any cases in the non-stub file for compatibility with flake8-pyi.
-# Note that this rule could be applied here in the future.
-
-field1: Literal[1]  # OK
-field2: Literal[1] | Literal[2]  # OK
-
-def func1(arg1: Literal[1] | Literal[2]):  # OK
-    print(arg1)
-
-
-def func2() -> Literal[1] | Literal[2]:  # OK
-    return "my Literal[1]ing"
-
-
-field3: Literal[1] | Literal[2] | str  # OK
-field4: str | Literal[1] | Literal[2]  # OK
-field5: Literal[1] | str | Literal[2]  # OK
-field6: Literal[1] | bool | Literal[2] | str  # OK
-field7 = Literal[1] | Literal[2]  # OK
-field8: Literal[1] | (Literal[2] | str)  # OK
-field9: Literal[1] | (Literal[2] | str)  # OK
-field10: (Literal[1] | str) | Literal[2]  # OK
-field11: dict[Literal[1] | Literal[2], str]  # OK

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

@@ -1,86 +0,0 @@
-import typing
-import typing_extensions
-from typing import Literal
-
-# Shouldn't affect non-union field types.
-field1: Literal[1]  # OK
-
-# Should emit for duplicate field types.
-field2: Literal[1] | Literal[2]  # Error
-
-# Should emit for union types in arguments.
-def func1(arg1: Literal[1] | Literal[2]):  # Error
-    print(arg1)
-
-
-# Should emit for unions in return types.
-def func2() -> Literal[1] | Literal[2]:  # Error
-    return "my Literal[1]ing"
-
-
-# Should emit in longer unions, even if not directly adjacent.
-field3: Literal[1] | Literal[2] | str  # Error
-field4: str | Literal[1] | Literal[2]  # Error
-field5: Literal[1] | str | Literal[2]  # Error
-field6: Literal[1] | bool | Literal[2] | str  # Error
-
-# Should emit for non-type unions.
-field7 = Literal[1] | Literal[2]  # Error
-
-# Should emit for parenthesized unions.
-field8: Literal[1] | (Literal[2] | str)  # Error
-
-# Should handle user parentheses when fixing.
-field9: Literal[1] | (Literal[2] | str)  # Error
-field10: (Literal[1] | str) | Literal[2]  # Error
-
-# Should emit for union in generic parent type.
-field11: dict[Literal[1] | Literal[2], str]  # Error
-
-# Should emit for unions with more than two cases
-field12: Literal[1] | Literal[2] | Literal[3]  # Error
-field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
-
-# Should emit for unions with more than two cases, even if not directly adjacent
-field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
-
-# Should emit for unions with mixed literal internal types
-field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
-
-# Shouldn't emit for duplicate field types with same value; covered by Y016
-field16: Literal[1] | Literal[1]  # OK
-
-# Shouldn't emit if in new parent type
-field17: Literal[1] | dict[Literal[2], str]  # OK
-
-# Shouldn't emit if not in a union parent
-field18: dict[Literal[1], Literal[2]]  # OK
-
-# Should respect name of literal type used
-field19: typing.Literal[1] | typing.Literal[2]  # Error
-
-# Should emit in cases with newlines
-field20: typing.Union[
-    Literal[
-        1  # test
-    ],
-    Literal[2],
-]  # Error, newline and comment will not be emitted in message
-
-# Should handle multiple unions with multiple members
-field21: Literal[1, 2] | Literal[3, 4]  # Error
-
-# Should emit in cases with `typing.Union` instead of `|`
-field22: typing.Union[Literal[1], Literal[2]]  # Error
-
-# Should emit in cases with `typing_extensions.Literal`
-field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
-
-# Should emit in cases with nested `typing.Union`
-field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
-
-# Should emit in cases with mixed `typing.Union` and `|`
-field25: typing.Union[Literal[1], Literal[2] | str]  # Error
-
-# Should emit only once in cases with multiple nested `typing.Union`
-field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error