Restore RUF ignore

.editorconfig

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

.gitattributes

@@ -1,7 +1,7 @@
 * text=auto eol=lf
 
-crates/ruff_linter/resources/test/fixtures/isort/line_ending_crlf.py text eol=crlf
-crates/ruff_linter/resources/test/fixtures/pycodestyle/W605_1.py text eol=crlf
+crates/ruff/resources/test/fixtures/isort/line_ending_crlf.py text eol=crlf
+crates/ruff/resources/test/fixtures/pycodestyle/W605_1.py text eol=crlf
 
 ruff.schema.json linguist-generated=true text=auto eol=lf
 *.md.snap linguist-language=Markdown

.github/CODEOWNERS

@@ -6,4 +6,4 @@
 # - Order is important. The last matching pattern has the most precedence.
 
 # Jupyter
-/crates/ruff_linter/src/jupyter/ @dhruvmanila
+/crates/ruff/src/jupyter/ @dhruvmanila

.github/dependabot.yml

@@ -4,10 +4,8 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-    labels: ["internal"]
-
-  - package-ecosystem: "cargo"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    labels: ["internal"]
+      day: "monday"
+      time: "12:00"
+      timezone: "America/New_York"
+    commit-message:
+      prefix: "ci(deps)"

.github/release.yml

@@ -4,6 +4,7 @@ changelog:
     labels:
       - internal
       - documentation
+      - formatter
   categories:
     - title: Breaking Changes
       labels:
@@ -11,6 +12,7 @@ changelog:
     - title: Rules
       labels:
         - rule
+        - autofix
     - title: Settings
       labels:
         - configuration
@@ -18,12 +20,6 @@ changelog:
     - title: Bug Fixes
       labels:
         - bug
-    - title: Formatter
-      labels:
-        - formatter
-    - title: Preview
-      labels:
-        - preview
     - title: Other Changes
       labels:
         - "*"

.github/workflows/ci.yaml

@@ -26,11 +26,11 @@ jobs:
       linter: ${{ steps.changed.outputs.linter_any_changed }}
       formatter: ${{ steps.changed.outputs.formatter_any_changed }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - uses: tj-actions/changed-files@v39
+      - uses: tj-actions/changed-files@v38
         id: changed
         with:
           files_yaml: |
@@ -62,7 +62,7 @@ jobs:
     name: "cargo fmt"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup component add rustfmt
       - run: cargo fmt --all --check
@@ -71,14 +71,12 @@ jobs:
     name: "cargo clippy"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: |
           rustup component add clippy
           rustup target add wasm32-unknown-unknown
       - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: "ci"
       - name: "Clippy"
         run: cargo clippy --workspace --all-targets --all-features -- -D warnings
       - name: "Clippy (wasm)"
@@ -91,16 +89,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     name: "cargo test | ${{ matrix.os }}"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install cargo insta"
         uses: taiki-e/install-action@v2
         with:
           tool: cargo-insta
+      - run: pip install black[d]==23.1.0
       - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: "ci"
       - name: "Run tests (Ubuntu)"
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: cargo insta test --all --all-features --unreferenced reject
@@ -109,6 +106,9 @@ jobs:
         shell: bash
         # We can't reject unreferenced snapshots on windows because flake8_executable can't run on windows
         run: cargo insta test --all --all-features
+      # Check linter fix compatibility with Black
+      - name: "Check Black compatibility"
+        run: cargo test --package ruff_cli --test black_compatibility_test -- --ignored
       # Check for broken links in the documentation.
       - run: cargo doc --all --no-deps
         env:
@@ -124,7 +124,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "cargo fuzz"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - uses: Swatinem/rust-cache@v2
@@ -140,7 +140,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "cargo test (wasm)"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
       - uses: actions/setup-node@v3
@@ -150,8 +150,6 @@ jobs:
           cache-dependency-path: playground/package-lock.json
       - uses: jetli/wasm-pack-action@v0.4.0
       - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: "ci"
       - name: "Run wasm-pack"
         run: |
           cd crates/ruff_wasm
@@ -161,12 +159,10 @@ jobs:
     name: "test scripts"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup component add rustfmt
       - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: "ci"
       - run: ./scripts/add_rule.py --name DoTheThing --prefix PL --code C0999 --linter pylint
       - run: cargo check
       - run: cargo fmt --all --check
@@ -185,7 +181,7 @@ jobs:
     # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
     if: github.event_name == 'pull_request' && needs.determine_changes.outputs.linter == 'true'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -230,13 +226,11 @@ jobs:
     name: "cargo udeps"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install nightly Rust toolchain"
         # Only pinned to make caching work, update freely
         run: rustup toolchain install nightly-2023-06-08
       - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: "ci"
       - name: "Install cargo-udeps"
         uses: taiki-e/install-action@cargo-udeps
       - name: "Run cargo-udeps"
@@ -246,14 +240,12 @@ jobs:
     name: "python package"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
       - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: "ci"
       - name: "Prep README.md"
         run: python scripts/transform_readme.py --target pypi
       - name: "Build wheels"
@@ -272,15 +264,13 @@ jobs:
     name: "pre-commit"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: "Install Rust toolchain"
         run: rustup show
       - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: "ci"
       - name: "Install pre-commit"
         run: pip install pre-commit
       - name: "Cache pre-commit"
@@ -304,7 +294,7 @@ jobs:
     env:
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
@@ -314,8 +304,6 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: "ci"
       - name: "Install Insiders dependencies"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
         run: pip install -r docs/requirements-insiders.txt
@@ -341,7 +329,7 @@ jobs:
     needs: determine_changes
     if: needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Cache rust"
@@ -357,7 +345,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Branch"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: "Install Rust toolchain"
         run: rustup show
@@ -368,8 +356,6 @@ jobs:
           tool: cargo-codspeed
 
       - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: "ci"
 
       - name: "Build benchmarks"
         run: cargo codspeed build --features codspeed -p ruff_benchmark

.github/workflows/docs.yaml

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

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

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

.github/workflows/playground.yaml

@@ -17,7 +17,7 @@ jobs:
     env:
       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
       - uses: actions/setup-node@v3
@@ -40,9 +40,8 @@ jobs:
         working-directory: playground
       - name: "Deploy to Cloudflare Pages"
         if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@v3.3.1
+        uses: cloudflare/wrangler-action@v3.1.0
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          # `github.head_ref` is only set during pull requests and for manual runs or tags we use `main` to deploy to production
-          command: pages deploy playground/dist --project-name=ruff-playground --branch ${{ github.head_ref || 'main' }} --commit-hash ${GITHUB_SHA}
+          command: pages publish playground/dist --project-name=ruff --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}

.github/workflows/release.yaml

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

.gitignore

@@ -1,5 +1,5 @@
 # Benchmarking cpython (CONTRIBUTING.md)
-crates/ruff_linter/resources/test/cpython
+crates/ruff/resources/test/cpython
 # generate_mkdocs.py
 mkdocs.generated.yml
 # check_ecosystem.py
@@ -208,9 +208,3 @@ cython_debug/
 # VIM
 .*.sw?
 .sw?
-
-# Custom re-inclusions for the resolver test cases
-!crates/ruff_python_resolver/resources/test/airflow/venv/
-!crates/ruff_python_resolver/resources/test/airflow/venv/lib
-!crates/ruff_python_resolver/resources/test/airflow/venv/lib/python3.11/site-packages/_watchdog_fsevents.cpython-311-darwin.so
-!crates/ruff_python_resolver/resources/test/airflow/venv/lib/python3.11/site-packages/orjson/orjson.cpython-311-darwin.so

.pre-commit-config.yaml

