Merge branch 'main' into github-2923

.cargo/config.toml

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

.github/dependabot.yml

@@ -1,11 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-      day: "monday"
-      time: "12:00"
-      timezone: "America/New_York"
-    commit-message:
-      prefix: "ci(deps)"

.github/workflows/benchmark.yaml

@@ -1,135 +0,0 @@
-name: Benchmark
-
-on:
-  pull_request:
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
-
-jobs:
-  run-benchmark:
-    if: github.event_name == 'pull_request'
-    name: "Run | ${{ matrix.os }}"
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: "PR - Checkout Branch"
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-
-      - name: "PR - Install Rust toolchain"
-        run: rustup show
-
-      - uses: Swatinem/rust-cache@v2
-
-      - name: "PR - Build benchmarks"
-        uses: actions-rs/cargo@v1
-        with:
-          command: bench
-          args: -p ruff_benchmark --no-run
-
-      - name: "PR - Run benchmarks"
-        run: cargo benchmark --save-baseline=pr
-
-      - name: "Main - Checkout Branch"
-        uses: actions/checkout@v3
-        with:
-          clean: false
-          ref: main
-
-      - name: "Main - Install Rust toolchain"
-        run: rustup show
-
-      - name: "Main - Build benchmarks"
-        uses: actions-rs/cargo@v1
-        with:
-          command: bench
-          args: -p ruff_benchmark --no-run
-
-      - name: "Main - Run benchmarks"
-        run: cargo benchmark --save-baseline=main
-
-      - name: "Upload benchmark results"
-        uses: actions/upload-artifact@v3
-        with:
-          name: benchmark-results-${{ matrix.os }}
-          path: ./target/criterion
-
-      # Cleanup
-      - name: Remove Criterion Artifact
-        uses: JesseTG/rm@v1.0.3
-        with:
-          path: ./target/criterion
-
-  benchmark-compare:
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    name: Compare
-    needs:
-      - run-benchmark
-
-    steps:
-      - name: "Install Rust toolchain"
-        run: rustup show
-
-      - name: "Install cargo-binstall"
-        uses: taiki-e/install-action@cargo-binstall
-
-      - name: "Install critcmp"
-        run: cargo binstall critcmp -y
-
-      - name: "Linux | Download PR benchmark results"
-        uses: actions/download-artifact@v3
-        with:
-          name: benchmark-results-ubuntu-latest
-          path: ./target/criterion
-
-      - name: "Linux | Compare benchmark results"
-        shell: bash
-        run: |
-          echo "### Benchmark" >> summary.md
-          echo "#### Linux" >> summary.md
-          echo "\`\`\`" >> summary.md
-          critcmp main pr >> summary.md
-          echo "\`\`\`" >> summary.md
-          echo "" >> summary.md
-
-      - name: "Linux | Cleanup benchmark results"
-        run: rm -rf ./target/criterion
-
-      - name: "Windows | Download PR benchmark results"
-        uses: actions/download-artifact@v3
-        with:
-          name: benchmark-results-windows-latest
-          path: ./target/criterion
-
-      - name: "Windows | Compare benchmark results"
-        shell: bash
-        run: |
-          echo "#### Windows" >> summary.md
-          echo "\`\`\`" >> summary.md
-          critcmp main pr >> summary.md
-          echo "\`\`\`" >> summary.md
-          echo "" >> summary.md
-
-          echo ${{ github.event.pull_request.number }} > pr-number
-
-          cat summary.md > $GITHUB_STEP_SUMMARY
-
-      - uses: actions/upload-artifact@v3
-        name: Upload PR Number
-        with:
-          name: pr-number
-          path: pr-number
-
-      - uses: actions/upload-artifact@v3
-        name: Upload Summary
-        with:
-          name: summary
-          path: summary.md

.github/workflows/ci.yaml

@@ -17,6 +17,20 @@ env:
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
+  cargo-build:
+    name: "cargo build"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: "Install Rust toolchain"
+        run: rustup show
+      - uses: Swatinem/rust-cache@v1
+      - run: cargo build --all
+      - run: ./target/debug/ruff_dev generate-all
+      - run: git diff --quiet README.md || echo "::error file=README.md::This file is outdated. Run 'cargo dev generate-all'."
+      - run: git diff --quiet ruff.schema.json || echo "::error file=ruff.schema.json::This file is outdated. Run 'cargo dev generate-all'."
+      - run: git diff --exit-code -- README.md ruff.schema.json docs
+
   cargo-fmt:
     name: "cargo fmt"
     runs-on: ubuntu-latest
@@ -34,7 +48,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: |
           rustup component add clippy
-      - uses: Swatinem/rust-cache@v2
+      - uses: Swatinem/rust-cache@v1
       - run: cargo clippy --workspace --all-targets --all-features -- -D warnings
 
   cargo-clippy-wasm:
@@ -46,8 +60,8 @@ jobs:
         run: |
           rustup component add clippy
           rustup target add wasm32-unknown-unknown
-      - uses: Swatinem/rust-cache@v2
-      - run: cargo clippy -p ruff_wasm --target wasm32-unknown-unknown --all-features -- -D warnings
+      - uses: Swatinem/rust-cache@v1
+      - run: cargo clippy -p ruff --target wasm32-unknown-unknown --all-features -- -D warnings
 
   cargo-test:
     strategy:
@@ -59,9 +73,9 @@ jobs:
       - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
-      - uses: Swatinem/rust-cache@v2
+      - uses: Swatinem/rust-cache@v1
       - run: cargo install cargo-insta
-      - run: pip install black[d]==23.1.0
+      - run: pip install black[d]==22.12.0
       - name: "Run tests (Ubuntu)"
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
@@ -79,30 +93,6 @@ jobs:
         env:
           # Setting RUSTDOCFLAGS because `cargo doc --check` isn't yet implemented (https://github.com/rust-lang/cargo/issues/10025).
           RUSTDOCFLAGS: "-D warnings"
-      - uses: actions/upload-artifact@v3
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        with:
-          name: ruff
-          path: target/debug/ruff
-
-  cargo-test-wasm:
-    runs-on: ubuntu-latest
-    name: "cargo test (wasm)"
-    steps:
-      - uses: actions/checkout@v3
-      - name: "Install Rust toolchain"
-        run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: "npm"
-          cache-dependency-path: playground/package-lock.json
-      - uses: jetli/wasm-pack-action@v0.4.0
-      - uses: Swatinem/rust-cache@v2
-      - name: "Run wasm-pack"
-        run: |
-          cd crates/ruff_wasm
-          wasm-pack test --node
 
   scripts:
     name: "test scripts"
@@ -111,7 +101,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
-      - uses: Swatinem/rust-cache@v2
+      - uses: Swatinem/rust-cache@v1
       - run: ./scripts/add_rule.py --name DoTheThing --code PLC999 --linter pylint
       - run: cargo check
       - run: |
@@ -119,6 +109,21 @@ jobs:
           ./scripts/add_rule.py --name FirstRule --code TST001 --linter test
       - run: cargo check
 
+  maturin-build:
+    name: "maturin build"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: "Install Rust toolchain"
+        run: rustup show
+      - uses: Swatinem/rust-cache@v1
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+      - run: pip install maturin
+      - run: maturin build -b bin
+      - run: python scripts/transform_readme.py --target pypi
+
   typos:
     name: "spell check"
     runs-on: ubuntu-latest
@@ -127,74 +132,3 @@ jobs:
       - uses: crate-ci/typos@master
         with:
           files: .
-
-  ecosystem:
-    name: "ecosystem"
-    runs-on: ubuntu-latest
-    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'
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.11"
-
-      - uses: actions/download-artifact@v3
-        name: Download Ruff binary
-        id: ruff-target
-        with:
-          name: ruff
-          path: target/debug
-
-      - uses: dawidd6/action-download-artifact@v2
-        name: Download base results
-        with:
-          name: ruff
-          branch: ${{ github.event.pull_request.base.ref }}
-          check_artifacts: true
-
-      - name: Run ecosystem check
-        run: |
-          # Make executable, since artifact download doesn't preserve this
-          chmod +x ruff ${{ steps.ruff-target.outputs.download-path }}/ruff
-
-          scripts/check_ecosystem.py ruff ${{ steps.ruff-target.outputs.download-path }}/ruff | tee ecosystem-result
-          cat ecosystem-result > $GITHUB_STEP_SUMMARY
-
-          echo ${{ github.event.number }} > pr-number
-
-      - uses: actions/upload-artifact@v3
-        name: Upload PR Number
-        with:
-          name: pr-number
-          path: pr-number
-
-      - uses: actions/upload-artifact@v3
-        name: Upload Results
-        with:
-          name: ecosystem-result
-          path: ecosystem-result
-
-  cargo-udeps:
-    name: "cargo udeps"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: "Install Rust toolchain"
-        run: rustup toolchain install nightly
-      - name: "Install cargo-udeps"
-        uses: taiki-e/install-action@cargo-udeps
-      - name: "Run cargo-udeps"
-        run: |
-          unused_dependencies=$(cargo +nightly udeps > unused.txt && cat unused.txt | cut -d $'\n' -f 2-)
-          if [ -z "$unused_dependencies" ]; then
-            echo "No unused dependencies found" > $GITHUB_STEP_SUMMARY
-            exit 0
-          else
-            echo "Unused dependencies found" > $GITHUB_STEP_SUMMARY
-            echo '```console' >> $GITHUB_STEP_SUMMARY
-            echo "$unused_dependencies" >> $GITHUB_STEP_SUMMARY
-            echo '```' >> $GITHUB_STEP_SUMMARY
-            exit 1
-          fi

.github/workflows/docs.yaml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-python@v4
       - name: "Install Rust toolchain"
         run: rustup show
-      - uses: Swatinem/rust-cache@v2
+      - uses: Swatinem/rust-cache@v1
       - name: "Install dependencies"
         run: |
           pip install -r docs/requirements.txt

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

@@ -133,7 +133,7 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --no-default-features --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - uses: uraimo/run-on-arch-action@v2
+      - uses: uraimo/run-on-arch-action@v2.5.0
         if: matrix.target != 'ppc64'
         name: Install built wheel
         with:
@@ -206,7 +206,7 @@ jobs:
           target: ${{ matrix.platform.target }}
           manylinux: musllinux_1_2
           args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - uses: uraimo/run-on-arch-action@v2
+      - uses: uraimo/run-on-arch-action@master
         name: Install built wheel
         with:
           arch: ${{ matrix.platform.arch }}

.github/workflows/playground.yaml

@@ -28,7 +28,7 @@ jobs:
       - uses: jetli/wasm-pack-action@v0.4.0
       - uses: jetli/wasm-bindgen-action@v0.2.0
       - name: "Run wasm-pack"
-        run: wasm-pack build --target web --out-dir ../../playground/src/pkg crates/ruff_wasm
+        run: wasm-pack build --target web --out-dir ../../playground/src/pkg crates/ruff
       - name: "Install Node dependencies"
         run: npm ci
         working-directory: playground

.github/workflows/pr-comment.yaml

@@ -1,84 +0,0 @@
-name: PR Check Comment
-
-on:
-  workflow_run:
-    workflows: [CI, Benchmark]
-    types: [completed]
-  workflow_dispatch:
-    inputs:
-      workflow_run_id:
-        description: The ecosystem workflow that triggers the workflow run
-        required: true
-
-permissions:
-  pull-requests: write
-
-jobs:
-  comment:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dawidd6/action-download-artifact@v2
-        name: Download PR Number
-        with:
-          name: pr-number
-          run_id: ${{ github.event.workflow_run.id ||  github.event.inputs.workflow_run_id }}
-          if_no_artifact_found: ignore
-
-      - name: Extract PR Number
-        id: pr-number
-        run: |
-          if [[ -f pr-number ]]
-          then
-            echo "pr-number=$(<pr-number)" >> $GITHUB_OUTPUT
-          fi
-
-      - uses: dawidd6/action-download-artifact@v2
-        name: "Download Ecosystem Result"
-        id: download-ecosystem-result
-        if: steps.pr-number.outputs.pr-number
-        with:
-          name: ecosystem-result
-          workflow: ci.yaml
-          pr: ${{ steps.pr-number.outputs.pr-number }}
-          path: pr/ecosystem
-          if_no_artifact_found: ignore
-
-      - uses: dawidd6/action-download-artifact@v2
-        name: "Download Benchmark Result"
-        id: download-benchmark-result
-        if: steps.pr-number.outputs.pr-number
-        with:
-          name: summary
-          workflow: benchmark.yaml
-          pr: ${{ steps.pr-number.outputs.pr-number }}
-          path: pr/benchmark
-          if_no_artifact_found: ignore
-
-      - name: Generate Comment
-        id: generate-comment
-        if: steps.download-ecosystem-result.outputs.found_artifact == 'true' || steps.download-benchmark-result.outputs.found_artifact == 'true'
-        run: |
-          echo 'comment<<EOF' >> $GITHUB_OUTPUT
-          echo '## PR Check Results' >> $GITHUB_OUTPUT
-
-          if [[ -f pr/ecosystem/ecosystem-result ]]
-          then
-            echo "### Ecosystem" >> $GITHUB_OUTPUT
-            cat pr/ecosystem/ecosystem-result >> $GITHUB_OUTPUT
-            echo "" >> $GITHUB_OUTPUT
-          fi
-
-          if [[ -f pr/benchmark/summary.md ]]
-          then
-            cat pr/benchmark/summary.md >> $GITHUB_OUTPUT
-          fi
-
-          echo 'EOF' >> $GITHUB_OUTPUT
-
-      - name: Create or update comment
-        if: steps.generate-comment.outputs.comment
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          pr_number: ${{ steps.pr-number.outputs.pr-number }}
-          message: ${{ steps.generate-comment.outputs.comment }}
-          comment_tag: PR Check Results

.github/workflows/ruff.yaml

@@ -208,7 +208,7 @@ jobs:
           target: ${{ matrix.platform.target }}
           manylinux: auto
           args: --release --out dist
-      - uses: uraimo/run-on-arch-action@v2
+      - uses: uraimo/run-on-arch-action@v2.5.0
         if: matrix.platform.arch != 'ppc64'
         name: Install built wheel
         with:
@@ -309,7 +309,7 @@ jobs:
           target: ${{ matrix.platform.target }}
           manylinux: musllinux_1_2
           args: --release --out dist
-      - uses: uraimo/run-on-arch-action@v2
+      - uses: uraimo/run-on-arch-action@master
         name: Install built wheel
         with:
           arch: ${{ matrix.platform.arch }}

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 fail_fast: true
 repos:
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.12.1
+    rev: v0.10.1
     hooks:
       - id: validate-pyproject
 
@@ -28,17 +28,17 @@ repos:
       - id: cargo-fmt
         name: cargo fmt
         entry: cargo fmt --
-        language: system
+        language: rust
         types: [rust]
       - id: clippy
         name: clippy
         entry: cargo clippy --workspace --all-targets --all-features -- -D warnings
-        language: system
+        language: rust
         pass_filenames: false
       - id: ruff
         name: ruff
         entry: cargo run -p ruff_cli -- check --no-cache --force-exclude --fix --exit-non-zero-on-fix
-        language: system
+        language: rust
         types_or: [python, pyi]
         require_serial: true
         exclude: |
@@ -49,7 +49,7 @@ repos:
       - id: dev-generate-all
         name: dev-generate-all
         entry: cargo dev generate-all
-        language: system
+        language: rust
         pass_filenames: false
         exclude: target
 

BREAKING_CHANGES.md

@@ -145,4 +145,4 @@ default.
 `pyproject.toml` files are now resolved hierarchically, such that for each Python file, we find
 the first `pyproject.toml` file in its path, and use that to determine its lint settings.
 
-See the [documentation](https://beta.ruff.rs/docs/configuration/#python-file-discovery) for more.
+See the [README](https://github.com/charliermarsh/ruff#pyprojecttoml-discovery) for more.

CONTRIBUTING.md

@@ -104,7 +104,7 @@ At a high level, the steps involved in adding a new lint rule are as follows:
 
 1. Determine a name for the new rule as per our [rule naming convention](#rule-naming-convention).
 1. Create a file for your rule (e.g., `crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs`).
-1. In that file, define a violation struct. You can grep for `#[violation]` to see examples.
+1. In that file, define a violation struct. You can grep for `define_violation!` to see examples.
 1. Map the violation struct to a rule code in `crates/ruff/src/registry.rs` (e.g., `E402`).
 1. Define the logic for triggering the violation in `crates/ruff/src/checkers/ast.rs` (for AST-based
    checks), `crates/ruff/src/checkers/tokens.rs` (for token-based checks), `crates/ruff/src/checkers/lines.rs`
@@ -115,7 +115,7 @@ At a high level, the steps involved in adding a new lint rule are as follows:
 
 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
+contain a struct defined via `define_violation!`, along with a function that creates the violation
 based on any required inputs. (Many of the existing examples live in `crates/ruff/src/violations.rs`,
 but we're looking to place new rules in their own files.)
 

Cargo.lock

@@ -289,9 +289,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.1.8"
+version = "4.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5"
+checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
 dependencies = [
  "bitflags",
  "clap_derive",
@@ -308,19 +308,18 @@ version = "4.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd125be87bf4c255ebc50de0b7f4d2a6201e8ac3dc86e39c0ad081dc5e7236fe"
 dependencies = [
- "clap 4.1.8",
+ "clap 4.1.6",
 ]
 
 [[package]]
 name = "clap_complete_command"
-version = "0.5.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d"
+checksum = "4160b4a4f72ef58bd766bad27c09e6ef1cc9d82a22f6a0f55d152985a4a48e31"
 dependencies = [
- "clap 4.1.8",
+ "clap 4.1.6",
  "clap_complete",
  "clap_complete_fig",
- "clap_complete_nushell",
 ]
 
 [[package]]
@@ -329,25 +328,15 @@ version = "4.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63a06158a72dbb088f864887b4409fd22600ba379f3cee3040f842234cc5c2d0"
 dependencies = [
- "clap 4.1.8",
- "clap_complete",
-]
-
-[[package]]
-name = "clap_complete_nushell"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fa41f5e6aa83bd151b70fd0ceaee703d68cd669522795dc812df9edad1252c"
-dependencies = [
- "clap 4.1.8",
+ "clap 4.1.6",
  "clap_complete",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.1.8"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0"
+checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -438,9 +427,9 @@ dependencies = [
 
 [[package]]
 name = "console_log"
-version = "0.2.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "878ad067d4089144a36ee412d665916c665430eb84c0057b9987f424a5d15c03"
+checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494"
 dependencies = [
  "log",
  "web-sys",
@@ -565,16 +554,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote",
- "syn",
-]
-
 [[package]]
 name = "cxx"
 version = "1.0.91"
@@ -619,6 +598,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "diff"
 version = "0.1.13"
@@ -780,10 +770,10 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.259"
+version = "0.0.253"
 dependencies = [
  "anyhow",
- "clap 4.1.8",
+ "clap 4.1.6",
  "colored",
  "configparser",
  "once_cell",
@@ -1090,6 +1080,12 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
 
+[[package]]
+name = "joinery"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5"
+
 [[package]]
 name = "js-sys"
 version = "0.3.61"
@@ -1373,6 +1369,15 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "nom8"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "notify"
 version = "5.1.0"
@@ -1400,6 +1405,7 @@ dependencies = [
  "autocfg",
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1409,6 +1415,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
 dependencies = [
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1440,6 +1447,27 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e0072973714303aa6e3631c7e8e777970cf4bdd25dc4932e41031027b8bcc4e"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0629cbd6b897944899b1f10496d9c4a7ac5878d45fd61bc22e9e79bfbbc29597"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.17.1"
@@ -1458,15 +1486,6 @@ version = "6.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
 
-[[package]]
-name = "output_vt100"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -1514,12 +1533,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
 [[package]]
 name = "peg"
 version = "0.8.1"
@@ -1547,18 +1560,6 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739"
 
-[[package]]
-name = "pep440_rs"
-version = "0.2.0"
-source = "git+https://github.com/konstin/pep440-rs.git?rev=a8fef4ec47f4c25b070b39cdbe6a0b9847e49941#a8fef4ec47f4c25b070b39cdbe6a0b9847e49941"
-dependencies = [
- "lazy_static",
- "regex",
- "serde",
- "tracing",
- "unicode-width",
-]
-
 [[package]]
 name = "percent-encoding"
 version = "2.2.0"
@@ -1757,15 +1758,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "pretty_assertions"
+name = "proc-macro-crate"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
+checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34"
 dependencies = [
- "ctor",
- "diff",
- "output_vt100",
- "yansi",
+ "once_cell",
+ "toml_edit",
 ]
 
 [[package]]
@@ -1871,9 +1870,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.7.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
 dependencies = [
  "either",
  "rayon-core",
@@ -1881,9 +1880,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.11.0"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
@@ -1982,16 +1981,22 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.259"
+version = "0.0.253"
 dependencies = [
  "anyhow",
  "bisection",
  "bitflags",
+ "cfg-if",
  "chrono",
- "clap 4.1.8",
+ "clap 4.1.6",
  "colored",
+ "console_error_panic_hook",
+ "console_log",
+ "criterion",
+ "derivative",
  "dirs",
  "fern",
+ "getrandom",
  "glob",
  "globset",
  "ignore",
@@ -1999,6 +2004,7 @@ dependencies = [
  "insta",
  "is-macro",
  "itertools",
+ "js-sys",
  "libcst",
  "log",
  "natord",
@@ -2007,16 +2013,10 @@ dependencies = [
  "num-traits",
  "once_cell",
  "path-absolutize",
- "pathdiff",
- "pep440_rs",
- "pretty_assertions",
  "regex",
  "result-like",
- "ruff_cache",
- "ruff_diagnostics",
  "ruff_macros",
- "ruff_python_ast",
- "ruff_python_stdlib",
+ "ruff_python",
  "ruff_rustpython",
  "rustc-hash",
  "rustpython-common",
@@ -2024,7 +2024,7 @@ dependencies = [
  "schemars",
  "semver",
  "serde",
- "serde_json",
+ "serde-wasm-bindgen",
  "shellexpand",
  "smallvec",
  "strum",
@@ -2032,38 +2032,15 @@ dependencies = [
  "test-case",
  "textwrap",
  "thiserror",
+ "titlecase",
  "toml",
-]
-
-[[package]]
-name = "ruff_benchmark"
-version = "0.0.0"
-dependencies = [
- "criterion",
- "mimalloc",
- "once_cell",
- "ruff",
- "serde",
- "serde_json",
- "tikv-jemallocator",
- "ureq",
- "url",
-]
-
-[[package]]
-name = "ruff_cache"
-version = "0.0.0"
-dependencies = [
- "filetime",
- "globset",
- "itertools",
- "regex",
- "ruff_macros",
+ "wasm-bindgen",
+ "wasm-bindgen-test",
 ]
 
 [[package]]
 name = "ruff_cli"
-version = "0.0.259"
+version = "0.0.253"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -2073,7 +2050,7 @@ dependencies = [
  "bitflags",
  "cachedir",
  "chrono",
- "clap 4.1.8",
+ "clap 4.1.6",
  "clap_complete_command",
  "clearscreen",
  "colored",
@@ -2089,9 +2066,6 @@ dependencies = [
  "rayon",
  "regex",
  "ruff",
- "ruff_cache",
- "ruff_diagnostics",
- "ruff_python_stdlib",
  "rustc-hash",
  "serde",
  "serde_json",
@@ -2109,15 +2083,13 @@ name = "ruff_dev"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "clap 4.1.8",
+ "clap 4.1.6",
  "itertools",
  "libcst",
  "once_cell",
- "pretty_assertions",
  "regex",
  "ruff",
  "ruff_cli",
- "ruff_diagnostics",
  "rustpython-common",
  "rustpython-parser",
  "schemars",
@@ -2127,15 +2099,6 @@ dependencies = [
  "textwrap",
 ]
 
-[[package]]
-name = "ruff_diagnostics"
-version = "0.0.0"
-dependencies = [
- "ruff_python_ast",
- "rustpython-parser",
- "serde",
-]
-
 [[package]]
 name = "ruff_formatter"
 version = "0.0.0"
@@ -2162,25 +2125,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "ruff_python_ast"
+name = "ruff_python"
 version = "0.0.0"
 dependencies = [
- "anyhow",
- "bitflags",
- "is-macro",
- "itertools",
- "log",
- "nohash-hasher",
- "num-bigint",
- "num-traits",
  "once_cell",
  "regex",
- "ruff_python_stdlib",
- "ruff_rustpython",
  "rustc-hash",
- "rustpython-common",
- "rustpython-parser",
- "smallvec",
 ]
 
 [[package]]
@@ -2188,14 +2138,13 @@ name = "ruff_python_formatter"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "clap 4.1.8",
+ "clap 4.1.6",
  "insta",
  "is-macro",
  "itertools",
  "once_cell",
  "ruff_formatter",
- "ruff_python_ast",
- "ruff_python_stdlib",
+ "ruff_python",
  "ruff_rustpython",
  "ruff_testing_macros",
  "ruff_text_size",
@@ -2206,14 +2155,6 @@ dependencies = [
  "test-case",
 ]
 
-[[package]]
-name = "ruff_python_stdlib"
-version = "0.0.0"
-dependencies = [
- "once_cell",
- "rustc-hash",
-]
-
 [[package]]
 name = "ruff_rustpython"
 version = "0.0.0"
@@ -2229,6 +2170,7 @@ name = "ruff_testing_macros"
 version = "0.0.0"
 dependencies = [
  "glob",
+ "proc-macro-error",
  "proc-macro2",
  "quote",
  "syn",
@@ -2244,25 +2186,6 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "ruff_wasm"
-version = "0.0.0"
-dependencies = [
- "console_error_panic_hook",
- "console_log",
- "getrandom",
- "js-sys",
- "log",
- "ruff",
- "ruff_python_ast",
- "ruff_rustpython",
- "rustpython-parser",
- "serde",
- "serde-wasm-bindgen",
- "wasm-bindgen",
- "wasm-bindgen-test",
-]
-
 [[package]]
 name = "rust-stemmers"
 version = "1.2.0"
@@ -2308,7 +2231,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=c15f670f2c30cfae6b41a1874893590148c74bc4#c15f670f2c30cfae6b41a1874893590148c74bc4"
+source = "git+https://github.com/RustPython/RustPython.git?rev=aa8336ee94492b52458ed8e1517238e5c6c2914c#aa8336ee94492b52458ed8e1517238e5c6c2914c"
 dependencies = [
  "num-bigint",
  "rustpython-compiler-core",
@@ -2317,7 +2240,7 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=c15f670f2c30cfae6b41a1874893590148c74bc4#c15f670f2c30cfae6b41a1874893590148c74bc4"
+source = "git+https://github.com/RustPython/RustPython.git?rev=aa8336ee94492b52458ed8e1517238e5c6c2914c#aa8336ee94492b52458ed8e1517238e5c6c2914c"
 dependencies = [
  "ascii",
  "bitflags",
@@ -2342,21 +2265,24 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=c15f670f2c30cfae6b41a1874893590148c74bc4#c15f670f2c30cfae6b41a1874893590148c74bc4"
+source = "git+https://github.com/RustPython/RustPython.git?rev=aa8336ee94492b52458ed8e1517238e5c6c2914c#aa8336ee94492b52458ed8e1517238e5c6c2914c"
 dependencies = [
+ "bincode",
  "bitflags",
  "bstr 0.2.17",
  "itertools",
  "lz4_flex",
  "num-bigint",
  "num-complex",
+ "num_enum",
  "serde",
+ "thiserror",
 ]
 
 [[package]]
 name = "rustpython-parser"
 version = "0.2.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=c15f670f2c30cfae6b41a1874893590148c74bc4#c15f670f2c30cfae6b41a1874893590148c74bc4"
+source = "git+https://github.com/RustPython/RustPython.git?rev=aa8336ee94492b52458ed8e1517238e5c6c2914c#aa8336ee94492b52458ed8e1517238e5c6c2914c"
 dependencies = [
  "ahash",
  "anyhow",
@@ -2371,7 +2297,7 @@ dependencies = [
  "rustc-hash",
  "rustpython-ast",
  "rustpython-compiler-core",
- "serde",
+ "thiserror",
  "tiny-keccak",
  "unic-emoji-char",
  "unic-ucd-ident",
@@ -2401,9 +2327,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.12"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f"
+checksum = "2a5fb6c61f29e723026dc8e923d94c694313212abbecbbe5f55a7748eec5b307"
 dependencies = [
  "dyn-clone",
  "schemars_derive",
@@ -2413,9 +2339,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.12"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c"
+checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2468,9 +2394,9 @@ dependencies = [
 
 [[package]]
 name = "serde-wasm-bindgen"
-version = "0.5.0"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e"
+checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf"
 dependencies = [
  "js-sys",
  "serde",
@@ -2505,7 +2431,6 @@ version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
 dependencies = [
- "indexmap",
  "itoa",
  "ryu",
  "serde",
@@ -2628,9 +2553,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "d56e159d99e6c2b93995d171050271edb50ecc5288fbc7cc17de8fdce4e58c14"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2701,18 +2626,18 @@ checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8"
 
 [[package]]
 name = "test-case"
-version = "3.0.0"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "679b019fb241da62cc449b33b224d19ebe1c6767b495569765115dd7f7f9fba4"
+checksum = "21d6cf5a7dffb3f9dceec8e6b8ca528d9bd71d36c9f074defb548ce161f598c0"
 dependencies = [
  "test-case-macros",
 ]
 
 [[package]]
-name = "test-case-core"
-version = "3.0.0"
+name = "test-case-macros"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72dc21b5887f4032c4656502d085dc28f2afbb686f25f216472bb0526f4b1b88"
+checksum = "e45b7bf6e19353ddd832745c8fcf77a17a93171df7151187f26623f2b75b5b26"
 dependencies = [
  "cfg-if",
  "proc-macro-error",
@@ -2721,19 +2646,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "test-case-macros"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3786898e0be151a96f730fd529b0e8a10f5990fa2a7ea14e37ca27613c05190"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
- "test-case-core",
-]
-
 [[package]]
 name = "textwrap"
 version = "0.16.0"
@@ -2841,10 +2753,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
-name = "toml"
-version = "0.7.2"
+name = "titlecase"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6"
+checksum = "38397a8cdb017cfeb48bf6c154d6de975ac69ffeed35980fde199d2ee0842042"
+dependencies = [
+ "joinery",
+ "lazy_static",
+ "regex",
+]
+
+[[package]]
+name = "toml"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2854,24 +2777,24 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.4"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825"
+checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b"
 dependencies = [
  "indexmap",
+ "nom8",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
 ]
 
 [[package]]
@@ -2882,21 +2805,9 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
  "cfg-if",
  "pin-project-lite",
- "tracing-attributes",
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-attributes"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "tracing-core"
 version = "0.1.30"
@@ -3038,7 +2949,7 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 [[package]]
 name = "unicode_names2"
 version = "0.6.0"
-source = "git+https://github.com/youknowone/unicode_names2.git?rev=4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde#4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde"
+source = "git+https://github.com/youknowone/unicode_names2.git?tag=v0.6.0+character-alias#4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde"
 dependencies = [
  "phf",
 ]
@@ -3374,15 +3285,6 @@ version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
 
-[[package]]
-name = "winnow"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faf09497b8f8b5ac5d3bb4d05c0a99be20f26fd3d5f2db7b0716e946d5103658"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "yaml-rust"
 version = "0.4.5"
@@ -3392,12 +3294,6 @@ dependencies = [
  "linked-hash-map",
 ]
 
-[[package]]
-name = "yansi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-
 [[package]]
 name = "yansi-term"
 version = "0.1.2"

Cargo.toml

@@ -3,52 +3,29 @@ members = ["crates/*"]
 
 [workspace.package]
 edition = "2021"
-rust-version = "1.67"
-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>"]
+rust-version = "1.67.0"
 
 [workspace.dependencies]
-anyhow = { version = "1.0.69" }
-bitflags = { version = "1.3.2" }
-chrono = { version = "0.4.23", default-features = false, features = ["clock"] }
-clap = { version = "4.1.8", features = ["derive"] }
-colored = { version = "2.0.0" }
-filetime = { version = "0.2.20" }
-glob = { version = "0.3.1" }
-globset = { version = "0.4.10" }
-ignore = { version = "0.4.20" }
-insta = { version = "1.28.0" }
-is-macro = { version = "0.2.2" }
+anyhow = { version = "1.0.66" }
+clap = { version = "4.0.1", features = ["derive"] }
 itertools = { version = "0.10.5" }
+is-macro = { version = "0.2.2" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "80e4c1399f95e5beb532fdd1e209ad2dbb470438" }
-log = { version = "0.4.17" }
-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" }
+once_cell = { version = "1.16.0" }
+regex = { version = "1.6.0" }
 rustc-hash = { version = "1.1.0" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "c15f670f2c30cfae6b41a1874893590148c74bc4" }
-rustpython-parser = { features = [
-  "lalrpop",
-  "serde",
-], git = "https://github.com/RustPython/RustPython.git", rev = "c15f670f2c30cfae6b41a1874893590148c74bc4" }
-schemars = { version = "0.8.12" }
-serde = { version = "1.0.152", features = ["derive"] }
-serde_json = { version = "1.0.93", features = ["preserve_order"] }
-shellexpand = { version = "3.0.0" }
-similar = { version = "2.2.1" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "aa8336ee94492b52458ed8e1517238e5c6c2914c" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "aa8336ee94492b52458ed8e1517238e5c6c2914c" }
+schemars = { version = "0.8.11" }
+serde = { version = "1.0.147", features = ["derive"] }
+serde_json = { version = "1.0.87" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
-syn = { version = "1.0.109" }
-test-case = { version = "3.0.0" }
-textwrap = { version = "0.16.0" }
-toml = { version = "0.7.2" }
+toml = { version = "0.6.0" }
 
 [profile.release]
-lto = "fat"
+panic = "abort"
+lto = "thin"
 codegen-units = 1
 opt-level = 3
 
@@ -62,9 +39,3 @@ opt-level = 3
 # https://github.com/bytecodealliance/wasm-tools/blob/b5c3d98e40590512a3b12470ef358d5c7b983b15/crates/wasmparser/src/limits.rs#L29
 [profile.dev.package.rustpython-parser]
 opt-level = 1
-
-# Use the `--profile release-debug` flag to show symbols in release mode.
-# e.g. `cargo build --profile release-debug`
-[profile.release-debug]
-inherits = "release"
-debug = 1

LICENSE

@@ -393,6 +393,7 @@ are:
     THE SOFTWARE.
   """
 
+
 - autoflake, licensed as follows:
   """
     Copyright (C) 2012-2018 Steven Myint
@@ -416,31 +417,6 @@ are:
     SOFTWARE.
   """
 
-- autotyping, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2023 Jelle Zijlstra
-
-    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, licensed as follows:
   """
     == Flake8 License (MIT) ==

README.md

@@ -137,7 +137,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 ```yaml
 - repo: https://github.com/charliermarsh/ruff-pre-commit
   # Ruff version.
-  rev: 'v0.0.259'
+  rev: 'v0.0.253'
   hooks:
     - id: ruff
 ```
@@ -227,54 +227,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.
 
-Beyond the defaults, Ruff re-implements some of the most popular Flake8 plugins and related code
-quality tools, including:
-
-- [autoflake](https://pypi.org/project/autoflake/)
-- [eradicate](https://pypi.org/project/eradicate/)
-- [flake8-2020](https://pypi.org/project/flake8-2020/)
-- [flake8-annotations](https://pypi.org/project/flake8-annotations/)
-- [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-datetimez](https://pypi.org/project/flake8-datetimez/)
-- [flake8-debugger](https://pypi.org/project/flake8-debugger/)
-- [flake8-django](https://pypi.org/project/flake8-django/)
-- [flake8-docstrings](https://pypi.org/project/flake8-docstrings/)
-- [flake8-eradicate](https://pypi.org/project/flake8-eradicate/)
-- [flake8-errmsg](https://pypi.org/project/flake8-errmsg/)
-- [flake8-executable](https://pypi.org/project/flake8-executable/)
-- [flake8-implicit-str-concat](https://pypi.org/project/flake8-implicit-str-concat/)
-- [flake8-import-conventions](https://github.com/joaopalmeiro/flake8-import-conventions)
-- [flake8-logging-format](https://pypi.org/project/flake8-logging-format/)
-- [flake8-no-pep420](https://pypi.org/project/flake8-no-pep420)
-- [flake8-pie](https://pypi.org/project/flake8-pie/)
-- [flake8-print](https://pypi.org/project/flake8-print/)
-- [flake8-pyi](https://pypi.org/project/flake8-pyi/)
-- [flake8-pytest-style](https://pypi.org/project/flake8-pytest-style/)
-- [flake8-quotes](https://pypi.org/project/flake8-quotes/)
-- [flake8-raise](https://pypi.org/project/flake8-raise/)
-- [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-super](https://pypi.org/project/flake8-super/)
-- [flake8-tidy-imports](https://pypi.org/project/flake8-tidy-imports/)
-- [flake8-type-checking](https://pypi.org/project/flake8-type-checking/)
-- [flake8-use-pathlib](https://pypi.org/project/flake8-use-pathlib/)
-- [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) ([#980](https://github.com/charliermarsh/ruff/issues/980))
-- [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/).
@@ -328,7 +280,6 @@ Ruff is used in a number of major open-source projects, including:
 - [Zulip](https://github.com/zulip/zulip)
 - [Bokeh](https://github.com/bokeh/bokeh)
 - [Pydantic](https://github.com/pydantic/pydantic)
-- [PostHog](https://github.com/PostHog/posthog)
 - [Dagster](https://github.com/dagster-io/dagster)
 - [Dagger](https://github.com/dagger/dagger)
 - [Sphinx](https://github.com/sphinx-doc/sphinx)
@@ -355,13 +306,6 @@ Ruff is used in a number of major open-source projects, including:
 - [meson-python](https://github.com/mesonbuild/meson-python)
 - [ZenML](https://github.com/zenml-io/zenml)
 - [delta-rs](https://github.com/delta-io/delta-rs)
-- [Starlite](https://github.com/starlite-api/starlite)
-- [telemetry-airflow (Mozilla)](https://github.com/mozilla/telemetry-airflow)
-- [Stable Baselines3](https://github.com/DLR-RM/stable-baselines3)
-- [PaddlePaddle](https://github.com/PaddlePaddle/Paddle)
-- [nox](https://github.com/wntrblm/nox)
-- [Neon](https://github.com/neondatabase/neon)
-- [The Algorithms](https://github.com/TheAlgorithms/Python)
 
 ## License
 

crates/flake8_to_ruff/Cargo.toml

@@ -1,18 +1,17 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.259"
+version = "0.0.253"
 edition = { workspace = true }
 rust-version = { workspace = true }
 
 [dependencies]
-ruff = { path = "../ruff", default-features = false }
-
 anyhow = { workspace = true }
 clap = { workspace = true }
-colored = { workspace = true }
+colored = { version = "2.0.0" }
 configparser = { version = "3.0.2" }
 once_cell = { workspace = true }
 regex = { workspace = true }
+ruff = { path = "../ruff", default-features = false }
 rustc-hash = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }

crates/flake8_to_ruff/README.md

@@ -85,9 +85,8 @@ flake8-to-ruff path/to/.flake8 --plugin flake8-builtins --plugin flake8-quotes
    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 [Ruff README](https://github.com/charliermarsh/ruff#user-content-how-does-ruff-compare-to-flake8)
+   for the complete list of supported plugins.)
 
 ## License
 

crates/flake8_to_ruff/src/main.rs

@@ -46,15 +46,8 @@ fn main() -> Result<()> {
         .map(|tool| ExternalConfig {
             black: tool.black.as_ref(),
             isort: tool.isort.as_ref(),
-            ..Default::default()
         })
         .unwrap_or_default();
-    let external_config = ExternalConfig {
-        project: pyproject
-            .as_ref()
-            .and_then(|pyproject| pyproject.project.as_ref()),
-        ..external_config
-    };
 
     // Create Ruff's pyproject.toml section.
     let pyproject = flake8_to_ruff::convert(&config, &external_config, args.plugin)?;

crates/ruff/Cargo.toml

@@ -1,77 +1,83 @@
 [package]
 name = "ruff"
-version = "0.0.259"
-authors.workspace = true
-edition.workspace = true
-rust-version.workspace = true
-documentation.workspace = true
-homepage.workspace = true
-repository.workspace = true
+version = "0.0.253"
+authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
+edition = { workspace = true }
+rust-version = { workspace = true }
+documentation = "https://github.com/charliermarsh/ruff"
+homepage = "https://github.com/charliermarsh/ruff"
+repository = "https://github.com/charliermarsh/ruff"
 readme = "README.md"
 license = "MIT"
 
 [lib]
 name = "ruff"
+crate-type = ["cdylib", "rlib"]
+doctest = false
 
 [dependencies]
-ruff_cache = { path = "../ruff_cache" }
-ruff_diagnostics = { path = "../ruff_diagnostics", features = ["serde"] }
 ruff_macros = { path = "../ruff_macros" }
-ruff_python_ast = { path = "../ruff_python_ast" }
-ruff_python_stdlib = { path = "../ruff_python_stdlib" }
+ruff_python = { path = "../ruff_python" }
 ruff_rustpython = { path = "../ruff_rustpython" }
 
 anyhow = { workspace = true }
 bisection = { version = "0.1.0" }
-bitflags = { workspace = true }
-chrono = { workspace = true }
-clap = { workspace = true, features = ["derive", "string"], optional = true }
-colored = { workspace = true }
+bitflags = { version = "1.3.2" }
+cfg-if = { version = "1.0.0" }
+chrono = { version = "0.4.21", default-features = false, features = ["clock"] }
+clap = { workspace = true, features = ["derive", "env", "string"] }
+colored = { version = "2.0.0" }
+derivative = { version = "2.2.0" }
 dirs = { version = "4.0.0" }
 fern = { version = "0.6.1" }
-glob = { workspace = true }
-globset = { workspace = true }
-ignore = { workspace = true }
-imperative = { version = "1.0.4" }
+glob = { version = "0.3.0" }
+globset = { version = "0.4.9" }
+ignore = { version = "0.4.18" }
+imperative = { version = "1.0.3" }
 is-macro = { workspace = true }
 itertools = { workspace = true }
 libcst = { workspace = true }
-log = { workspace = true }
+log = { version = "0.4.17" }
 natord = { version = "1.0.9" }
 nohash-hasher = { version = "0.2.0" }
 num-bigint = { version = "0.4.3" }
-num-traits = { version = "0.2.15" }
+num-traits = "0.2.15"
 once_cell = { workspace = true }
-path-absolutize = { workspace = true, features = [
-  "once_cell_cache",
-  "use_unix_paths_on_wasm",
-] }
-pathdiff = { version = "0.2.1" }
-pep440_rs = { git = "https://github.com/konstin/pep440-rs.git", features = [
-  "serde",
-], rev = "a8fef4ec47f4c25b070b39cdbe6a0b9847e49941" }
+path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] }
 regex = { workspace = true }
-result-like = { version = "0.4.6" }
+result-like = "0.4.6"
 rustc-hash = { workspace = true }
 rustpython-common = { workspace = true }
 rustpython-parser = { workspace = true }
 schemars = { workspace = true }
 semver = { version = "1.0.16" }
 serde = { workspace = true }
-shellexpand = { workspace = true }
+shellexpand = { version = "3.0.0" }
 smallvec = { version = "1.10.0" }
 strum = { workspace = true }
 strum_macros = { workspace = true }
-textwrap = { workspace = true }
-thiserror = { version = "1.0.38" }
+textwrap = { version = "0.16.0" }
+thiserror = { version = "1.0" }
+titlecase = { version = "2.2.1" }
 toml = { workspace = true }
-serde_json = { workspace = true }
+
+# https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support
+[target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies]
+getrandom = { version = "0.2.7", features = ["js"] }
+console_error_panic_hook = { version = "0.1.7" }
+console_log = { version = "0.2.0" }
+serde-wasm-bindgen = { version = "0.4" }
+js-sys = { version = "0.3.60" }
+wasm-bindgen = { version = "0.2.83" }
 
 [dev-dependencies]
-insta = { workspace = true, features = ["yaml", "redactions"] }
-pretty_assertions = "1.3.0"
-test-case = { workspace = true }
+insta = { version = "1.19.0", features = ["yaml", "redactions"] }
+test-case = { version = "2.2.2" }
+wasm-bindgen-test = { version = "0.3.33" }
+
+[target.'cfg(not(target_family = "wasm"))'.dev-dependencies]
+criterion = { version = "0.4.0" }
 
 [features]
 default = []
-jupyter_notebook = []
+logical_lines = []

crates/ruff/resources/test/disallowed_rule_names.txt

@@ -2,7 +2,3 @@ avoid-*
 do-not-*
 uses-*
 *-used
-rewrite-*
-prefer-*
-consider-*
-use-*

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

@@ -1,42 +0,0 @@
-class Foo:
-    def __str__(self):
-        ...
-
-    def __repr__(self):
-        ...
-
-    def __len__(self):
-        ...
-
-    def __length_hint__(self):
-        ...
-
-    def __init__(self):
-        ...
-
-    def __del__(self):
-        ...
-
-    def __bool__(self):
-        ...
-
-    def __bytes__(self):
-        ...
-
-    def __format__(self, format_spec):
-        ...
-
-    def __contains__(self, item):
-        ...
-
-    def __complex__(self):
-        ...
-
-    def __int__(self):
-        ...
-
-    def __float__(self):
-        ...
-
-    def __index__(self):
-        ...

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

@@ -1,3 +0,0 @@
-import pickle
-
-pickle.loads()

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

@@ -1,3 +0,0 @@
-from telnetlib import Telnet
-
-Telnet("localhost", 23)

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

@@ -1,11 +0,0 @@
-import warnings
-
-"""
-Should emit:
-B028 - on lines 8 and 9
-"""
-
-warnings.warn(DeprecationWarning("test"))
-warnings.warn(DeprecationWarning("test"), source=None)
-warnings.warn(DeprecationWarning("test"), source=None, stacklevel=2)
-warnings.warn(DeprecationWarning("test"), stacklevel=1)

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

@@ -1,47 +0,0 @@
-"""
-Should emit:
-B030:
- - line 12, column 8
- - line 17, column 9
- - line 22, column 21
- - line 27, column 37
-"""
-
-try:
-    pass
-except 1:  # error
-    pass
-
-try:
-    pass
-except (1, ValueError):  # error
-    pass
-
-try:
-    pass
-except (ValueError, (RuntimeError, (KeyError, TypeError))):  # error
-    pass
-
-try:
-    pass
-except (ValueError, *(RuntimeError, (KeyError, TypeError))):  # error
-    pass
-
-
-try:
-    pass
-except (ValueError, *(RuntimeError, TypeError)):  # ok
-    pass
-
-try:
-    pass
-except (ValueError, *[RuntimeError, *(TypeError,)]):  # ok
-    pass
-
-def what_to_catch():
-    return ...
-
-try:
-    pass
-except what_to_catch():  # ok
-    pass

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

@@ -1,19 +1,6 @@
 x = [1, 2, 3]
-y = [("a", 1), ("b", 2), ("c", 3)]
-z = [(1,), (2,), (3,)]
-d = {"a": 1, "b": 2, "c": 3}
-
 [i for i in x]
 {i for i in x}
-{k: v for k, v in y}
-{k: v for k, v in d.items()}
 
-[i for i, in z]
-[i for i, j in y]
 [i for i in x if i > 1]
 [i for i in x for j in x]
-
-{v: k for k, v in y}
-{k.foo: k for k in y}
-{k["foo"]: k for k in y}
-{k: v if v else None for k, v in y}

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

@@ -1,113 +0,0 @@
-from django.db import models
-from django.db.models import Model
-
-
-class StrBeforeRandomField(models.Model):
-    """Model with `__str__` before a random property."""
-
-    class Meta:
-        verbose_name = "test"
-        verbose_name_plural = "tests"
-
-    def __str__(self):
-        return ""
-
-    random_property = "foo"
-
-
-class StrBeforeFieldModel(models.Model):
-    """Model with `__str__` before fields."""
-
-    class Meta:
-        verbose_name = "test"
-        verbose_name_plural = "tests"
-
-    def __str__(self):
-        return "foobar"
-
-    first_name = models.CharField(max_length=32)
-
-
-class ManagerBeforeField(models.Model):
-    """Model with manager before fields."""
-
-    objects = "manager"
-
-    class Meta:
-        verbose_name = "test"
-        verbose_name_plural = "tests"
-
-    def __str__(self):
-        return "foobar"
-
-    first_name = models.CharField(max_length=32)
-
-
-class CustomMethodBeforeStr(models.Model):
-    """Model with a custom method before `__str__`."""
-
-    class Meta:
-        verbose_name = "test"
-        verbose_name_plural = "tests"
-
-    def my_method(self):
-        pass
-
-    def __str__(self):
-        return "foobar"
-
-
-class GetAbsoluteUrlBeforeSave(Model):
-    """Model with `get_absolute_url` method before `save` method.
-
-    Subclass this directly using the `Model` class.
-    """
-
-    def get_absolute_url(self):
-        pass
-
-    def save(self):
-        pass
-
-
-class ConstantsAreNotFields(models.Model):
-    """Model with an assignment to a constant after `__str__`."""
-
-    first_name = models.CharField(max_length=32)
-
-    class Meta:
-        verbose_name = "test"
-        verbose_name_plural = "tests"
-
-    def __str__(self):
-        pass
-
-    MY_CONSTANT = id(1)
-
-
-class PerfectlyFine(models.Model):
-    """Model which has everything in perfect order."""
-
-    first_name = models.CharField(max_length=32)
-    last_name = models.CharField(max_length=32)
-    objects = "manager"
-
-    class Meta:
-        verbose_name = "test"
-        verbose_name_plural = "tests"
-
-    def __str__(self):
-        return "Perfectly fine!"
-
-    def save(self, **kwargs):
-        super(PerfectlyFine, self).save(**kwargs)
-
-    def get_absolute_url(self):
-        return "http://%s" % self
-
-    def my_method(self):
-        pass
-
-    @property
-    def random_property(self):
-        return "%s" % self

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

@@ -8,9 +8,3 @@ any({x.id for x in bar})
 # PIE 802
 any([x.id for x in bar])
 all([x.id for x in bar])
-any(  # first comment
-    [x.id for x in bar],  # second comment
-)  # third comment
-all(  # first comment
-    [x.id for x in bar],  # second comment
-)  # third comment

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

@@ -6,8 +6,6 @@ obj.endswith("foo") or obj.endswith("bar")
 obj.startswith(foo) or obj.startswith(bar)
 # error
 obj.startswith(foo) or obj.startswith("foo")
-# error
-obj.endswith(foo) or obj.startswith(foo) or obj.startswith("foo")
 
 # ok
 obj.startswith(("foo",  "bar"))

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

@@ -1,10 +1,3 @@
-import math
-import os
-import sys
-from math import inf
-
-import numpy as np
-
 def f12(
     x,
     y: str = os.pathsep,  # Error PYI011 Only simple default values allowed for typed arguments
@@ -68,49 +61,3 @@ def f22(
     x: complex = -42.5j  # Error PYI011 Only simple default values allowed for typed arguments
     + 4.3j,
 ) -> None: ...
-def f23(
-    x: bool = True,  # OK
-) -> None: ...
-def f24(
-    x: float = 3.14,  # OK
-) -> None: ...
-def f25(
-    x: float = -3.14,  # OK
-) -> None: ...
-def f26(
-    x: complex = -3.14j,  # OK
-) -> None: ...
-def f27(
-    x: complex = -3 - 3.14j,  # OK
-) -> None: ...
-def f28(
-    x: float = math.tau,  # OK
-) -> None: ...
-def f29(
-    x: float = math.inf,  # OK
-) -> None: ...
-def f30(
-    x: float = -math.inf,  # OK
-) -> None: ...
-def f31(
-    x: float = inf,  # Error PYI011 Only simple default values allowed for typed arguments
-) -> None: ...
-def f32(
-    x: float = np.inf,  # Error PYI011 Only simple default values allowed for typed arguments
-) -> None: ...
-def f33(
-    x: float = math.nan,  # OK
-) -> None: ...
-def f34(
-    x: float = -math.nan,  # Error PYI011 Only simple default values allowed for typed arguments
-) -> None: ...
-def f35(
-    x: complex = math.inf  # Error PYI011 Only simple default values allowed for typed arguments
-    + 1j,
-) -> None: ...
-def f36(
-    *, x: str = sys.version,  # OK
-) -> None: ...
-def f37(
-    *, x: str = "" + "",  # Error PYI011 Only simple default values allowed for typed arguments
-) -> None: ...

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

@@ -43,6 +43,3 @@ def f21(
 def f22(
     x=-42.5j + 4.3j,  # Error PYI014
 ) -> None: ...
-def f23(
-  x=True,  # OK
-) -> None: ...

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

@@ -1,33 +0,0 @@
-# From https://github.com/PyCQA/flake8-pyi/blob/4212bec43dbc4020a59b90e2957c9488575e57ba/tests/type_comments.pyi
-
-from collections.abc import Sequence
-from typing import TypeAlias
-
-A: TypeAlias = None  # type: int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-B: TypeAlias = None  # type: str  # And here's an extra comment about why it's that type  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-C: TypeAlias = None  #type: int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-D: TypeAlias = None  #      type: int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-E: TypeAlias = None#    type: int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-F: TypeAlias = None#type:int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-
-def func(
-    arg1,  # type: dict[str, int]  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-    arg2  # type: Sequence[bytes]  # And here's some more info about this arg  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-): ...
-
-class Foo:
-    Attr: TypeAlias = None  # type: set[str]  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-
-G: TypeAlias = None  # type: ignore
-H: TypeAlias = None  # type: ignore[attr-defined]
-I: TypeAlias = None  #type: ignore
-J: TypeAlias = None  #      type: ignore
-K: TypeAlias = None#    type: ignore
-L: TypeAlias = None#type:ignore
-
-# Whole line commented out  # type: int
-M: TypeAlias = None  # type: can't parse me!
-
-class Bar:
-    N: TypeAlias = None  # type: can't parse me either!
-    # This whole line is commented out and indented # type: str

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

@@ -1,33 +0,0 @@
-# From https://github.com/PyCQA/flake8-pyi/blob/4212bec43dbc4020a59b90e2957c9488575e57ba/tests/type_comments.pyi
-
-from collections.abc import Sequence
-from typing import TypeAlias
-
-A: TypeAlias = None  # type: int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-B: TypeAlias = None  # type: str  # And here's an extra comment about why it's that type  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-C: TypeAlias = None  #type: int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-D: TypeAlias = None  #      type: int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-E: TypeAlias = None#    type: int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-F: TypeAlias = None#type:int  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-
-def func(
-    arg1,  # type: dict[str, int]  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-    arg2  # type: Sequence[bytes]  # And here's some more info about this arg  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-): ...
-
-class Foo:
-    Attr: TypeAlias = None  # type: set[str]  # Y033 Do not use type comments in stubs (e.g. use "x: int" instead of "x = ... # type: int")
-
-G: TypeAlias = None  # type: ignore
-H: TypeAlias = None  # type: ignore[attr-defined]
-I: TypeAlias = None  #type: ignore
-J: TypeAlias = None  #      type: ignore
-K: TypeAlias = None#    type: ignore
-L: TypeAlias = None#type:ignore
-
-# Whole line commented out  # type: int
-M: TypeAlias = None  # type: can't parse me!
-
-class Bar:
-    N: TypeAlias = None  # type: can't parse me either!
-    # This whole line is commented out and indented # type: str

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

@@ -293,30 +293,3 @@ def x(y):
 
 def foo(baz: str) -> str:
     return baz
-
-
-def end_of_statement():
-    def example():
-        if True:
-            return ""
-
-
-    def example():
-        if True:
-            return ""
-
-
-    def example():
-        if True:
-            return ""  # type: ignore
-
-
-    def example():
-        if True:
-            return ""  ;
-
-
-    def example():
-        if True:
-            return "" \
-                ;  # type: ignore

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

@@ -6,6 +6,22 @@ def x():
     return a  # error
 
 
+def x():
+    a = 1
+    print(a)
+    a = 2
+    return a  # error
+
+
+def x():
+    a = 1
+    if True:
+        return a  # error
+    a = 2
+    print(a)
+    return a
+
+
 # Can be refactored false positives
 # https://github.com/afonasev/flake8-return/issues/47#issuecomment-1122571066
 def get_bar_if_exists(obj):
@@ -149,6 +165,44 @@ def my_func():
     return foo
 
 
+# Refactored incorrect false positives
+# See test cases above marked: "Can be refactored false positives"
+# https://github.com/afonasev/flake8-return/issues/47#issuecomment-1122571066
+def get_bar_if_exists(obj):
+    if hasattr(obj, "bar"):
+        return str(obj.bar)
+    return ""
+
+
+# https://github.com/afonasev/flake8-return/issues/47#issue-641117366
+def x():
+    formatted = _USER_AGENT_FORMATTER.format(format_string, **values)
+    # clean up after any blank components
+    return formatted.replace("()", "").replace("  ", " ").strip()
+
+
+# https://github.com/afonasev/flake8-return/issues/47#issue-641117366
+def user_agent_username(username=None):
+
+    if not username:
+        return ""
+
+    username = username.replace(" ", "_")  # Avoid spaces or %20.
+    try:
+        username.encode("ascii")  # just test,
+        # but not actually use it
+    except UnicodeEncodeError:
+        username = quote(username.encode("utf-8"))
+    else:
+        # % is legal in the default $wgLegalTitleChars
+        # This is so that ops know the real pywikibot will not
+        # allow a useragent in the username to allow through a
+        # hand-coded percent-encoded value.
+        if "%" in username:
+            username = quote(username)
+    return username
+
+
 # https://github.com/afonasev/flake8-return/issues/116#issue-1367575481
 def no_exception_loop():
     success = False
@@ -206,44 +260,3 @@ def nonlocal_assignment():
         nonlocal X
         X = 1
         return X
-
-
-def decorator() -> Flask:
-    app = Flask(__name__)
-
-    @app.route('/hello')
-    def hello() -> str:
-        """Hello endpoint."""
-        return 'Hello, World!'
-
-    return app
-
-
-def default():
-    y = 1
-
-    def f(x = y) -> X:
-        return x
-
-    return y
-
-
-def get_queryset(option_1, option_2):
-    queryset: Any = None
-    queryset = queryset.filter(a=1)
-    if option_1:
-        queryset = queryset.annotate(b=Value(2))
-    if option_2:
-        queryset = queryset.filter(c=3)
-    return queryset
-
-
-def get_queryset():
-    queryset = Model.filter(a=1)
-    queryset = queryset.filter(c=3)
-    return queryset
-
-
-def get_queryset():
-    queryset = Model.filter(a=1)
-    return queryset  # error

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

@@ -6,8 +6,6 @@
 "yoda" <= compare  # SIM300
 "yoda" < compare  # SIM300
 42 > age  # SIM300
--42 > age  # SIM300
-+42 > age  # SIM300
 YODA == age  # SIM300
 YODA > age  # SIM300
 YODA >= age  # SIM300

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

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

crates/ruff/resources/test/fixtures/flake8_type_checking/TCH004_14.pyi

@@ -1,3 +0,0 @@
-from typing import Tuple
-
-x: Tuple

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

@@ -1,38 +0,0 @@
-from __future__ import annotations
-
-import pathlib
-from typing import TYPE_CHECKING
-
-import pydantic
-from pydantic import BaseModel
-
-if TYPE_CHECKING:
-    import datetime  # TCH004
-    from array import array  # TCH004
-
-    import pandas  # TCH004
-    import pyproj
-
-
-class A(pydantic.BaseModel):
-    x: datetime.datetime
-
-
-class B(BaseModel):
-    x: pandas.DataFrame
-
-
-class C(BaseModel):
-    x: pathlib.Path
-
-
-class E:
-    pass
-
-
-class F(E):
-    x: pyproj.Transformer
-
-
-class G(BaseModel):
-    x: array

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

@@ -1,28 +0,0 @@
-from __future__ import annotations
-
-import geopandas as gpd  # TCH002
-import pydantic
-import pyproj  # TCH002
-from pydantic import BaseModel
-
-import numpy
-
-
-class A(BaseModel):
-    x: pandas.DataFrame
-
-
-class B(pydantic.BaseModel):
-    x: numpy.ndarray
-
-
-class C:
-    pass
-
-
-class D(C):
-    x: pyproj.Transformer
-
-
-class E(C):
-    x: gpd.GeoDataFrame

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

@@ -1,24 +0,0 @@
-from __future__ import annotations
-
-import datetime
-import pathlib
-from uuid import UUID  # TCH003
-
-import pydantic
-from pydantic import BaseModel
-
-
-class A(pydantic.BaseModel):
-    x: datetime.datetime
-
-
-class B(BaseModel):
-    x: pathlib.Path
-
-
-class C:
-    pass
-
-
-class D(C):
-    x: UUID

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

@@ -1,46 +0,0 @@
-from __future__ import annotations
-
-import pathlib
-from typing import TYPE_CHECKING
-
-import attrs
-from attrs import frozen
-
-import numpy
-
-if TYPE_CHECKING:
-    import datetime  # TCH004
-    from array import array  # TCH004
-
-    import pandas  # TCH004
-    import pyproj
-
-
-@attrs.define(auto_attribs=True)
-class A:
-    x: datetime.datetime
-
-
-@attrs.define
-class B:
-    x: pandas.DataFrame
-
-
-@frozen(auto_attribs=True)
-class C:
-    x: pathlib.Path
-
-
-@frozen
-class D:
-    x: array
-
-
-@dataclass
-class E:
-    x: pyproj.Transformer
-
-
-@attrs.define
-class F:
-    x: numpy.ndarray

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

@@ -1,30 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-import attrs
-import pandas
-import pyproj
-from attrs import frozen
-
-import numpy  # TCH002
-
-
-@attrs.define(auto_attribs=True)
-class A:
-    x: pyproj.Transformer
-
-
-@attrs.define
-class B:
-    x: pandas.DataFrame
-
-
-@frozen
-class C:
-    x: pandas.DataFrame
-
-
-@dataclass
-class D:
-    x: numpy.ndarray

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

@@ -1,24 +0,0 @@
-from __future__ import annotations
-
-import datetime
-from array import array
-from dataclasses import dataclass
-from uuid import UUID  # TCH003
-
-import attrs
-from attrs import frozen
-
-
-@attrs.define(auto_attribs=True)
-class A:
-    x: datetime.datetime
-
-
-@frozen
-class B:
-    x: array
-
-
-@dataclass
-class C:
-    x: UUID

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

@@ -1,10 +1,5 @@
 import sys, math
 from os import path, uname
-from json import detect_encoding
-from json import dump
-from json import dumps as json_dumps
-from json import load
-from json import loads as json_loads
 from logging.handlers import StreamHandler, FileHandler
 
 # comment 1
@@ -15,10 +10,9 @@ from third_party import lib4
 
 from foo import bar  # comment 3
 from foo2 import bar2  # comment 4
-from foo3 import bar3, baz3  # comment 5
 
-# comment 6
+# comment 5
 from bar import (
-     a, # comment 7
-     b, # comment 8
-)
+     a, # comment 6
+     b, # comment 7
+)

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

@@ -2,9 +2,7 @@ from a import a1  # import_from
 from c import * # import_from_star
 import a  # import
 import c.d
-from z import z1
 import b as b1  # import_as
-import z
 
 from ..parent import *
 from .my import fn

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

@@ -1,10 +0,0 @@
-# ruff: isort: skip_file
-import e
-import f
-
-# isort: split
-
-import a
-import b
-import c
-import d

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

@@ -6,14 +6,6 @@ def f():
     # isort: on
 
 
-def f():
-    # ruff: isort: off
-    import sys
-    import os
-    import collections
-    # ruff: isort: on
-
-
 def f():
     import sys
     import os  # isort: skip

crates/ruff/resources/test/fixtures/jupyter/R.ipynb

@@ -1,32 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "collapsed": false
-   },
-   "outputs": [],
-   "source": [
-    "print(paste(\"Hello\",\"WoRld\"))\n"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "R",
-   "language": "R",
-   "name": "ir"
-  },
-  "language_info": {
-   "codemirror_mode": "r",
-   "file_extension": ".r",
-   "mimetype": "text/x-r-source",
-   "name": "R",
-   "pygments_lexer": "r",
-   "version": "3.2.3"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 2
-}

crates/ruff/resources/test/fixtures/jupyter/invalid_extension.ipynb

@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-# In[1]:
-
-
-def unused_variable():
-    x = 1
-    y = 2
-    print(f"cell one: {y}")
-
-unused_variable()
-
-
-# Let's do another mistake
-
-# In[2]:
-
-
-def mutable_argument(z=set()):
-  print(f"cell two: {z}")
-
-mutable_argument()
-

crates/ruff/resources/test/fixtures/jupyter/not_json.ipynb

@@ -1 +0,0 @@
-broken "§=($/=(")

crates/ruff/resources/test/fixtures/jupyter/valid.ipynb

@@ -1,88 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "cell one: 2\n"
-     ]
-    }
-   ],
-   "source": [
-    "def unused_variable():\n",
-    "    x = 1\n",
-    "    y = 2\n",
-    "    print(f\"cell one: {y}\")\n",
-    "\n",
-    "unused_variable()"
-   ],
-   "metadata": {
-    "collapsed": false,
-    "ExecuteTime": {
-     "start_time": "2023-03-08T23:01:09.705831Z",
-     "end_time": "2023-03-08T23:01:09.782916Z"
-    }
-   }
-  },
-  {
-   "cell_type": "markdown",
-   "source": [
-    "Let's do another mistake"
-   ],
-   "metadata": {
-    "collapsed": false
-   }
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 2,
-   "metadata": {
-    "collapsed": true,
-    "ExecuteTime": {
-     "start_time": "2023-03-08T23:01:09.733809Z",
-     "end_time": "2023-03-08T23:01:09.915760Z"
-    }
-   },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "cell two: set()\n"
-     ]
-    }
-   ],
-   "source": [
-    "def mutable_argument(z=set()):\n",
-    "  print(f\"cell two: {z}\")\n",
-    "\n",
-    "mutable_argument()\n"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 2
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython2",
-   "version": "2.7.6"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 0
-}

crates/ruff/resources/test/fixtures/jupyter/wrong_schema.ipynb

@@ -1 +0,0 @@
-{}

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

@@ -1,14 +0,0 @@
-#: E211
-spam (1)
-#: E211 E211
-dict ['key'] = list [index]
-#: E211
-dict['key'] ['subkey'] = list[index]
-#: Okay
-spam(1)
-dict['key'] = list[index]
-
-
-# This is not prohibited by PEP8, but avoid it.
-class Foo (Bar, Baz):
-    pass

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

@@ -1,20 +0,0 @@
-#: E231
-a = (1,2)
-#: E231
-a[b1,:]
-#: E231
-a = [{'a':''}]
-#: Okay
-a = (4,)
-b = (5, )
-c = {'text': text[5:]}
-
-result = {
-    'key1': 'value',
-    'key2': 'value',
-}
-
-def foo() -> None:
-    #: E231
-    if (1,2):
-        pass

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

@@ -54,7 +54,3 @@ if type(a) != type(b) or type(a) == type(ccc):
     pass
 
 assert type(res) == type(None)
-
-types = StrEnum
-if x == types.X:
-    pass

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

@@ -1,3 +0,0 @@
-def lorem():
-    """lorem ipsum dolor sit amet consectetur adipiscing elit
-    sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"""

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

@@ -2,8 +2,6 @@
 
 from functools import cached_property
 
-from gi.repository import GObject
-
 # Bad examples
 
 def bad_liouiwnlkjl():
@@ -78,11 +76,6 @@ class Thingy:
         """This property method docstring does not need to be written in imperative mood."""
         return self._beep
 
-    @GObject.Property
-    def good_custom_property(self):
-        """This property method docstring does not need to be written in imperative mood."""
-        return self._beep
-
     @cached_property
     def good_cached_property(self):
         """This property method docstring does not need to be written in imperative mood."""

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

@@ -113,13 +113,3 @@ def f(x, *args, **kwargs):
         **kwargs: keyword arguments
     """
     return x
-
-
-class Test:
-    def f(self, /, arg1: int) -> None:
-        """
-        Some beauty description.
-
-        Args:
-            arg1: some description of arg
-        """

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

@@ -1 +0,0 @@
-''' SAM macro definitions '''

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

@@ -58,15 +58,6 @@ def no_underline_and_no_description():  # noqa: D416
     """
 
 
-@expect(_D213)
-@expect("D407: Missing dashed underline after section ('Returns')")
-@expect("D414: Section has no content ('Returns')")
-def no_underline_and_no_newline():  # noqa: D416
-    """Toggle the gizmo.
-
-    Returns"""
-
-
 @expect(_D213)
 @expect("D410: Missing blank line after section ('Returns')")
 @expect("D414: Section has no content ('Returns')")
@@ -504,12 +495,3 @@ Testing this incorrectly indented docstring.
             x: Test argument.
 
         """
-
-
-def implicit_string_concatenation():
-    """Toggle the gizmo.
-
-    Returns
-    A value of some sort.
-
-    """"Extra content"

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

@@ -1,19 +1,10 @@
-"""Test: imports within `ModuleNotFoundError` and `ImportError` handlers."""
+"""Test: imports within `ModuleNotFoundError` handlers."""
 
 
-def module_not_found_error():
+def check_orjson():
     try:
         import orjson
 
         return True
     except ModuleNotFoundError:
         return False
-
-
-def import_error():
-    try:
-        import orjson
-
-        return True
-    except ImportError:
-        return False

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

@@ -4,7 +4,6 @@
 "{1:{0}}".format(1, 2)  # No issues
 "{1:{0}}".format(1, 2, 3)  # F523
 "{0}{2}".format(1, 2)  # F523, # F524
-"{1.arg[1]!r:0{2['arg']}{1}}".format(1, 2, 3, 4) # F523
 
 # With no indexes
 "{}".format(1, 2)  # F523

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

@@ -1,23 +0,0 @@
-"""Test case: strings used within calls within type annotations."""
-
-from typing import Callable
-
-import bpy
-from mypy_extensions import VarArg
-
-from foo import Bar
-
-
-class LightShow(bpy.types.Operator):
-    label = "Create Character"
-    name = "lightshow.letter_creation"
-
-    filepath: bpy.props.StringProperty(subtype="FILE_PATH")  # OK
-
-
-def f(x: Callable[[VarArg("os")], None]):  # F821
-    pass
-
-
-f(Callable[["Bar"], None])
-f(Callable[["Baz"], None])

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

@@ -1,25 +0,0 @@
-"""Test case: strings used within calls within type annotations."""
-
-from __future__ import annotations
-
-from typing import Callable
-
-import bpy
-from mypy_extensions import VarArg
-
-from foo import Bar
-
-
-class LightShow(bpy.types.Operator):
-    label = "Create Character"
-    name = "lightshow.letter_creation"
-
-    filepath: bpy.props.StringProperty(subtype="FILE_PATH")  # OK
-
-
-def f(x: Callable[[VarArg("os")], None]):  # F821
-    pass
-
-
-f(Callable[["Bar"], None])
-f(Callable[["Baz"], None])

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

@@ -1,24 +0,0 @@
-def test_division():
-    a = 9 / 3
-    assert "No ZeroDivisionError were raised"  # [assert-on-string-literal]
-
-
-def test_division():
-    a = 9 / 3
-    assert a == 3
-
-
-try:
-    assert "bad"  # [assert-on-string-literal]
-except:
-    assert "bad again"  # [assert-on-string-literal]
-
-a = 12
-assert f"hello {a}"  # [assert-on-string-literal]
-assert f"{a}"  # [assert-on-string-literal]
-assert f""  # [assert-on-string-literal]
-assert ""  # [assert-on-string-literal]
-assert b"hello"  # [assert-on-string-literal]
-assert "", b"hi"  # [assert-on-string-literal]
-assert "WhyNotHere?", "HereIsOk"  # [assert-on-string-literal]
-assert 12, "ok here"

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

@@ -1,14 +0,0 @@
-try:
-    1 / 0
-except ZeroDivisionError or ValueError as e:  # [binary-op-exception]
-    pass
-
-try:
-    raise ValueError
-except ZeroDivisionError and ValueError as e:  # [binary-op-exception]
-    print(e)
-
-try:
-    pass
-except (ValueError, Exception, IOError):
-    pass

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

@@ -1,23 +0,0 @@
-x = "a string"
-y = "another string"
-z = ""
-
-
-def errors():
-    if x is "" or x == "":
-        print("x is an empty string")
-
-    if y is not "" or y != "":
-        print("y is not an empty string")
-
-    if "" != z:
-        print("z is an empty string")
-
-
-def ok():
-    if x and not y:
-        print("x is not an empty string, but y is an empty string")
-
-
-data.loc[data["a"] != ""]
-data.loc[data["a"] != "", :]

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

@@ -1,95 +0,0 @@
-while True:
-    try:
-        pass
-    finally:
-        continue  # [continue-in-finally]
-
-while True:
-    try:
-        pass
-    except Exception:
-        continue
-    finally:
-        try:
-            pass
-        finally:
-            continue  # [continue-in-finally]
-        pass
-
-while True:
-    try:
-        pass
-    finally:
-        test = "aa"
-        match test:
-            case "aa":
-                continue  # [continue-in-finally]
-
-while True:
-    try:
-        pass
-    finally:
-        with "aa" as f:
-            continue  # [continue-in-finally]
-
-while True:
-    try:
-        pass
-    finally:
-        if True:
-            continue  # [continue-in-finally]
-        continue  # [continue-in-finally]
-
-        def test():
-            while True:
-                continue
-            try:
-                pass
-            finally:
-                continue  # [continue-in-finally]
-
-
-while True:
-    try:
-        pass
-    finally:
-        continue  # [continue-in-finally]
-
-        def test():
-            while True:
-                continue
-
-
-while True:
-    try:
-        pass
-    finally:
-        for i in range(12):
-            continue
-        continue  # [continue-in-finally]
-
-        while True:
-            pass
-        else:
-            continue  # [continue-in-finally]
-
-        def test():
-            continue
-            while True:
-                continue
-
-
-while True:
-    try:
-        pass
-    finally:
-        if True:
-            pass
-        elif False:
-            continue  # [continue-in-finally]
-        else:
-            continue  # [continue-in-finally]
-            for i in range(10):
-                pass
-            else:
-                continue  # [continue-in-finally]

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

@@ -1,12 +0,0 @@
-import os
-
-tempVar = os.getenv("TEST", 12)  # [invalid-envvar-default]
-goodVar = os.getenv("TESTING", None)
-dictVarBad = os.getenv("AAA", {"a", 7})  # [invalid-envvar-default]
-print(os.getenv("TEST", False))  # [invalid-envvar-default]
-os.getenv("AA", "GOOD")
-os.getenv("AA", f"GOOD")
-os.getenv("AA", "GOOD" + "BAD")
-os.getenv("AA", "GOOD" + 1)
-os.getenv("AA", "GOOD %s" % "BAD")
-os.getenv("B", Z)

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

@@ -1,15 +0,0 @@
-import os
-
-os.getenv(1)  # [invalid-envvar-value]
-os.getenv("a")
-os.getenv("test")
-os.getenv(key="testingAgain")
-os.getenv(key=11)  # [invalid-envvar-value]
-os.getenv(["hello"])  # [invalid-envvar-value]
-os.getenv(key="foo", default="bar")
-os.getenv(key=f"foo", default="bar")
-os.getenv(key="foo" + "bar", default=1)
-os.getenv(key=1 + "bar", default=1)  # [invalid-envvar-value]
-
-AA = "aa"
-os.getenv(AA)

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

@@ -11,9 +11,6 @@ if 10 == 100:  # [comparison-of-constants] R0133
 if 1 == 3:  # [comparison-of-constants] R0133
     pass
 
-if 1 == -3:  # [comparison-of-constants] R0133
-    pass
-
 x = 0
 if 4 == 3 == x:  # [comparison-of-constants] R0133
     pass
@@ -38,12 +35,6 @@ if argc != 1:  # correct
 if argc != 2:  # [magic-value-comparison]
     pass
 
-if argc != -2:  # [magic-value-comparison]
-    pass
-
-if argc != +2:  # [magic-value-comparison]
-    pass
-
 if __name__ == "__main__":  # correct
     pass
 

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

@@ -1,50 +0,0 @@
-import sys
-
-
-def print_python_version():
-    print(sys.version)
-    return None  # [useless-return]
-
-
-def print_python_version():
-    print(sys.version)
-    return None  # [useless-return]
-
-
-def print_python_version():
-    print(sys.version)
-    return None  # [useless-return]
-
-
-class SomeClass:
-    def print_python_version(self):
-        print(sys.version)
-        return None  # [useless-return]
-
-
-def print_python_version():
-    if 2 * 2 == 4:
-        return
-    print(sys.version)
-
-
-def print_python_version():
-    if 2 * 2 == 4:
-        return None
-    return
-
-
-def print_python_version():
-    if 2 * 2 == 4:
-        return None
-
-
-def print_python_version():
-    """This function returns None."""
-    return None
-
-
-def print_python_version():
-    """This function returns None."""
-    print(sys.version)
-    return None  # [useless-return]

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

@@ -25,7 +25,22 @@ avoid-escape = true
 max-complexity = 10
 
 [tool.ruff.pep8-naming]
-classmethod-decorators = ["pydantic.validator"]
+ignore-names = [
+  "setUp",
+  "tearDown",
+  "setUpClass",
+  "tearDownClass",
+  "setUpModule",
+  "tearDownModule",
+  "asyncSetUp",
+  "asyncTearDown",
+  "setUpTestData",
+  "failureException",
+  "longMessage",
+  "maxDiff",
+]
+classmethod-decorators = ["classmethod", "pydantic.validator"]
+staticmethod-decorators = ["staticmethod"]
 
 [tool.ruff.flake8-tidy-imports]
 ban-relative-imports = "parents"

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

@@ -30,17 +30,8 @@ def f(x: "List[str]") -> None:
     ...
 
 
-def f(x: r"List[str]") -> None:
-    ...
-
-
-def f(x: "List[str]") -> None:
-    ...
-
-
-def f(x: """List[str]""") -> None:
-    ...
-
-
-def f(x: "Li" "st[str]") -> None:
+list = "abc"
+
+
+def f(x: List[str]) -> None:
     ...

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

@@ -46,8 +46,3 @@ def f(x: Union[("str", "int"), float]) -> None:
 def f() -> None:
     x: Optional[str]
     x = Optional[str]
-
-    x = Union[str, int]
-    x = Union["str", "int"]
-    x: Union[str, int]
-    x: Union["str", "int"]

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

@@ -12,17 +12,11 @@ Ipsum
 """.encode(
     "utf-8"
 )
-(
-    "Lorem "
-    "Ipsum".encode()
-)
-(
-    "Lorem "  # Comment
-    "Ipsum".encode()  # Comment
-)
-(
-    "Lorem " "Ipsum".encode()
-)
+# b"""
+# Lorem
+#
+# Ipsum
+# """
 
 # `encode` on variables should not be processed.
 string = "hello there"

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

@@ -1,9 +1,9 @@
-import io
-
-with io.open("f.txt", mode="r", buffering=-1, **kwargs) as f:
-    print(f.read())
-
 from io import open
 
 with open("f.txt") as f:
     print(f.read())
+
+import io
+
+with io.open("f.txt", mode="r", buffering=-1, **kwargs) as f:
+    print(f.read())

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

@@ -1,10 +0,0 @@
-import socket
-
-from kombu import Connection, exceptions
-
-try:
-    conn = Connection(settings.CELERY_BROKER_URL)
-    conn.ensure_connection(max_retries=2)
-    conn._close()
-except (socket.error, exceptions.OperationalError):
-    return HttpResponseServerError("cache: cannot connect to broker.")

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

@@ -1,29 +1,24 @@
-# Error (`from unittest import mock`)
+# These should be changed
 if True:
     import mock
 
-# Error (`from unittest import mock`)
 if True:
     import mock, sys
 
-# Error (`from unittest.mock import *`)
-if True:
-    from mock import *
-
-# Error (`from unittest import mock`)
+# This goes to from unitest import mock
 import mock.mock
 
-# Error (`from unittest import mock`)
+# Mock should go on a new line as `from unittest import mock`
 import contextlib, mock, sys
 
-# Error (`from unittest import mock`)
+# Mock should go on a new line as `from unittest import mock`
 import mock, sys
 x = "This code should be preserved one line below the mock"
 
-# Error (`from unittest import mock`)
+# Mock should go on a new line as `from unittest import mock`
 from mock import mock
 
-# Error (keep trailing comma)
+# Should keep trailing comma
 from mock import (
     mock,
     a,
@@ -37,7 +32,7 @@ from mock import (
     mock,
 )
 
-# Error (avoid trailing comma)
+# Should not get a trailing comma
 from mock import (
     mock,
     a,
@@ -62,16 +57,16 @@ if True:
             c
         )
 
-# OK
+# These should not change:
 import os, io
 
-# Error (`from unittest import mock`)
+# Mock should go on a new line as `from unittest import mock`
 import mock, mock
 
-# Error (`from unittest import mock as foo`)
+# Mock should go on a new line as `from unittest import mock as foo`
 import mock as foo
 
-# Error (`from unittest import mock as foo`)
+# Mock should go on a new line as `from unittest import mock as foo`
 from mock import mock as foo
 
 if True:
@@ -86,8 +81,8 @@ if True:
     from mock import mock as foo, mock as bar, mock
 
 
-# OK.
+# This should be unchanged.
 x = mock.Mock()
 
-# Error (`mock.Mock()`).
+# This should change to `mock.Mock`().
 x = mock.mock.Mock()

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

@@ -73,13 +73,3 @@ print("%s \N{snowman}" % (a,))
 print("%(foo)s \N{snowman}" % {"foo": 1})
 
 print(("foo %s " "bar %s") % (x, y))
-
-# Single-value expressions
-print('Hello %s' % "World")
-print('Hello %s' % f"World")
-print('Hello %s (%s)' % bar)
-print('Hello %s (%s)' % bar.baz)
-print('Hello %s (%s)' % bar['bop'])
-print('Hello %(arg)s' % bar)
-print('Hello %(arg)s' % bar.baz)
-print('Hello %(arg)s' % bar['bop'])

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

@@ -1,4 +1,6 @@
 # OK
+"%s" % unknown_type
+
 b"%s" % (b"bytestring",)
 
 "%*s" % (5, "hi")
@@ -55,9 +57,3 @@ pytest.param('"%8s" % (None,)', id="unsafe width-string conversion"),
     """
     % (x,)
 )
-
-'Hello %s' % bar
-
-'Hello %s' % bar.baz
-
-'Hello %s' % bar['bop']

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

@@ -86,14 +86,3 @@ async def c():
 
 async def c():
     return "{}".format(1 + await 3)
-
-
-def d(osname, version, release):
-    return"{}-{}.{}".format(osname, version, release)
-
-
-def e():
-    yield"{}".format(1)
-
-
-assert"{}".format(1)

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

@@ -41,7 +41,7 @@ if True:
         Good,
     )
 
-from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, ContextManager
+from typing import Callable, Match, Pattern, List
 
 if True: from collections import (
     Mapping, Counter)

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

@@ -5,5 +5,3 @@ isinstance(1, int)  # OK
 issubclass("yes", int)  # OK
 isinstance(1, int | float)  # OK
 issubclass("yes", int | str)  # OK
-isinstance(1, ())  # OK
-isinstance(1, (int, *(str, bytes)))  # OK

crates/ruff/resources/test/fixtures/ruff/RUF007.py

@@ -1,25 +0,0 @@
-input = [1, 2, 3]
-otherInput = [2, 3, 4]
-foo = [1, 2, 3, 4]
-
-# OK
-zip(input, otherInput)  # different inputs
-zip(input, otherInput[1:])  # different inputs
-zip(input, input[2:])  # not successive
-zip(input[:-1], input[2:])  # not successive
-list(zip(input, otherInput))  # nested call
-zip(input, input[1::2])  # not successive
-zip(foo[:-1], foo[1:], foo, strict=False)  # more than 2 inputs
-zip(foo[:-1], foo[1:], foo, strict=True)  # more than 2 inputs
-
-# Errors
-zip(input, input[1:])
-zip(input, input[1::1])
-zip(input[:-1], input[1:])
-zip(input[1:], input[2:])
-zip(input[1:-1], input[2:])
-list(zip(input, input[1:]))
-list(zip(input[:-1], input[1:]))
-zip(foo[:-1], foo[1:], strict=True)
-zip(foo[:-1], foo[1:], strict=False)
-zip(foo[:-1], foo[1:], strict=bool(foo))

crates/ruff/resources/test/fixtures/ruff/RUF100_3.py

@@ -1,25 +0,0 @@
-# noqa
-# noqa # comment
-print()  # noqa
-print()  # noqa # comment
-print()  # noqa  # comment
-print()  # noqa comment
-print()  # noqa  comment
-print(a)  # noqa
-print(a)  # noqa # comment
-print(a)  # noqa  # comment
-print(a)  # noqa comment
-print(a)  # noqa  comment
-
-# noqa: E501, F821
-# noqa: E501, F821 # comment
-print()  # noqa: E501, F821
-print()  # noqa: E501, F821 # comment
-print()  # noqa: E501, F821  # comment
-print()  # noqa: E501, F821 comment
-print()  # noqa: E501, F821  comment
-print(a)  # noqa: E501, F821
-print(a)  # noqa: E501, F821 # comment
-print(a)  # noqa: E501, F821  # comment
-print(a)  # noqa: E501, F821 comment
-print(a)  # noqa: E501, F821  comment

crates/ruff/resources/test/fixtures/tryceratops/TRY300.py

@@ -45,10 +45,3 @@ def still_good():
         return process()
     except MyException:
         logger.exception("process failed")
-
-def good_noexcept():
-    try:
-        pass
-        return process()
-    finally:
-        logger.exception("process failed")