@@ -2,8 +2,8 @@ fail_fast: true
 
 exclude: |
   (?x)^(
-    crates/ruff_linter/resources/.*|
-    crates/ruff_linter/src/rules/.*/snapshots/.*|
+    crates/ruff/resources/.*|
+    crates/ruff/src/rules/.*/snapshots/.*|
     crates/ruff_cli/resources/.*|
     crates/ruff_python_formatter/resources/.*|
     crates/ruff_python_formatter/tests/snapshots/.*|
@@ -23,7 +23,8 @@ repos:
       - id: mdformat
         additional_dependencies:
           - mdformat-mkdocs
-          - mdformat-admon
+          - mdformat-black
+          - black==23.1.0 # Must be the latest version of Black
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.33.0
@@ -51,7 +52,7 @@ repos:
         require_serial: true
         exclude: |
           (?x)^(
-            crates/ruff_linter/resources/.*|
+            crates/ruff/resources/.*|
             crates/ruff_python_formatter/resources/.*
           )$
 

BREAKING_CHANGES.md

@@ -1,50 +1,5 @@
 # Breaking Changes
 
-## 0.1.0
-
-### The deprecated `format` setting has been removed
-
-Ruff previously used the `format` setting, `--format` CLI option, and `RUFF_FORMAT` environment variable to
-configure the output format of the CLI. This usage was deprecated in `v0.0.291` — the `format` setting is now used
-to control Ruff's code formatting. As of this release:
-
-- The `format` setting cannot be used to configure the output format, use `output-format` instead
-- The `RUFF_FORMAT` environment variable is ignored, use `RUFF_OUTPUT_FORMAT` instead
-- The `--format` option has been removed from `ruff check`, use `--output-format` instead
-
-### Unsafe fixes are not applied by default ([#7769](https://github.com/astral-sh/ruff/pull/7769))
-
-Ruff labels fixes as "safe" and "unsafe". The meaning and intent of your code will be retained when applying safe
-fixes, but the meaning could be changed when applying unsafe fixes. Previously, unsafe fixes were always displayed
-and applied when fixing was enabled. Now, unsafe fixes are hidden by default and not applied. The `--unsafe-fixes`
-flag or `unsafe-fixes` configuration option can be used to enable unsafe fixes.
-
-See the [docs](https://docs.astral.sh/ruff/configuration/#fix-safety) for details.
-
-### Remove formatter-conflicting rules from the default rule set  ([#7900](https://github.com/astral-sh/ruff/pull/7900))
-
-Previously, Ruff enabled all implemented rules in Pycodestyle (`E`) by default. Ruff now only includes the
-Pycodestyle prefixes `E4`, `E7`, and `E9` to exclude rules that conflict with automatic formatters. Consequently,
-the stable rule set no longer includes `line-too-long` (`E501`) and `mixed-spaces-and-tabs` (`E101`). Other
-excluded Pycodestyle rules include whitespace enforcement in `E1` and `E2`; these rules are currently in preview, and are already omitted by default.
-
-This change only affects those using Ruff under its default rule set. Users that include `E` in their `select` will experience no change in behavior.
-
-## 0.0.288
-
-### Remove support for emoji identifiers ([#7212](https://github.com/astral-sh/ruff/pull/7212))
-
-Previously, Ruff supported the non-standard compliant emoji identifiers e.g. `📦 = 1`.
-We decided to remove this non-standard language extension, and Ruff now reports syntax errors for emoji identifiers in your code, the same as CPython.
-
-### Improved GitLab fingerprints ([#7203](https://github.com/astral-sh/ruff/pull/7203))
-
-GitLab uses fingerprints to identify new, existing, or fixed violations. Previously, Ruff included the violation's position in the fingerprint. Using the location has the downside that changing any code before the violation causes the fingerprint to change, resulting in GitLab reporting one fixed and one new violation even though it is a pre-existing violation.
-
-Ruff now uses a more stable location-agnostic fingerprint to minimize that existing violations incorrectly get marked as fixed and re-reported as new violations.
-
-Expect GitLab to report each pre-existing violation in your project as fixed and a new violation in your Ruff upgrade PR.
-
 ## 0.0.283 / 0.284
 
 ### The target Python version now defaults to 3.8 instead of 3.10 ([#6397](https://github.com/astral-sh/ruff/pull/6397))
@@ -329,4 +284,4 @@ default.
 `pyproject.toml` files are now resolved hierarchically, such that for each Python file, we find
 the first `pyproject.toml` file in its path, and use that to determine its lint settings.
 
-See the [documentation](https://docs.astral.sh/ruff/configuration/#python-file-discovery) for more.
+See the [documentation](https://beta.ruff.rs/docs/configuration/#python-file-discovery) for more.

CHANGELOG.md

@@ -1,115 +0,0 @@
-# Changelog
-
-This is the first release which uses the `CHANGELOG` file. See [GitHub Releases](https://github.com/astral-sh/ruff/releases) for prior changelog entries.
-
-Read Ruff's new [versioning policy](https://docs.astral.sh/ruff/versioning/).
-
-## 0.1.0
-
-### Breaking changes
-
-- Unsafe fixes are no longer displayed or applied without opt-in ([#7769](https://github.com/astral-sh/ruff/pull/7769))
-- Drop formatting specific rules from the default set ([#7900](https://github.com/astral-sh/ruff/pull/7900))
-- The deprecated `format` setting has been removed ([#7984](https://github.com/astral-sh/ruff/pull/7984))
-    - The `format` setting cannot be used to configure the output format, use `output-format` instead
-    - The `RUFF_FORMAT` environment variable is ignored, use `RUFF_OUTPUT_FORMAT` instead
-    - The `--format` option has been removed from `ruff check`, use `--output-format` instead
-
-### Rule changes
-
-- Extend `reimplemented-starmap` (`FURB140`) to catch calls with a single and starred argument ([#7768](https://github.com/astral-sh/ruff/pull/7768))
-- Improve cases covered by `RUF015` ([#7848](https://github.com/astral-sh/ruff/pull/7848))
-- Update `SIM15` to allow `open` followed by `close` ([#7916](https://github.com/astral-sh/ruff/pull/7916))
-- Respect `msgspec.Struct` default-copy semantics in `RUF012` ([#7786](https://github.com/astral-sh/ruff/pull/7786))
-- Add `sqlalchemy` methods to \`flake8-boolean-trap\`\` exclusion list ([#7874](https://github.com/astral-sh/ruff/pull/7874))
-- Add fix for `PLR1714` ([#7910](https://github.com/astral-sh/ruff/pull/7910))
-- Add fix for `PIE804` ([#7884](https://github.com/astral-sh/ruff/pull/7884))
-- Add fix for `PLC0208` ([#7887](https://github.com/astral-sh/ruff/pull/7887))
-- Add fix for `PYI055` ([#7886](https://github.com/astral-sh/ruff/pull/7886))
-- Update `non-pep695-type-alias` to require `--unsafe-fixes` outside of stub files ([#7836](https://github.com/astral-sh/ruff/pull/7836))
-- Improve fix message for `UP018` ([#7913](https://github.com/astral-sh/ruff/pull/7913))
-- Update `PLW3201` to support `Enum` [sunder names](https://docs.python.org/3/library/enum.html#supported-sunder-names) ([#7987](https://github.com/astral-sh/ruff/pull/7987))
-
-### Preview features
-
-- Only show warnings for empty preview selectors when enabling rules ([#7842](https://github.com/astral-sh/ruff/pull/7842))
-- Add `unnecessary-key-check` to simplify `key in dct and dct[key]` to `dct.get(key)` ([#7895](https://github.com/astral-sh/ruff/pull/7895))
-- Add `assignment-in-assert` to prevent walrus expressions in assert statements ([#7856](https://github.com/astral-sh/ruff/pull/7856))
-- \[`refurb`\] Add `single-item-membership-test` (`FURB171`) ([#7815](https://github.com/astral-sh/ruff/pull/7815))
-- \[`pylint`\] Add `and-or-ternary` (`R1706`) ([#7811](https://github.com/astral-sh/ruff/pull/7811))
-
-_New rules are added in [preview](https://docs.astral.sh/ruff/preview/)._
-
-### Configuration
-
-- Add `unsafe-fixes` setting ([#7769](https://github.com/astral-sh/ruff/pull/7769))
-- Add `extend-safe-fixes` and `extend-unsafe-fixes` for promoting and demoting fixes ([#7841](https://github.com/astral-sh/ruff/pull/7841))
-
-### CLI
-
-- Added `--unsafe-fixes` option for opt-in to display and apply unsafe fixes ([#7769](https://github.com/astral-sh/ruff/pull/7769))
-- Fix use of deprecated `--format` option in warning ([#7837](https://github.com/astral-sh/ruff/pull/7837))
-- Show changed files when running under `--check` ([#7788](https://github.com/astral-sh/ruff/pull/7788))
-- Write summary messages to stderr when fixing via stdin instead of omitting them ([#7838](https://github.com/astral-sh/ruff/pull/7838))
-- Update fix summary message in `check --diff` to include unsafe fix hints ([#7790](https://github.com/astral-sh/ruff/pull/7790))
-- Add notebook `cell` field to JSON output format ([#7664](https://github.com/astral-sh/ruff/pull/7664))
-- Rename applicability levels to `Safe`, `Unsafe`, and `Display` ([#7843](https://github.com/astral-sh/ruff/pull/7843))
-
-### Bug fixes
-
-- Fix bug where f-strings were allowed in match pattern literal ([#7857](https://github.com/astral-sh/ruff/pull/7857))
-- Fix `SIM110` with a yield in the condition ([#7801](https://github.com/astral-sh/ruff/pull/7801))
-- Preserve trailing comments in `C414` fixes ([#7775](https://github.com/astral-sh/ruff/pull/7775))
-- Check sequence type before triggering `unnecessary-enumerate` `len` suggestion ([#7781](https://github.com/astral-sh/ruff/pull/7781))
-- Use correct start location for class/function clause header ([#7802](https://github.com/astral-sh/ruff/pull/7802))
-- Fix incorrect fixes for `SIM101` ([#7798](https://github.com/astral-sh/ruff/pull/7798))
-- Format comment before parameter default correctly ([#7870](https://github.com/astral-sh/ruff/pull/7870))
-- Fix `E251` false positive inside f-strings ([#7894](https://github.com/astral-sh/ruff/pull/7894))
-- Allow bindings to be created and referenced within annotations ([#7885](https://github.com/astral-sh/ruff/pull/7885))
-- Show per-cell diffs when analyzing notebooks over `stdin` ([#7789](https://github.com/astral-sh/ruff/pull/7789))
-- Avoid curly brace escape in f-string format spec ([#7780](https://github.com/astral-sh/ruff/pull/7780))
-- Fix lexing single-quoted f-string with multi-line format spec ([#7787](https://github.com/astral-sh/ruff/pull/7787))
-- Consider nursery rules to be in-preview for `ruff rule` ([#7812](https://github.com/astral-sh/ruff/pull/7812))
-- Report precise location for invalid conversion flag ([#7809](https://github.com/astral-sh/ruff/pull/7809))
-- Visit pattern match guard as a boolean test ([#7911](https://github.com/astral-sh/ruff/pull/7911))
-- Respect `--unfixable` in `ISC` rules ([#7917](https://github.com/astral-sh/ruff/pull/7917))
-- Fix edge case with `PIE804` ([#7922](https://github.com/astral-sh/ruff/pull/7922))
-- Show custom message in `PTH118` for `Path.joinpath` with starred arguments ([#7852](https://github.com/astral-sh/ruff/pull/7852))
-- Fix false negative in `outdated-version-block` when using greater than comparisons ([#7920](https://github.com/astral-sh/ruff/pull/7920))
-- Avoid converting f-strings within Django `gettext` calls ([#7898](https://github.com/astral-sh/ruff/pull/7898))
-- Fix false positive in `PLR6301` ([#7933](https://github.com/astral-sh/ruff/pull/7933))
-- Treat type aliases as typing-only expressions e.g. resolves false positive in `TCH004` ([#7968](https://github.com/astral-sh/ruff/pull/7968))
-- Resolve `cache-dir` relative to project root ([#7962](https://github.com/astral-sh/ruff/pull/7962))
-- Respect subscripted base classes in type-checking rules e.g. resolves false positive in `TCH003` ([#7954](https://github.com/astral-sh/ruff/pull/7954))
-- Fix JSON schema limit for `line-length` ([#7883](https://github.com/astral-sh/ruff/pull/7883))
-- Fix commented-out `coalesce` keyword ([#7876](https://github.com/astral-sh/ruff/pull/7876))
-
-### Documentation
-
-- Document `reimplemented-starmap` performance effects ([#7846](https://github.com/astral-sh/ruff/pull/7846))
-- Default to following the system dark/light mode ([#7888](https://github.com/astral-sh/ruff/pull/7888))
-- Add documentation for fixes ([#7901](https://github.com/astral-sh/ruff/pull/7901))
-- Fix typo in docs of `PLR6301` ([#7831](https://github.com/astral-sh/ruff/pull/7831))
-- Update `UP038` docs to note that it results in slower code ([#7872](https://github.com/astral-sh/ruff/pull/7872))
-- crlf -> cr-lf ([#7766](https://github.com/astral-sh/ruff/pull/7766))
-- Add an example of an unsafe fix ([#7924](https://github.com/astral-sh/ruff/pull/7924))
-- Fix documented examples for `unnecessary-subscript-reversal` ([#7774](https://github.com/astral-sh/ruff/pull/7774))
-- Correct error in tuple example in ruff formatter docs ([#7822](https://github.com/astral-sh/ruff/pull/7822))
-- Add versioning policy to documentation ([#7923](https://github.com/astral-sh/ruff/pull/7923))
-- Fix invalid code in `FURB177` example ([#7832](https://github.com/astral-sh/ruff/pull/7832))
-
-### Formatter
-
-- Less scary `ruff format` message ([#7867](https://github.com/astral-sh/ruff/pull/7867))
-- Remove spaces from import statements ([#7859](https://github.com/astral-sh/ruff/pull/7859))
-- Formatter quoting for f-strings with triple quotes ([#7826](https://github.com/astral-sh/ruff/pull/7826))
-- Update `ruff_python_formatter` generate.py comment ([#7850](https://github.com/astral-sh/ruff/pull/7850))
-- Document one-call chaining deviation ([#7767](https://github.com/astral-sh/ruff/pull/7767))
-- Allow f-string modifications in line-shrinking cases ([#7818](https://github.com/astral-sh/ruff/pull/7818))
-- Add trailing comment deviation to README ([#7827](https://github.com/astral-sh/ruff/pull/7827))
-- Add trailing zero between dot and exponential ([#7956](https://github.com/astral-sh/ruff/pull/7956))
-- Force parentheses for power operations in unary expressions ([#7955](https://github.com/astral-sh/ruff/pull/7955))
-
-### Playground
-
-- Fix playground `Quick Fix` action ([#7824](https://github.com/astral-sh/ruff/pull/7824))

CONTRIBUTING.md

@@ -112,11 +112,11 @@ Ruff is structured as a monorepo with a [flat crate structure](https://matklad.g
 such that all crates are contained in a flat `crates` directory.
 
 The vast majority of the code, including all lint rules, lives in the `ruff` crate (located at
-`crates/ruff_linter`). As a contributor, that's the crate that'll be most relevant to you.
+`crates/ruff`). As a contributor, that's the crate that'll be most relevant to you.
 
 At time of writing, the repository includes the following crates:
 
-- `crates/ruff_linter`: library crate containing all lint rules and the core logic for running them.
+- `crates/ruff`: library crate containing all lint rules and the core logic for running them.
     If you're working on a rule, this is the crate for you.
 - `crates/ruff_benchmark`: binary crate for running micro-benchmarks.
 - `crates/ruff_cache`: library crate for caching lint results.
@@ -129,7 +129,6 @@ At time of writing, the repository includes the following crates:
     intermediate representation. The backend for `ruff_python_formatter`.
 - `crates/ruff_index`: library crate inspired by `rustc_index`.
 - `crates/ruff_macros`: proc macro crate containing macros used by Ruff.
-- `crates/ruff_notebook`: library crate for parsing and manipulating Jupyter notebooks.
 - `crates/ruff_python_ast`: library crate containing Python-specific AST types and utilities.
 - `crates/ruff_python_codegen`: library crate containing utilities for generating Python source code.
 - `crates/ruff_python_formatter`: library crate implementing the Python formatter. Emits an
@@ -153,7 +152,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)
     (e.g., `AssertFalse`, as in, "allow `assert False`").
 
-1. Create a file for your rule (e.g., `crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs`).
+1. Create a file for your rule (e.g., `crates/ruff/src/rules/flake8_bugbear/rules/assert_false.rs`).
 
 1. In that file, define a violation struct (e.g., `pub struct AssertFalse`). You can grep for
     `#[violation]` to see examples.
@@ -162,22 +161,21 @@ At a high level, the steps involved in adding a new lint rule are as follows:
     (e.g., `pub(crate) fn assert_false`) based on whatever inputs are required for the rule (e.g.,
     an `ast::StmtAssert` node).
 
-1. Define the logic for invoking the diagnostic in `crates/ruff_linter/src/checkers/ast/analyze` (for
-    AST-based rules), `crates/ruff_linter/src/checkers/tokens.rs` (for token-based rules),
-    `crates/ruff_linter/src/checkers/physical_lines.rs` (for text-based rules),
-    `crates/ruff_linter/src/checkers/filesystem.rs` (for filesystem-based rules), etc. For AST-based rules,
+1. Define the logic for invoking the diagnostic in `crates/ruff/src/checkers/ast/analyze` (for
+    AST-based rules), `crates/ruff/src/checkers/tokens.rs` (for token-based rules),
+    `crates/ruff/src/checkers/physical_lines.rs` (for text-based rules),
+    `crates/ruff/src/checkers/filesystem.rs` (for filesystem-based rules), etc. For AST-based rules,
     you'll likely want to modify `analyze/statement.rs` (if your rule is based on analyzing
     statements, like imports) or `analyze/expression.rs` (if your rule is based on analyzing
     expressions, like function calls).
 
-1. Map the violation struct to a rule code in `crates/ruff_linter/src/codes.rs` (e.g., `B011`). New rules
-    should be added in `RuleGroup::Preview`.
+1. Map the violation struct to a rule code in `crates/ruff/src/codes.rs` (e.g., `B011`).
 
 1. Add proper [testing](#rule-testing-fixtures-and-snapshots) for your rule.
 
 1. Update the generated files (documentation and generated code).
 
-To trigger the violation, you'll likely want to augment the logic in `crates/ruff_linter/src/checkers/ast.rs`
+To trigger the violation, you'll likely want to augment the logic in `crates/ruff/src/checkers/ast.rs`
 to call your new function at the appropriate time and with the appropriate inputs. The `Checker`
 defined therein is a Python AST visitor, which iterates over the AST, building up a semantic model,
 and calling out to lint rule analyzer functions as it goes.
@@ -205,7 +203,7 @@ As such, rule names should...
     For example, `AssertFalse` guards against `assert False` statements.
 
 - _Not_ contain instructions on how to fix the violation, which instead belong in the rule
-    documentation and the `fix_title`.
+    documentation and the `autofix_title`.
 
 - _Not_ contain a redundant prefix, like `Disallow` or `Banned`, which are already implied by the
     convention.
@@ -222,7 +220,7 @@ Ruff's output for each fixture, which you can then commit alongside your changes
 
 Once you've completed the code for the rule itself, you can define tests with the following steps:
 
-1. Add a Python file to `crates/ruff_linter/resources/test/fixtures/[linter]` that contains the code you
+1. Add a Python file to `crates/ruff/resources/test/fixtures/[linter]` that contains the code you
     want to test. The file name should match the rule name (e.g., `E402.py`), and it should include
     examples of both violations and non-violations.
 
@@ -231,16 +229,16 @@ Once you've completed the code for the rule itself, you can define tests with th
     For example, if you're adding a new rule named `E402`, you would run:
 
     ```shell
-    cargo run -p ruff_cli -- check crates/ruff_linter/resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402
+    cargo run -p ruff_cli -- check crates/ruff/resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402
     ```
 
     **Note:** Only a subset of rules are enabled by default. When testing a new rule, ensure that
     you activate it by adding `--select ${rule_code}` to the command.
 
-1. Add the test to the relevant `crates/ruff_linter/src/rules/[linter]/mod.rs` file. If you're contributing
+1. Add the test to the relevant `crates/ruff/src/rules/[linter]/mod.rs` file. If you're contributing
     a rule to a pre-existing set, you should be able to find a similar example to pattern-match
     against. If you're adding a new linter, you'll need to create a new `mod.rs` file (see,
-    e.g., `crates/ruff_linter/src/rules/flake8_bugbear/mod.rs`)
+    e.g., `crates/ruff/src/rules/flake8_bugbear/mod.rs`)
 
 1. Run `cargo test`. Your test will fail, but you'll be prompted to follow-up
     with `cargo insta review`. Run `cargo insta review`, review and accept the generated snapshot,
@@ -252,24 +250,25 @@ Once you've completed the code for the rule itself, you can define tests with th
 
 Ruff's user-facing settings live in a few different places.
 
-First, the command-line options are defined via the `Args` struct in `crates/ruff_cli/src/args.rs`.
+First, the command-line options are defined via the `Cli` struct in `crates/ruff/src/cli.rs`.
 
-Second, the `pyproject.toml` options are defined in `crates/ruff_workspace/src/options.rs` (via the
-`Options` struct), `crates/ruff_workspace/src/configuration.rs` (via the `Configuration` struct),
-and `crates/ruff_workspace/src/settings.rs` (via the `Settings` struct), which then includes
-the `LinterSettings` struct as a field.
-
-These represent, respectively: the schema used to parse the `pyproject.toml` file; an internal,
-intermediate representation; and the final, internal representation used to power Ruff.
+Second, the `pyproject.toml` options are defined in `crates/ruff/src/settings/options.rs` (via the
+`Options` struct), `crates/ruff/src/settings/configuration.rs` (via the `Configuration` struct), and
+`crates/ruff/src/settings/mod.rs` (via the `Settings` struct). These represent, respectively: the
+schema used to parse the `pyproject.toml` file; an internal, intermediate representation; and the
+final, internal representation used to power Ruff.
 
 To add a new configuration option, you'll likely want to modify these latter few files (along with
-`arg.rs`, if appropriate). If you want to pattern-match against an existing example, grep for
+`cli.rs`, if appropriate). If you want to pattern-match against an existing example, grep for
 `dummy_variable_rgx`, which defines a regular expression to match against acceptable unused
 variables (e.g., `_`).
 
 Note that plugin-specific configuration options are defined in their own modules (e.g.,
-`Settings` in `crates/ruff_linter/src/flake8_unused_arguments/settings.rs` coupled with
-`Flake8UnusedArgumentsOptions` in `crates/ruff_workspace/src/options.rs`).
+`crates/ruff/src/flake8_unused_arguments/settings.rs`).
+
+You may also want to add the new configuration option to the `flake8-to-ruff` tool, which is
+responsible for converting `flake8` configuration files to Ruff's TOML format. This logic
+lives in `crates/ruff/src/flake8_to_ruff/converter.rs`.
 
 Finally, regenerate the documentation and generated code with `cargo dev generate-all`.
 
@@ -362,46 +361,46 @@ First, clone [CPython](https://github.com/python/cpython). It's a large and dive
 which makes it a good target for benchmarking.
 
 ```shell
-git clone --branch 3.10 https://github.com/python/cpython.git crates/ruff_linter/resources/test/cpython
+git clone --branch 3.10 https://github.com/python/cpython.git crates/ruff/resources/test/cpython
 ```
 
 To benchmark the release build:
 
 ```shell
 cargo build --release && hyperfine --warmup 10 \
-  "./target/release/ruff ./crates/ruff_linter/resources/test/cpython/ --no-cache -e" \
-  "./target/release/ruff ./crates/ruff_linter/resources/test/cpython/ -e"
+  "./target/release/ruff ./crates/ruff/resources/test/cpython/ --no-cache -e" \
+  "./target/release/ruff ./crates/ruff/resources/test/cpython/ -e"
 
-Benchmark 1: ./target/release/ruff ./crates/ruff_linter/resources/test/cpython/ --no-cache
+Benchmark 1: ./target/release/ruff ./crates/ruff/resources/test/cpython/ --no-cache
   Time (mean ± σ):     293.8 ms ±   3.2 ms    [User: 2384.6 ms, System: 90.3 ms]
   Range (min … max):   289.9 ms … 301.6 ms    10 runs
 
-Benchmark 2: ./target/release/ruff ./crates/ruff_linter/resources/test/cpython/
+Benchmark 2: ./target/release/ruff ./crates/ruff/resources/test/cpython/
   Time (mean ± σ):      48.0 ms ±   3.1 ms    [User: 65.2 ms, System: 124.7 ms]
   Range (min … max):    45.0 ms …  66.7 ms    62 runs
 
 Summary
-  './target/release/ruff ./crates/ruff_linter/resources/test/cpython/' ran
-    6.12 ± 0.41 times faster than './target/release/ruff ./crates/ruff_linter/resources/test/cpython/ --no-cache'
+  './target/release/ruff ./crates/ruff/resources/test/cpython/' ran
+    6.12 ± 0.41 times faster than './target/release/ruff ./crates/ruff/resources/test/cpython/ --no-cache'
 ```
 
 To benchmark against the ecosystem's existing tools:
 
 ```shell
 hyperfine --ignore-failure --warmup 5 \
-  "./target/release/ruff ./crates/ruff_linter/resources/test/cpython/ --no-cache" \
-  "pyflakes crates/ruff_linter/resources/test/cpython" \
+  "./target/release/ruff ./crates/ruff/resources/test/cpython/ --no-cache" \
+  "pyflakes crates/ruff/resources/test/cpython" \
   "autoflake --recursive --expand-star-imports --remove-all-unused-imports --remove-unused-variables --remove-duplicate-keys resources/test/cpython" \
-  "pycodestyle crates/ruff_linter/resources/test/cpython" \
-  "flake8 crates/ruff_linter/resources/test/cpython"
+  "pycodestyle crates/ruff/resources/test/cpython" \
+  "flake8 crates/ruff/resources/test/cpython"
 
-Benchmark 1: ./target/release/ruff ./crates/ruff_linter/resources/test/cpython/ --no-cache
+Benchmark 1: ./target/release/ruff ./crates/ruff/resources/test/cpython/ --no-cache
   Time (mean ± σ):     294.3 ms ±   3.3 ms    [User: 2467.5 ms, System: 89.6 ms]
   Range (min … max):   291.1 ms … 302.8 ms    10 runs
 
   Warning: Ignoring non-zero exit code.
 
-Benchmark 2: pyflakes crates/ruff_linter/resources/test/cpython
+Benchmark 2: pyflakes crates/ruff/resources/test/cpython
   Time (mean ± σ):     15.786 s ±  0.143 s    [User: 15.560 s, System: 0.214 s]
   Range (min … max):   15.640 s … 16.157 s    10 runs
 
@@ -411,31 +410,31 @@ Benchmark 3: autoflake --recursive --expand-star-imports --remove-all-unused-imp
   Time (mean ± σ):      6.175 s ±  0.169 s    [User: 54.102 s, System: 1.057 s]
   Range (min … max):    5.950 s …  6.391 s    10 runs
 
-Benchmark 4: pycodestyle crates/ruff_linter/resources/test/cpython
+Benchmark 4: pycodestyle crates/ruff/resources/test/cpython
   Time (mean ± σ):     46.921 s ±  0.508 s    [User: 46.699 s, System: 0.202 s]
   Range (min … max):   46.171 s … 47.863 s    10 runs
 
   Warning: Ignoring non-zero exit code.
 
-Benchmark 5: flake8 crates/ruff_linter/resources/test/cpython
+Benchmark 5: flake8 crates/ruff/resources/test/cpython
   Time (mean ± σ):     12.260 s ±  0.321 s    [User: 102.934 s, System: 1.230 s]
   Range (min … max):   11.848 s … 12.933 s    10 runs
 
   Warning: Ignoring non-zero exit code.
 
 Summary
-  './target/release/ruff ./crates/ruff_linter/resources/test/cpython/ --no-cache' ran
+  './target/release/ruff ./crates/ruff/resources/test/cpython/ --no-cache' ran
    20.98 ± 0.62 times faster than 'autoflake --recursive --expand-star-imports --remove-all-unused-imports --remove-unused-variables --remove-duplicate-keys resources/test/cpython'
-   41.66 ± 1.18 times faster than 'flake8 crates/ruff_linter/resources/test/cpython'
-   53.64 ± 0.77 times faster than 'pyflakes crates/ruff_linter/resources/test/cpython'
-  159.43 ± 2.48 times faster than 'pycodestyle crates/ruff_linter/resources/test/cpython'
+   41.66 ± 1.18 times faster than 'flake8 crates/ruff/resources/test/cpython'
+   53.64 ± 0.77 times faster than 'pyflakes crates/ruff/resources/test/cpython'
+  159.43 ± 2.48 times faster than 'pycodestyle crates/ruff/resources/test/cpython'
 ```
 
 To benchmark a subset of rules, e.g. `LineTooLong` and `DocLineTooLong`:
 
 ```shell
 cargo build --release && hyperfine --warmup 10 \
-  "./target/release/ruff ./crates/ruff_linter/resources/test/cpython/ --no-cache -e --select W505,E501"
+  "./target/release/ruff ./crates/ruff/resources/test/cpython/ --no-cache -e --select W505,E501"
 ```
 
 You can run `poetry install` from `./scripts/benchmarks` to create a working environment for the
@@ -468,10 +467,10 @@ rm Lib/test/bad_coding.py \
   Lib/test/test_typing.py
 ```
 
-Then, from `crates/ruff_linter/resources/test/cpython`, run: `time pylint -j 0 -E $(git ls-files '*.py')`. This
+Then, from `crates/ruff/resources/test/cpython`, run: `time pylint -j 0 -E $(git ls-files '*.py')`. This
 will execute Pylint with maximum parallelism and only report errors.
 
-To benchmark Pyupgrade, run the following from `crates/ruff_linter/resources/test/cpython`:
+To benchmark Pyupgrade, run the following from `crates/ruff/resources/test/cpython`:
 
 ```shell
 hyperfine --ignore-failure --warmup 5 --prepare "git reset --hard HEAD" \
@@ -719,8 +718,8 @@ Module {
 - `cargo dev generate-cli-help`, `cargo dev generate-docs` and `cargo dev generate-json-schema`:
     Update just `docs/configuration.md`, `docs/rules` and `ruff.schema.json` respectively.
 - `cargo dev generate-options`: Generate a markdown-compatible table of all `pyproject.toml`
-    options. Used for <https://docs.astral.sh/ruff/settings/>.
-- `cargo dev generate-rules-table`: Generate a markdown-compatible table of all rules. Used for <https://docs.astral.sh/ruff/rules/>.
+    options. Used for <https://beta.ruff.rs/docs/settings/>
+- `cargo dev generate-rules-table`: Generate a markdown-compatible table of all rules. Used for <https://beta.ruff.rs/docs/rules/>
 - `cargo dev round-trip <python file or jupyter notebook>`: Read a Python file or Jupyter Notebook,
     parse it, serialize the parsed representation and write it back. Used to check how good our
     representation is so that fixes don't rewrite irrelevant parts of a file.
@@ -778,7 +777,7 @@ To understand Ruff's import categorization system, we first need to define two c
 - "Package root": The top-most directory defining the Python package that includes a given Python
     file. To find the package root for a given Python file, traverse up its parent directories until
     you reach a parent directory that doesn't contain an `__init__.py` file (and isn't marked as
-    a [namespace package](https://docs.astral.sh/ruff/settings/#namespace-packages)); take the directory
+    a [namespace package](https://beta.ruff.rs/docs/settings/#namespace-packages)); take the directory
     just before that, i.e., the first directory in the package.
 
 For example, given:
@@ -867,7 +866,7 @@ There are three ways in which an import can be categorized as "first-party":
     package (e.g., `from foo import bar` or `import foo.bar`), they'll be classified as first-party
     automatically. This check is as simple as comparing the first segment of the current file's
     module path to the first segment of the import.
-1. **Source roots**: Ruff supports a `[src](https://docs.astral.sh/ruff/settings/#src)` setting, which
+1. **Source roots**: Ruff supports a `[src](https://beta.ruff.rs/docs/settings/#src)` setting, which
     sets the directories to scan when identifying first-party imports. The algorithm is
     straightforward: given an import, like `import foo`, iterate over the directories enumerated in
     the `src` setting and, for each directory, check for the existence of a subdirectory `foo` or a

Cargo.toml

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

LICENSE

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

README.md

@@ -8,7 +8,7 @@
 [![image](https://img.shields.io/pypi/pyversions/ruff.svg)](https://pypi.python.org/pypi/ruff)
 [![Actions status](https://github.com/astral-sh/ruff/workflows/CI/badge.svg)](https://github.com/astral-sh/ruff/actions)
 
-[**Discord**](https://discord.gg/c9MhzV8aU5) | [**Docs**](https://docs.astral.sh/ruff/) | [**Playground**](https://play.ruff.rs/)
+[**Discord**](https://discord.gg/c9MhzV8aU5) | [**Docs**](https://beta.ruff.rs/docs/) | [**Playground**](https://play.ruff.rs/)
 
 An extremely fast Python linter, written in Rust.
 
@@ -27,16 +27,16 @@ An extremely fast Python linter, written in Rust.
 - ⚡️ 10-100x faster than existing linters
 - 🐍 Installable via `pip`
 - 🛠️ `pyproject.toml` support
-- 🤝 Python 3.12 compatibility
+- 🤝 Python 3.11 compatibility
 - 📦 Built-in caching, to avoid re-analyzing unchanged files
-- 🔧 Fix support, for automatic error correction (e.g., automatically remove unused imports)
-- 📏 Over [700 built-in rules](https://docs.astral.sh/ruff/rules/)
-- ⚖️ [Near-parity](https://docs.astral.sh/ruff/faq/#how-does-ruff-compare-to-flake8) with the
+- 🔧 Autofix support, for automatic error correction (e.g., automatically remove unused imports)
+- 📏 Over [600 built-in rules](https://beta.ruff.rs/docs/rules/)
+- ⚖️ [Near-parity](https://beta.ruff.rs/docs/faq/#how-does-ruff-compare-to-flake8) with the
     built-in Flake8 rule set
 - 🔌 Native re-implementations of dozens of Flake8 plugins, like flake8-bugbear
-- ⌨️ First-party [editor integrations](https://docs.astral.sh/ruff/editor-integrations/) for
+- ⌨️ First-party [editor integrations](https://beta.ruff.rs/docs/editor-integrations/) for
     [VS Code](https://github.com/astral-sh/ruff-vscode) and [more](https://github.com/astral-sh/ruff-lsp)
-- 🌎 Monorepo-friendly, with [hierarchical and cascading configuration](https://docs.astral.sh/ruff/configuration/#pyprojecttoml-discovery)
+- 🌎 Monorepo-friendly, with [hierarchical and cascading configuration](https://beta.ruff.rs/docs/configuration/#pyprojecttoml-discovery)
 
 Ruff aims to be orders of magnitude faster than alternative tools while integrating more
 functionality behind a single, common interface.
@@ -98,7 +98,7 @@ developer of [Zulip](https://github.com/zulip/zulip):
 
 ## Table of Contents
 
-For more, see the [documentation](https://docs.astral.sh/ruff/).
+For more, see the [documentation](https://beta.ruff.rs/docs/).
 
 1. [Getting Started](#getting-started)
 1. [Configuration](#configuration)
@@ -111,7 +111,7 @@ For more, see the [documentation](https://docs.astral.sh/ruff/).
 
 ## Getting Started
 
-For more, see the [documentation](https://docs.astral.sh/ruff/).
+For more, see the [documentation](https://beta.ruff.rs/docs/).
 
 ### Installation
 
@@ -122,7 +122,7 @@ pip install ruff
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
-and with [a variety of other package managers](https://docs.astral.sh/ruff/installation/).
+and with [a variety of other package managers](https://beta.ruff.rs/docs/installation/).
 
 ### Usage
 
@@ -140,7 +140,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.1.0
+  rev: v0.0.286
   hooks:
     - id: ruff
 ```
@@ -165,18 +165,18 @@ jobs:
 ### Configuration
 
 Ruff can be configured through a `pyproject.toml`, `ruff.toml`, or `.ruff.toml` file (see:
-[_Configuration_](https://docs.astral.sh/ruff/configuration/), or [_Settings_](https://docs.astral.sh/ruff/settings/)
+[_Configuration_](https://beta.ruff.rs/docs/configuration/), or [_Settings_](https://beta.ruff.rs/docs/settings/)
 for a complete list of all configuration options).
 
 If left unspecified, the default configuration is equivalent to:
 
 ```toml
 [tool.ruff]
-# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.
-select = ["E4", "E7", "E9", "F"]
+# Enable pycodestyle (`E`) and Pyflakes (`F`) codes by default.
+select = ["E", "F"]
 ignore = []
 
-# Allow fix for all enabled rules (when `--fix`) is provided.
+# Allow autofix for all enabled rules (when `--fix`) is provided.
 fixable = ["A", "B", "C", "D", "E", "F", "G", "I", "N", "Q", "S", "T", "W", "ANN", "ARG", "BLE", "COM", "DJ", "DTZ", "EM", "ERA", "EXE", "FBT", "ICN", "INP", "ISC", "NPY", "PD", "PGH", "PIE", "PL", "PT", "PTH", "PYI", "RET", "RSE", "RUF", "SIM", "SLF", "TCH", "TID", "TRY", "UP", "YTT"]
 unfixable = []
 
@@ -233,13 +233,13 @@ linting command.
 
 <!-- Begin section: Rules -->
 
-**Ruff supports over 700 lint rules**, many of which are inspired by popular tools like Flake8,
+**Ruff supports over 600 lint rules**, many of which are inspired by popular tools like Flake8,
 isort, pyupgrade, and others. Regardless of the rule's origin, Ruff re-implements every rule in
 Rust as a first-party feature.
 
 By default, Ruff enables Flake8's `E` and `F` rules. Ruff supports all rules from the `F` category,
-and a [subset](https://docs.astral.sh/ruff/rules/#error-e) of the `E` category, omitting those
-stylistic rules made obsolete by the use of a formatter, like
+and a [subset](https://beta.ruff.rs/docs/rules/#error-e) of the `E` category, omitting those
+stylistic rules made obsolete by the use of an autoformatter, like
 [Black](https://github.com/psf/black).
 
 If you're just getting started with Ruff, **the default rule set is a great place to start**: it
@@ -274,7 +274,6 @@ quality tools, including:
 - [flake8-gettext](https://pypi.org/project/flake8-gettext/)
 - [flake8-implicit-str-concat](https://pypi.org/project/flake8-implicit-str-concat/)
 - [flake8-import-conventions](https://github.com/joaopalmeiro/flake8-import-conventions)
-- [flake8-logging](https://pypi.org/project/flake8-logging/)
 - [flake8-logging-format](https://pypi.org/project/flake8-logging-format/)
 - [flake8-no-pep420](https://pypi.org/project/flake8-no-pep420)
 - [flake8-pie](https://pypi.org/project/flake8-pie/)
@@ -304,12 +303,12 @@ quality tools, including:
 - [tryceratops](https://pypi.org/project/tryceratops/)
 - [yesqa](https://pypi.org/project/yesqa/)
 
-For a complete enumeration of the supported rules, see [_Rules_](https://docs.astral.sh/ruff/rules/).
+For a complete enumeration of the supported rules, see [_Rules_](https://beta.ruff.rs/docs/rules/).
 
 ## Contributing
 
 Contributions are welcome and highly appreciated. To get started, check out the
-[**contributing guidelines**](https://docs.astral.sh/ruff/contributing/).
+[**contributing guidelines**](https://beta.ruff.rs/docs/contributing/).
 
 You can also join us on [**Discord**](https://discord.gg/c9MhzV8aU5).
 
@@ -399,7 +398,6 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [Pydantic](https://github.com/pydantic/pydantic)
 - [Pylint](https://github.com/PyCQA/pylint)
 - [Reflex](https://github.com/reflex-dev/reflex)
-- [Rippling](https://rippling.com)
 - [Robyn](https://github.com/sansyrox/robyn)
 - Scale AI ([Launch SDK](https://github.com/scaleapi/launch-python-client))
 - Snowflake ([SnowCLI](https://github.com/Snowflake-Labs/snowcli))

crates/flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.1.0"
+version = "0.0.286"
 description = """
 Convert Flake8 configuration files to Ruff configuration files.
 """
@@ -13,7 +13,7 @@ repository = { workspace = true }
 license = { workspace = true }
 
 [dependencies]
-ruff_linter = { path = "../ruff_linter", default-features = false }
+ruff = { path = "../ruff", default-features = false }
 ruff_workspace = { path = "../ruff_workspace" }
 
 anyhow = { workspace = true }
@@ -23,7 +23,7 @@ configparser = { version = "3.0.2" }
 itertools = { workspace = true }
 log = { workspace = true }
 once_cell = { workspace = true }
-pep440_rs = { version = "0.3.12", features = ["serde"] }
+pep440_rs = { version = "0.3.1", features = ["serde"] }
 regex = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }

crates/flake8_to_ruff/README.md

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

crates/flake8_to_ruff/src/black.rs

@@ -1,7 +1,7 @@
 //! Extract Black configuration settings from a pyproject.toml.
 
-use ruff_linter::line_width::LineLength;
-use ruff_linter::settings::types::PythonVersion;
+use ruff::line_width::LineLength;
+use ruff::settings::types::PythonVersion;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default)]

crates/flake8_to_ruff/src/converter.rs

@@ -3,22 +3,21 @@ use std::str::FromStr;
 
 use itertools::Itertools;
 
-use ruff_linter::line_width::LineLength;
-use ruff_linter::registry::Linter;
-use ruff_linter::rule_selector::RuleSelector;
-use ruff_linter::rules::flake8_pytest_style::types::{
+use ruff::line_width::LineLength;
+use ruff::registry::Linter;
+use ruff::rule_selector::RuleSelector;
+use ruff::rules::flake8_pytest_style::types::{
     ParametrizeNameType, ParametrizeValuesRowType, ParametrizeValuesType,
 };
-use ruff_linter::rules::flake8_quotes::settings::Quote;
-use ruff_linter::rules::flake8_tidy_imports::settings::Strictness;
-use ruff_linter::rules::pydocstyle::settings::Convention;
-use ruff_linter::settings::types::PythonVersion;
-use ruff_linter::settings::DEFAULT_SELECTORS;
-use ruff_linter::warn_user;
+use ruff::rules::flake8_quotes::settings::Quote;
+use ruff::rules::flake8_tidy_imports::settings::Strictness;
+use ruff::rules::pydocstyle::settings::Convention;
+use ruff::settings::types::PythonVersion;
+use ruff::warn_user;
 use ruff_workspace::options::{
     Flake8AnnotationsOptions, Flake8BugbearOptions, Flake8BuiltinsOptions, Flake8ErrMsgOptions,
-    Flake8PytestStyleOptions, Flake8QuotesOptions, Flake8TidyImportsOptions, LintOptions,
-    McCabeOptions, Options, Pep8NamingOptions, PydocstyleOptions,
+    Flake8PytestStyleOptions, Flake8QuotesOptions, Flake8TidyImportsOptions, McCabeOptions,
+    Options, Pep8NamingOptions, PydocstyleOptions,
 };
 use ruff_workspace::pyproject::Pyproject;
 
@@ -26,6 +25,11 @@ use super::external_config::ExternalConfig;
 use super::plugin::Plugin;
 use super::{parser, plugin};
 
+const DEFAULT_SELECTORS: &[RuleSelector] = &[
+    RuleSelector::Linter(Linter::Pyflakes),
+    RuleSelector::Linter(Linter::Pycodestyle),
+];
+
 pub(crate) fn convert(
     config: &HashMap<String, HashMap<String, Option<String>>>,
     external_config: &ExternalConfig,
@@ -99,7 +103,6 @@ pub(crate) fn convert(
 
     // Parse each supported option.
     let mut options = Options::default();
-    let mut lint_options = LintOptions::default();
     let mut flake8_annotations = Flake8AnnotationsOptions::default();
     let mut flake8_bugbear = Flake8BugbearOptions::default();
     let mut flake8_builtins = Flake8BuiltinsOptions::default();
@@ -147,7 +150,7 @@ pub(crate) fn convert(
                 "per-file-ignores" | "per_file_ignores" => {
                     match parser::parse_files_to_codes_mapping(value.as_ref()) {
                         Ok(per_file_ignores) => {
-                            lint_options.per_file_ignores =
+                            options.per_file_ignores =
                                 Some(parser::collect_per_file_ignores(per_file_ignores));
                         }
                         Err(e) => {
@@ -355,47 +358,47 @@ pub(crate) fn convert(
     }
 
     // Deduplicate and sort.
-    lint_options.select = Some(
+    options.select = Some(
         select
             .into_iter()
             .sorted_by_key(RuleSelector::prefix_and_code)
             .collect(),
     );
-    lint_options.ignore = Some(
+    options.ignore = Some(
         ignore
             .into_iter()
             .sorted_by_key(RuleSelector::prefix_and_code)
             .collect(),
     );
     if flake8_annotations != Flake8AnnotationsOptions::default() {
-        lint_options.flake8_annotations = Some(flake8_annotations);
+        options.flake8_annotations = Some(flake8_annotations);
     }
     if flake8_bugbear != Flake8BugbearOptions::default() {
-        lint_options.flake8_bugbear = Some(flake8_bugbear);
+        options.flake8_bugbear = Some(flake8_bugbear);
     }
     if flake8_builtins != Flake8BuiltinsOptions::default() {
-        lint_options.flake8_builtins = Some(flake8_builtins);
+        options.flake8_builtins = Some(flake8_builtins);
     }
     if flake8_errmsg != Flake8ErrMsgOptions::default() {
-        lint_options.flake8_errmsg = Some(flake8_errmsg);
+        options.flake8_errmsg = Some(flake8_errmsg);
     }
     if flake8_pytest_style != Flake8PytestStyleOptions::default() {
-        lint_options.flake8_pytest_style = Some(flake8_pytest_style);
+        options.flake8_pytest_style = Some(flake8_pytest_style);
     }
     if flake8_quotes != Flake8QuotesOptions::default() {
-        lint_options.flake8_quotes = Some(flake8_quotes);
+        options.flake8_quotes = Some(flake8_quotes);
     }
     if flake8_tidy_imports != Flake8TidyImportsOptions::default() {
-        lint_options.flake8_tidy_imports = Some(flake8_tidy_imports);
+        options.flake8_tidy_imports = Some(flake8_tidy_imports);
     }
     if mccabe != McCabeOptions::default() {
-        lint_options.mccabe = Some(mccabe);
+        options.mccabe = Some(mccabe);
     }
     if pep8_naming != Pep8NamingOptions::default() {
-        lint_options.pep8_naming = Some(pep8_naming);
+        options.pep8_naming = Some(pep8_naming);
     }
     if pydocstyle != PydocstyleOptions::default() {
-        lint_options.pydocstyle = Some(pydocstyle);
+        options.pydocstyle = Some(pydocstyle);
     }
 
     // Extract any settings from the existing `pyproject.toml`.
@@ -433,10 +436,6 @@ pub(crate) fn convert(
         }
     }
 
-    if lint_options != LintOptions::default() {
-        options.lint = Some(lint_options);
-    }
-
     // Create the pyproject.toml.
     Pyproject::new(options)
 }
@@ -459,13 +458,13 @@ mod tests {
     use pep440_rs::VersionSpecifiers;
 
     use pretty_assertions::assert_eq;
-    use ruff_linter::line_width::LineLength;
-    use ruff_linter::registry::Linter;
-    use ruff_linter::rule_selector::RuleSelector;
-    use ruff_linter::rules::flake8_quotes;
-    use ruff_linter::rules::pydocstyle::settings::Convention;
-    use ruff_linter::settings::types::PythonVersion;
-    use ruff_workspace::options::{Flake8QuotesOptions, LintOptions, Options, PydocstyleOptions};
+    use ruff::line_width::LineLength;
+    use ruff::registry::Linter;
+    use ruff::rule_selector::RuleSelector;
+    use ruff::rules::flake8_quotes;
+    use ruff::rules::pydocstyle::settings::Convention;
+    use ruff::settings::types::PythonVersion;
+    use ruff_workspace::options::{Flake8QuotesOptions, Options, PydocstyleOptions};
     use ruff_workspace::pyproject::Pyproject;
 
     use crate::converter::DEFAULT_SELECTORS;
@@ -475,8 +474,8 @@ mod tests {
     use super::super::plugin::Plugin;
     use super::convert;
 
-    fn lint_default_options(plugins: impl IntoIterator<Item = RuleSelector>) -> LintOptions {
-        LintOptions {
+    fn default_options(plugins: impl IntoIterator<Item = RuleSelector>) -> Options {
+        Options {
             ignore: Some(vec![]),
             select: Some(
                 DEFAULT_SELECTORS
@@ -486,7 +485,7 @@ mod tests {
                     .sorted_by_key(RuleSelector::prefix_and_code)
                     .collect(),
             ),
-            ..LintOptions::default()
+            ..Options::default()
         }
     }
 
@@ -497,10 +496,7 @@ mod tests {
             &ExternalConfig::default(),
             None,
         );
-        let expected = Pyproject::new(Options {
-            lint: Some(lint_default_options([])),
-            ..Options::default()
-        });
+        let expected = Pyproject::new(default_options([]));
         assert_eq!(actual, expected);
     }
 
@@ -516,8 +512,7 @@ mod tests {
         );
         let expected = Pyproject::new(Options {
             line_length: Some(LineLength::try_from(100).unwrap()),
-            lint: Some(lint_default_options([])),
-            ..Options::default()
+            ..default_options([])
         });
         assert_eq!(actual, expected);
     }
@@ -534,8 +529,7 @@ mod tests {
         );
         let expected = Pyproject::new(Options {
             line_length: Some(LineLength::try_from(100).unwrap()),
-            lint: Some(lint_default_options([])),
-            ..Options::default()
+            ..default_options([])
         });
         assert_eq!(actual, expected);
     }
@@ -550,10 +544,7 @@ mod tests {
             &ExternalConfig::default(),
             Some(vec![]),
         );
-        let expected = Pyproject::new(Options {
-            lint: Some(lint_default_options([])),
-            ..Options::default()
-        });
+        let expected = Pyproject::new(default_options([]));
         assert_eq!(actual, expected);
     }
 
@@ -568,16 +559,13 @@ mod tests {
             Some(vec![]),
         );
         let expected = Pyproject::new(Options {
-            lint: Some(LintOptions {
-                flake8_quotes: Some(Flake8QuotesOptions {
-                    inline_quotes: Some(flake8_quotes::settings::Quote::Single),
-                    multiline_quotes: None,
-                    docstring_quotes: None,
-                    avoid_escape: None,
-                }),
-                ..lint_default_options([])
+            flake8_quotes: Some(Flake8QuotesOptions {
+                inline_quotes: Some(flake8_quotes::settings::Quote::Single),
+                multiline_quotes: None,
+                docstring_quotes: None,
+                avoid_escape: None,
             }),
-            ..Options::default()
+            ..default_options([])
         });
         assert_eq!(actual, expected);
     }
@@ -596,15 +584,12 @@ mod tests {
             Some(vec![Plugin::Flake8Docstrings]),
         );
         let expected = Pyproject::new(Options {
-            lint: Some(LintOptions {
-                pydocstyle: Some(PydocstyleOptions {
-                    convention: Some(Convention::Numpy),
-                    ignore_decorators: None,
-                    property_decorators: None,
-                }),
-                ..lint_default_options([Linter::Pydocstyle.into()])
+            pydocstyle: Some(PydocstyleOptions {
+                convention: Some(Convention::Numpy),
+                ignore_decorators: None,
+                property_decorators: None,
             }),
-            ..Options::default()
+            ..default_options([Linter::Pydocstyle.into()])
         });
         assert_eq!(actual, expected);
     }
@@ -620,16 +605,13 @@ mod tests {
             None,
         );
         let expected = Pyproject::new(Options {
-            lint: Some(LintOptions {
-                flake8_quotes: Some(Flake8QuotesOptions {
-                    inline_quotes: Some(flake8_quotes::settings::Quote::Single),
-                    multiline_quotes: None,
-                    docstring_quotes: None,
-                    avoid_escape: None,
-                }),
-                ..lint_default_options([Linter::Flake8Quotes.into()])
+            flake8_quotes: Some(Flake8QuotesOptions {
+                inline_quotes: Some(flake8_quotes::settings::Quote::Single),
+                multiline_quotes: None,
+                docstring_quotes: None,
+                avoid_escape: None,
             }),
-            ..Options::default()
+            ..default_options([Linter::Flake8Quotes.into()])
         });
         assert_eq!(actual, expected);
     }
@@ -648,8 +630,7 @@ mod tests {
         );
         let expected = Pyproject::new(Options {
             target_version: Some(PythonVersion::Py38),
-            lint: Some(lint_default_options([])),
-            ..Options::default()
+            ..default_options([])
         });
         assert_eq!(actual, expected);
 

crates/flake8_to_ruff/src/main.rs

@@ -19,7 +19,7 @@ use crate::converter::convert;
 use crate::external_config::ExternalConfig;
 use crate::plugin::Plugin;
 use crate::pyproject::parse;
-use ruff_linter::logging::{set_up_logging, LogLevel};
+use ruff::logging::{set_up_logging, LogLevel};
 
 #[derive(Parser)]
 #[command(

crates/flake8_to_ruff/src/parser.rs

@@ -3,11 +3,10 @@ use std::str::FromStr;
 use anyhow::{bail, Result};
 use once_cell::sync::Lazy;
 use regex::Regex;
+use ruff::settings::types::PatternPrefixPair;
+use ruff::{warn_user, RuleSelector};
 use rustc_hash::FxHashMap;
 
-use ruff_linter::settings::types::PatternPrefixPair;
-use ruff_linter::{warn_user, RuleSelector};
-
 static COMMA_SEPARATED_LIST_RE: Lazy<Regex> = Lazy::new(|| Regex::new(r"[,\s]").unwrap());
 
 /// Parse a comma-separated list of `RuleSelector` values (e.g.,
@@ -193,11 +192,11 @@ pub(crate) fn collect_per_file_ignores(
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
+    use ruff::RuleSelector;
 
-    use ruff_linter::codes;
-    use ruff_linter::registry::Linter;
-    use ruff_linter::settings::types::PatternPrefixPair;
-    use ruff_linter::RuleSelector;
+    use ruff::codes;
+    use ruff::registry::Linter;
+    use ruff::settings::types::PatternPrefixPair;
 
     use super::{parse_files_to_codes_mapping, parse_prefix_codes, parse_strings};
 

crates/flake8_to_ruff/src/plugin.rs

@@ -3,9 +3,8 @@ use std::fmt;
 use std::str::FromStr;
 
 use anyhow::anyhow;
-use ruff_linter::registry::Linter;
-use ruff_linter::rule_selector::PreviewOptions;
-use ruff_linter::RuleSelector;
+use ruff::registry::Linter;
+use ruff::RuleSelector;
 
 #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq)]
 pub enum Plugin {
@@ -332,7 +331,7 @@ pub(crate) fn infer_plugins_from_codes(selectors: &HashSet<RuleSelector>) -> Vec
     .filter(|plugin| {
         for selector in selectors {
             if selector
-                .rules(&PreviewOptions::default())
+                .into_iter()
                 .any(|rule| Linter::from(plugin).rules().any(|r| r == rule))
             {
                 return true;

crates/ruff/Cargo.toml

@@ -0,0 +1,92 @@
+[package]
+name = "ruff"
+version = "0.0.286"
+publish = false
+authors = { workspace = true }
+edition = { workspace = true }
+rust-version = { workspace = true }
+homepage = { workspace = true }
+documentation = { workspace = true }
+repository = { workspace = true }
+license = { workspace = true }
+readme = "README.md"
+
+[lib]
+name = "ruff"
+
+[dependencies]
+ruff_cache = { path = "../ruff_cache" }
+ruff_diagnostics = { path = "../ruff_diagnostics", features = ["serde"] }
+ruff_index = { path = "../ruff_index" }
+ruff_macros = { path = "../ruff_macros" }
+ruff_python_ast = { path = "../ruff_python_ast", features = ["serde"] }
+ruff_python_codegen = { path = "../ruff_python_codegen" }
+ruff_python_index = { path = "../ruff_python_index" }
+ruff_python_literal = { path = "../ruff_python_literal" }
+ruff_python_semantic = { path = "../ruff_python_semantic" }
+ruff_python_stdlib = { path = "../ruff_python_stdlib" }
+ruff_python_trivia = { path = "../ruff_python_trivia" }
+ruff_python_parser = { path = "../ruff_python_parser" }
+ruff_source_file = { path = "../ruff_source_file", features = ["serde"] }
+ruff_text_size = { path = "../ruff_text_size" }
+
+annotate-snippets = { version = "0.9.1", features = ["color"] }
+anyhow = { workspace = true }
+bitflags = { workspace = true }
+chrono = { workspace = true }
+clap = { workspace = true, features = ["derive", "string"], optional = true }
+colored = { workspace = true }
+fern = { version = "0.6.1" }
+glob = { workspace = true }
+globset = { workspace = true }
+imperative = { version = "1.0.4" }
+is-macro = { workspace = true }
+itertools = { workspace = true }
+libcst = { workspace = true }
+log = { workspace = true }
+memchr = { workspace = true }
+natord = { version = "1.0.9" }
+num-bigint = { workspace = true }
+num-traits = { workspace = true }
+once_cell = { workspace = true }
+path-absolutize = { workspace = true, features = [
+  "once_cell_cache",
+  "use_unix_paths_on_wasm",
+] }
+pathdiff = { version = "0.2.1" }
+pep440_rs = { version = "0.3.1", features = ["serde"] }
+pyproject-toml = { version = "0.6.0" }
+quick-junit = { version = "0.3.2" }
+regex = { workspace = true }
+result-like = { version = "0.4.6" }
+rustc-hash = { workspace = true }
+schemars = { workspace = true, optional = true }
+semver = { version = "1.0.16" }
+serde = { workspace = true }
+serde_json = { workspace = true }
+serde_with = { version = "3.0.0" }
+similar = { workspace = true }
+smallvec = { workspace = true }
+strum = { workspace = true }
+strum_macros = { workspace = true }
+thiserror = { version = "1.0.43" }
+toml = { workspace = true }
+typed-arena = { version = "2.0.2" }
+unicode-width = { workspace = true }
+unicode_names2 = { version = "0.6.0", git = "https://github.com/youknowone/unicode_names2.git", rev = "4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" }
+uuid = { workspace = true, features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
+wsl = { version = "0.1.0" }
+
+[dev-dependencies]
+insta = { workspace = true }
+pretty_assertions = "1.3.0"
+test-case = { workspace = true }
+# Disable colored output in tests
+colored = { workspace = true, features = ["no-color"] }
+tempfile = "3.6.0"
+
+[features]
+default = []
+schemars = ["dep:schemars"]
+# Enables the UnreachableCode rule
+unreachable-code = []

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

@@ -158,9 +158,3 @@ class Foo:
     @decorator()
     def __init__(self: "Foo", foo: int):
        ...
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7711
-class Class:
-    def __init__(self):
-        print(f"{self.attr=}")

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

@@ -20,4 +20,3 @@ os.chmod(keyfile, stat.S_IRWXO | stat.S_IRWXG | stat.S_IRWXU)  # Error
 os.chmod("~/hidden_exec", stat.S_IXGRP)  # Error
 os.chmod("~/hidden_exec", stat.S_IXOTH)  # OK
 os.chmod("/etc/passwd", stat.S_IWOTH)  # Error
-os.chmod("/etc/passwd", 0o100000000)  # Error

crates/ruff/resources/test/fixtures/flake8_blind_except/BLE.py

@@ -92,35 +92,3 @@ try:
     pass
 except Exception:
     logging.error("...", exc_info=True)
-
-
-from logging import error, exception
-
-try:
-    pass
-except Exception:
-    error("...")
-
-
-try:
-    pass
-except Exception:
-    error("...", exc_info=False)
-
-
-try:
-    pass
-except Exception:
-    error("...", exc_info=None)
-
-
-try:
-    pass
-except Exception:
-    exception("...")
-
-
-try:
-    pass
-except Exception:
-    error("...", exc_info=True)

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

@@ -70,8 +70,6 @@ settings.set_enable_developer_extras(True)
 foo.is_(True)
 bar.is_not(False)
 next(iter([]), False)
-sa.func.coalesce(tbl.c.valid, False)
-
 
 class Registry:
     def __init__(self) -> None: