Add warning

.cargo/config.toml

@@ -1,3 +1,2 @@
 [alias]
 dev = "run --package ruff_dev --bin ruff_dev"
-benchmark = "bench -p ruff_benchmark --bench linter --bench formatter --"

.config/nextest.toml

@@ -1,8 +0,0 @@
-[profile.ci]
-# Print out output for failing tests as soon as they fail, and also at the end
-# of the run (for easy scrollability).
-failure-output = "immediate-final"
-# Do not cancel the test run on the first failure.
-fail-fast = false
-
-status-level = "skip"

.devcontainer/devcontainer.json

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

.devcontainer/post-create.sh

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

.editorconfig

@@ -10,11 +10,5 @@ indent_style = space
 insert_final_newline = true
 indent_size = 2
 
-[*.{rs,py,pyi}]
+[*.{rs,py}]
 indent_size = 4
-
-[*.snap]
-trim_trailing_whitespace = false
-
-[*.md]
-max_line_length = 100

.gitattributes

@@ -1,14 +0,0 @@
-* 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_linter/resources/test/fixtures/pycodestyle/W391_2.py text eol=crlf
-crates/ruff_linter/resources/test/fixtures/pycodestyle/W391_3.py text eol=crlf
-
-crates/ruff_python_formatter/resources/test/fixtures/ruff/docstring_code_examples_crlf.py text eol=crlf
-crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples_crlf.py.snap text eol=crlf
-
-crates/ruff_python_parser/resources/inline linguist-generated=true
-
-ruff.schema.json linguist-generated=true text=auto eol=lf
-*.md.snap linguist-language=Markdown

.github/CODEOWNERS

@@ -1,17 +0,0 @@
-# GitHub code owners file. For more info: https://help.github.com/articles/about-codeowners/
-#
-# - Comment lines begin with `#` character.
-# - Each line is a file pattern followed by one or more owners.
-# - The '*' pattern is global owners.
-# - Order is important. The last matching pattern has the most precedence.
-
-/crates/ruff_notebook/ @dhruvmanila
-/crates/ruff_formatter/ @MichaReiser
-/crates/ruff_python_formatter/ @MichaReiser
-/crates/ruff_python_parser/ @MichaReiser @dhruvmanila
-
-# flake8-pyi
-/crates/ruff_linter/src/rules/flake8_pyi/ @AlexWaygood
-
-# Script for fuzzing the parser
-/scripts/fuzz-parser/ @AlexWaygood

.github/ISSUE_TEMPLATE.md

@@ -3,10 +3,8 @@ Thank you for taking the time to report an issue! We're glad to have you involve
 
 If you're filing a bug report, please consider including the following information:
 
-* List of keywords you searched for before creating this issue. Write them down here so that others can find this issue more easily and help provide feedback.
-  e.g. "RUF001", "unused variable", "Jupyter notebook"
-* A minimal code snippet that reproduces the bug.
-* The command you invoked (e.g., `ruff /path/to/file.py --fix`), ideally including the `--isolated` flag.
-* The current Ruff settings (any relevant sections from your `pyproject.toml`).
-* The current Ruff version (`ruff --version`).
+- A minimal code snippet that reproduces the bug.
+- The command you invoked (e.g., `ruff /path/to/file.py --fix`), ideally including the `--isolated` flag.
+- The current Ruff settings (any relevant sections from your `pyproject.toml`).
+- The current Ruff version (`ruff --version`).
 -->

.github/PULL_REQUEST_TEMPLATE.md

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

.github/renovate.json5

@@ -1,68 +0,0 @@
-{
-  $schema: "https://docs.renovatebot.com/renovate-schema.json",
-  dependencyDashboard: true,
-  suppressNotifications: ["prEditedNotification"],
-  extends: ["config:recommended"],
-  labels: ["internal"],
-  schedule: ["before 4am on Monday"],
-  semanticCommits: "disabled",
-  separateMajorMinor: false,
-  prHourlyLimit: 10,
-  enabledManagers: ["github-actions", "pre-commit", "cargo", "pep621", "npm"],
-  cargo: {
-    // See https://docs.renovatebot.com/configuration-options/#rangestrategy
-    rangeStrategy: "update-lockfile",
-  },
-  pep621: {
-    fileMatch: ["^(python|scripts)/.*pyproject\\.toml$"],
-  },
-  npm: {
-    fileMatch: ["^playground/.*package\\.json$"],
-  },
-  "pre-commit": {
-    enabled: true,
-  },
-  packageRules: [
-    {
-      // Group upload/download artifact updates, the versions are dependent
-      groupName: "Artifact GitHub Actions dependencies",
-      matchManagers: ["github-actions"],
-      matchPackagePatterns: ["actions/.*-artifact"],
-      description: "Weekly update of artifact-related GitHub Actions dependencies",
-    },
-    {
-      groupName: "pre-commit dependencies",
-      matchManagers: ["pre-commit"],
-      description: "Weekly update of pre-commit dependencies",
-    },
-    {
-      groupName: "NPM Development dependencies",
-      matchManagers: ["npm"],
-      matchDepTypes: ["devDependencies"],
-      description: "Weekly update of NPM development dependencies",
-    },
-    {
-      groupName: "Monaco",
-      matchManagers: ["npm"],
-      matchPackagePatterns: ["monaco"],
-      description: "Weekly update of the Monaco editor",
-    },
-    {
-      groupName: "strum",
-      matchManagers: ["cargo"],
-      matchPackagePatterns: ["strum"],
-      description: "Weekly update of strum dependencies",
-    },
-    {
-      groupName: "ESLint",
-      matchManagers: ["npm"],
-      matchPackageNames: ["eslint"],
-      allowedVersions: "<9",
-      description: "Constraint ESLint to version 8 until TypeScript-eslint supports ESLint 9", // https://github.com/typescript-eslint/typescript-eslint/issues/8211
-    },
-  ],
-  vulnerabilityAlerts: {
-    commitMessageSuffix: "",
-    labels: ["internal", "security"],
-  },
-}

.github/workflows/ci.yaml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [main]
   pull_request:
-  workflow_dispatch:
+    branches: [main]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
@@ -13,582 +13,149 @@ concurrency:
 env:
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
-  CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
-  PACKAGE_NAME: ruff
-  PYTHON_VERSION: "3.11"
 
 jobs:
-  determine_changes:
-    name: "Determine changes"
+  cargo-build:
+    name: "cargo build"
     runs-on: ubuntu-latest
-    outputs:
-      # Flag that is raised when any code that affects parser is changed
-      parser: ${{ steps.changed.outputs.parser_any_changed }}
-      # Flag that is raised when any code that affects linter is changed
-      linter: ${{ steps.changed.outputs.linter_any_changed }}
-      # Flag that is raised when any code that affects formatter is changed
-      formatter: ${{ steps.changed.outputs.formatter_any_changed }}
-      # Flag that is raised when any code is changed
-      # This is superset of the linter and formatter
-      code: ${{ steps.changed.outputs.code_any_changed }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
         with:
-          fetch-depth: 0
-
-      - uses: tj-actions/changed-files@v44
-        id: changed
-        with:
-          files_yaml: |
-            parser:
-              - Cargo.toml
-              - Cargo.lock
-              - crates/ruff_python_trivia/**
-              - crates/ruff_source_file/**
-              - crates/ruff_text_size/**
-              - crates/ruff_python_ast/**
-              - crates/ruff_python_parser/**
-              - scripts/fuzz-parser/**
-              - .github/workflows/ci.yaml
-
-            linter:
-              - Cargo.toml
-              - Cargo.lock
-              - crates/**
-              - "!crates/ruff_python_formatter/**"
-              - "!crates/ruff_formatter/**"
-              - "!crates/ruff_dev/**"
-              - "!crates/ruff_shrinking/**"
-              - scripts/*
-              - python/**
-              - .github/workflows/ci.yaml
-
-            formatter:
-              - Cargo.toml
-              - Cargo.lock
-              - crates/ruff_python_formatter/**
-              - crates/ruff_formatter/**
-              - crates/ruff_python_trivia/**
-              - crates/ruff_python_ast/**
-              - crates/ruff_source_file/**
-              - crates/ruff_python_index/**
-              - crates/ruff_text_size/**
-              - crates/ruff_python_parser/**
-              - crates/ruff_dev/**
-              - scripts/*
-              - python/**
-              - .github/workflows/ci.yaml
-
-            code:
-              - "**/*"
-              - "!**/*.md"
-              - "!docs/**"
-              - "!assets/**"
+          profile: minimal
+          toolchain: nightly-2022-11-01
+          override: true
+      - 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 +nightly dev generate-all'."
+      - run: git diff --quiet ruff.schema.json || echo "::error file=ruff.schema.json::This file is outdated. Run 'cargo +nightly dev generate-all'."
+      - run: git diff --exit-code -- README.md ruff.schema.json
 
   cargo-fmt:
     name: "cargo fmt"
     runs-on: ubuntu-latest
-    timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v4
-      - name: "Install Rust toolchain"
-        run: rustup component add rustfmt
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly-2022-11-01
+          override: true
+          components: rustfmt
       - run: cargo fmt --all --check
 
-  cargo-clippy:
+  cargo_clippy:
     name: "cargo clippy"
     runs-on: ubuntu-latest
-    needs: determine_changes
-    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v4
-      - name: "Install Rust toolchain"
-        run: |
-          rustup component add clippy
-          rustup target add wasm32-unknown-unknown
-      - uses: Swatinem/rust-cache@v2
-      - name: "Clippy"
-        run: cargo clippy --workspace --all-targets --all-features --locked -- -D warnings
-      - name: "Clippy (wasm)"
-        run: cargo clippy -p ruff_wasm --target wasm32-unknown-unknown --all-features --locked -- -D warnings
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly-2022-11-01
+          override: true
+          components: clippy
+          target: wasm32-unknown-unknown
+      - uses: Swatinem/rust-cache@v1
+      - run: cargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::pedantic
+      - run: cargo clippy -p ruff --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic
 
-  cargo-test-linux:
-    name: "cargo test (linux)"
+  cargo-test:
+    name: "cargo test"
     runs-on: ubuntu-latest
-    needs: determine_changes
-    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v4
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - name: "Install mold"
-        uses: rui314/setup-mold@v1
-      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@v2
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
         with:
-          tool: cargo-nextest
-      - name: "Install cargo insta"
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-insta
-      - uses: Swatinem/rust-cache@v2
-      - name: "Run tests"
-        shell: bash
-        env:
-          NEXTEST_PROFILE: "ci"
-        run: cargo insta test --all-features --unreferenced reject --test-runner nextest
-
+          profile: minimal
+          toolchain: 1.65.0
+          override: true
+      - uses: Swatinem/rust-cache@v1
+      - run: cargo install cargo-insta
+      - run: pip install black[d]==22.12.0
+      - name: Run tests
+        run: |
+          cargo insta test --all --delete-unreferenced-snapshots
+          git diff --exit-code
+      - 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:
-          # 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@v4
-        with:
-          name: ruff
-          path: target/debug/ruff
-
-  cargo-test-windows:
-    name: "cargo test (windows)"
-    runs-on: windows-latest
-    needs: determine_changes
-    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-nextest
-      - uses: Swatinem/rust-cache@v2
-      - name: "Run tests"
-        shell: bash
-        run: |
-          cargo nextest run --all-features --profile ci
-          cargo test --all-features --doc
-
-  cargo-test-wasm:
-    name: "cargo test (wasm)"
-    runs-on: ubuntu-latest
-    needs: determine_changes
-    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Install Rust toolchain"
-        run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@v4
-        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
-
-  cargo-build-release:
-    name: "cargo build (release)"
-    runs-on: macos-latest
-    needs: determine_changes
-    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - name: "Install mold"
-        uses: rui314/setup-mold@v1
-      - uses: Swatinem/rust-cache@v2
-      - name: "Build"
-        run: cargo build --release --locked
-
-  cargo-fuzz:
-    name: "cargo fuzz"
-    runs-on: ubuntu-latest
-    needs: determine_changes
-    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: "fuzz -> target"
-      - name: "Install cargo-fuzz"
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-fuzz@0.11.2
-      - run: cargo fuzz build -s none
-
-  fuzz-parser:
-    name: "Fuzz the parser"
-    runs-on: ubuntu-latest
-    needs:
-      - cargo-test-linux
-      - determine_changes
-    if: ${{ needs.determine_changes.outputs.parser == 'true' }}
-    timeout-minutes: 20
-    env:
-      FORCE_COLOR: 1
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-      - name: Install uv
-        run: curl -LsSf https://astral.sh/uv/install.sh | sh
-      - name: Install Python requirements
-        run: uv pip install -r scripts/fuzz-parser/requirements.txt --system
-      - uses: actions/download-artifact@v4
-        name: Download Ruff binary to test
-        id: download-cached-binary
-        with:
-          name: ruff
-          path: ruff-to-test
-      - name: Fuzz
-        run: |
-          # Make executable, since artifact download doesn't preserve this
-          chmod +x ${{ steps.download-cached-binary.outputs.download-path }}/ruff
-
-          python scripts/fuzz-parser/fuzz.py 0-500 --test-executable ${{ steps.download-cached-binary.outputs.download-path }}/ruff
+      # Setting RUSTDOCFLAGS because `cargo doc --check` isn't yet implemented (https://github.com/rust-lang/cargo/issues/10025).
+      - run: RUSTDOCFLAGS="-D warnings" cargo doc --all --no-deps
 
   scripts:
     name: "test scripts"
     runs-on: ubuntu-latest
-    needs: determine_changes
-    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v4
-      - name: "Install Rust toolchain"
-        run: rustup component add rustfmt
-      - uses: Swatinem/rust-cache@v2
-      - run: ./scripts/add_rule.py --name DoTheThing --prefix PL --code C0999 --linter pylint
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          override: true
+      - uses: Swatinem/rust-cache@v1
+      - run: ./scripts/add_rule.py --name DoTheThing --code PLC999 --linter pylint
       - run: cargo check
-      - run: cargo fmt --all --check
       - run: |
-          ./scripts/add_plugin.py test --url https://pypi.org/project/-test/0.1.0/ --prefix TST
-          ./scripts/add_rule.py --name FirstRule --prefix TST --code 001 --linter test
+         ./scripts/add_plugin.py test --url https://pypi.org/project/-test/0.1.0/ --prefix TST
+         ./scripts/add_rule.py --name FirstRule --code TST001 --linter test
       - run: cargo check
-      - run: cargo fmt --all --check
 
-  ecosystem:
-    name: "ecosystem"
+# TODO(charlie): Re-enable the `wasm-pack` tests.
+# See: https://github.com/charliermarsh/ruff/issues/1425
+#  wasm-pack-test:
+#    name: "wasm-pack test"
+#    runs-on: ubuntu-latest
+#    env:
+#      WASM_BINDGEN_TEST_TIMEOUT: 60
+#    steps:
+#      - uses: actions/checkout@v3
+#      - uses: actions-rs/toolchain@v1
+#        with:
+#          profile: minimal
+#          toolchain: nightly-2022-11-01
+#          override: true
+#      - uses: actions/cache@v3
+#        env:
+#          cache-name: cache-cargo
+#        with:
+#          path: |
+#            ~/.cargo/registry
+#            ~/.cargo/git
+#          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
+#          restore-keys: |
+#            ${{ runner.os }}-build-${{ env.cache-name }}-
+#            ${{ runner.os }}-build-
+#            ${{ runner.os }}-
+#      - uses: jetli/wasm-pack-action@v0.4.0
+#      - uses: jetli/wasm-bindgen-action@v0.2.0
+#      - run: wasm-pack test --node
+
+  maturin-build:
+    name: "maturin build"
     runs-on: ubuntu-latest
-    needs:
-      - cargo-test-linux
-      - determine_changes
-    # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
-    # Ecosystem check needs linter and/or formatter changes.
-    if: ${{ github.event_name == 'pull_request' && needs.determine_changes.outputs.code == 'true' }}
-    timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
         with:
-          python-version: ${{ env.PYTHON_VERSION }}
-
-      - uses: actions/download-artifact@v4
-        name: Download comparison Ruff binary
-        id: ruff-target
+          profile: minimal
+          toolchain: 1.65.0
+          override: true
+      - uses: Swatinem/rust-cache@v1
+      - uses: actions/setup-python@v4
         with:
-          name: ruff
-          path: target/debug
+          python-version: "3.11"
+      - run: pip install maturin
+      - run: maturin build -b bin
 
-      - uses: dawidd6/action-download-artifact@v3
-        name: Download baseline Ruff binary
-        with:
-          name: ruff
-          branch: ${{ github.event.pull_request.base.ref }}
-          workflow: "ci.yaml"
-          check_artifacts: true
-
-      - name: Install ruff-ecosystem
-        run: |
-          pip install ./python/ruff-ecosystem
-
-      - name: Run `ruff check` stable ecosystem check
-        if: ${{ needs.determine_changes.outputs.linter == 'true' }}
-        run: |
-          # Make executable, since artifact download doesn't preserve this
-          chmod +x ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff
-
-          # Set pipefail to avoid hiding errors with tee
-          set -eo pipefail
-
-          ruff-ecosystem check ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff --cache ./checkouts --output-format markdown | tee ecosystem-result-check-stable
-
-          cat ecosystem-result-check-stable > $GITHUB_STEP_SUMMARY
-          echo "### Linter (stable)"  > ecosystem-result
-          cat ecosystem-result-check-stable >> ecosystem-result
-          echo "" >> ecosystem-result
-
-      - name: Run `ruff check` preview ecosystem check
-        if: ${{ needs.determine_changes.outputs.linter == 'true' }}
-        run: |
-          # Make executable, since artifact download doesn't preserve this
-          chmod +x ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff
-
-          # Set pipefail to avoid hiding errors with tee
-          set -eo pipefail
-
-          ruff-ecosystem check ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff --cache ./checkouts --output-format markdown --force-preview | tee ecosystem-result-check-preview
-
-          cat ecosystem-result-check-preview > $GITHUB_STEP_SUMMARY
-          echo "### Linter (preview)" >> ecosystem-result
-          cat ecosystem-result-check-preview >> ecosystem-result
-          echo "" >> ecosystem-result
-
-      - name: Run `ruff format` stable ecosystem check
-        if: ${{ needs.determine_changes.outputs.formatter == 'true' }}
-        run: |
-          # Make executable, since artifact download doesn't preserve this
-          chmod +x ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff
-
-          # Set pipefail to avoid hiding errors with tee
-          set -eo pipefail
-
-          ruff-ecosystem format ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff --cache ./checkouts --output-format markdown | tee ecosystem-result-format-stable
-
-          cat ecosystem-result-format-stable > $GITHUB_STEP_SUMMARY
-          echo "### Formatter (stable)" >> ecosystem-result
-          cat ecosystem-result-format-stable >> ecosystem-result
-          echo "" >> ecosystem-result
-
-      - name: Run `ruff format` preview ecosystem check
-        if: ${{ needs.determine_changes.outputs.formatter == 'true' }}
-        run: |
-          # Make executable, since artifact download doesn't preserve this
-          chmod +x ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff
-
-          # Set pipefail to avoid hiding errors with tee
-          set -eo pipefail
-
-          ruff-ecosystem format ./ruff ${{ steps.ruff-target.outputs.download-path }}/ruff --cache ./checkouts --output-format markdown --force-preview | tee ecosystem-result-format-preview
-
-          cat ecosystem-result-format-preview > $GITHUB_STEP_SUMMARY
-          echo "### Formatter (preview)" >> ecosystem-result
-          cat ecosystem-result-format-preview >> ecosystem-result
-          echo "" >> ecosystem-result
-
-      - name: Export pull request number
-        run: |
-          echo ${{ github.event.number }} > pr-number
-
-      - uses: actions/upload-artifact@v4
-        name: Upload PR Number
-        with:
-          name: pr-number
-          path: pr-number
-
-      - uses: actions/upload-artifact@v4
-        name: Upload Results
-        with:
-          name: ecosystem-result
-          path: ecosystem-result
-
-  cargo-udeps:
-    name: "cargo udeps"
+  typos:
+    name: Spell Check with Typos
     runs-on: ubuntu-latest
-    needs: determine_changes
-    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v4
-      - name: "Install nightly Rust toolchain"
-        # Only pinned to make caching work, update freely
-        run: rustup toolchain install nightly-2023-10-15
-      - uses: Swatinem/rust-cache@v2
-      - name: "Install cargo-udeps"
-        uses: taiki-e/install-action@cargo-udeps
-      - name: "Run cargo-udeps"
-        run: cargo +nightly-2023-10-15 udeps
+    - name: Checkout Actions Repository
+      uses: actions/checkout@v2
 
-  python-package:
-    name: "python package"
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          architecture: x64
-      - uses: Swatinem/rust-cache@v2
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
-        with:
-          args: --out dist
-      - name: "Test wheel"
-        run: |
-          pip install --force-reinstall --find-links dist ${{ env.PACKAGE_NAME }}
-          ruff --help
-          python -m ruff --help
-      - name: "Remove wheels from cache"
-        run: rm -rf target/wheels
-
-  pre-commit:
-    name: "pre-commit"
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - uses: Swatinem/rust-cache@v2
-      - name: "Install pre-commit"
-        run: pip install pre-commit
-      - name: "Cache pre-commit"
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pre-commit
-          key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: "Run pre-commit"
-        run: |
-          echo '```console' > $GITHUB_STEP_SUMMARY
-          # Enable color output for pre-commit and remove it for the summary
-          SKIP=cargo-fmt,clippy,dev-generate-all pre-commit run --all-files --show-diff-on-failure --color=always | \
-            tee >(sed -E 's/\x1B\[([0-9]{1,2}(;[0-9]{1,2})*)?[mGK]//g' >> $GITHUB_STEP_SUMMARY) >&1
-          exit_code=${PIPESTATUS[0]}
-          echo '```' >> $GITHUB_STEP_SUMMARY
-          exit $exit_code
-
-  docs:
-    name: "mkdocs"
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    env:
-      MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-      - name: "Add SSH key"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        uses: webfactory/ssh-agent@v0.9.0
-        with:
-          ssh-private-key: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY }}
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - uses: Swatinem/rust-cache@v2
-      - name: "Install Insiders dependencies"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        run: pip install -r docs/requirements-insiders.txt
-      - name: "Install dependencies"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
-        run: pip install -r docs/requirements.txt
-      - name: "Update README File"
-        run: python scripts/transform_readme.py --target mkdocs
-      - name: "Generate docs"
-        run: python scripts/generate_mkdocs.py
-      - name: "Check docs formatting"
-        run: python scripts/check_docs_formatted.py
-      - name: "Build Insiders docs"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        run: mkdocs build --strict -f mkdocs.insiders.yml
-      - name: "Build docs"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
-        run: mkdocs build --strict -f mkdocs.public.yml
-
-  check-formatter-instability-and-black-similarity:
-    name: "formatter instabilities and black similarity"
-    runs-on: ubuntu-latest
-    needs: determine_changes
-    if: needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main'
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - name: "Cache rust"
-        uses: Swatinem/rust-cache@v2
-      - name: "Formatter progress"
-        run: scripts/formatter_ecosystem_checks.sh
-      - name: "Github step summary"
-        run: cat target/progress_projects_stats.txt > $GITHUB_STEP_SUMMARY
-      - name: "Remove checkouts from cache"
-        run: rm -r target/progress_projects
-
-  check-ruff-lsp:
-    name: "test ruff-lsp"
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    needs:
-      - cargo-test-linux
-      - determine_changes
-    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    steps:
-      - uses: extractions/setup-just@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/checkout@v4
-        name: "Download ruff-lsp source"
-        with:
-          repository: "astral-sh/ruff-lsp"
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-
-      - uses: actions/download-artifact@v4
-        name: Download development ruff binary
-        id: ruff-target
-        with:
-          name: ruff
-          path: target/debug
-
-      - name: Install ruff-lsp dependencies
-        run: |
-          just install
-
-      - name: Run ruff-lsp tests
-        run: |
-          # Setup development binary
-          pip uninstall --yes ruff
-          chmod +x ${{ steps.ruff-target.outputs.download-path }}/ruff
-          export PATH=${{ steps.ruff-target.outputs.download-path }}:$PATH
-          ruff version
-
-          just test
-
-  benchmarks:
-    runs-on: ubuntu-latest
-    needs: determine_changes
-    if: ${{ github.repository == 'astral-sh/ruff' && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
-    timeout-minutes: 20
-    steps:
-      - name: "Checkout Branch"
-        uses: actions/checkout@v4
-
-      - name: "Install Rust toolchain"
-        run: rustup show
-
-      - name: "Install codspeed"
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-codspeed
-
-      - uses: Swatinem/rust-cache@v2
-
-      - name: "Build benchmarks"
-        run: cargo codspeed build --features codspeed -p ruff_benchmark
-
-      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@v2
-        with:
-          run: cargo codspeed run
-          token: ${{ secrets.CODSPEED_TOKEN }}
+    - name: Check spelling of file.txt
+      uses: crate-ci/typos@master
+      with:
+        files: .

.github/workflows/daily_fuzz.yaml

@@ -1,72 +0,0 @@
-name: Daily parser fuzz
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * *"
-  pull_request:
-    paths:
-      - ".github/workflows/daily_fuzz.yaml"
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-env:
-  CARGO_INCREMENTAL: 0
-  CARGO_NET_RETRY: 10
-  CARGO_TERM_COLOR: always
-  RUSTUP_MAX_RETRIES: 10
-  PACKAGE_NAME: ruff
-  FORCE_COLOR: 1
-
-jobs:
-  fuzz:
-    name: Fuzz
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    # Don't run the cron job on forks:
-    if: ${{ github.repository == 'astral-sh/ruff' || github.event_name != 'schedule' }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-      - name: Install uv
-        run: curl -LsSf https://astral.sh/uv/install.sh | sh
-      - name: Install Python requirements
-        run: uv pip install -r scripts/fuzz-parser/requirements.txt --system
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - name: "Install mold"
-        uses: rui314/setup-mold@v1
-      - uses: Swatinem/rust-cache@v2
-      - name: Build ruff
-        # A debug build means the script runs slower once it gets started,
-        # but this is outweighed by the fact that a release build takes *much* longer to compile in CI
-        run: cargo build --locked
-      - name: Fuzz
-        run: python scripts/fuzz-parser/fuzz.py $(shuf -i 0-9999999999999999999 -n 1000) --test-executable target/debug/ruff
-
-  create-issue-on-failure:
-    name: Create an issue if the daily fuzz surfaced any bugs
-    runs-on: ubuntu-latest
-    needs: fuzz
-    if: ${{ github.repository == 'astral-sh/ruff' && always() && github.event_name == 'schedule' && needs.fuzz.result == 'failure' }}
-    permissions:
-      issues: write
-    steps:
-      - uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            await github.rest.issues.create({
-              owner: "astral-sh",
-              repo: "ruff",
-              title: `Daily parser fuzz failed on ${new Date().toDateString()}`,
-              body: "Runs listed here: https://github.com/astral-sh/ruff/actions/workflows/daily_fuzz.yml",
-              labels: ["bug", "parser", "fuzzer"],
-            })

.github/workflows/docs.yaml

@@ -1,55 +0,0 @@
-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]
-
-jobs:
-  mkdocs:
-    runs-on: ubuntu-latest
-    env:
-      CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
-      MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.ref }}
-      - uses: actions/setup-python@v5
-      - name: "Add SSH key"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        uses: webfactory/ssh-agent@v0.9.0
-        with:
-          ssh-private-key: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY }}
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - uses: Swatinem/rust-cache@v2
-      - name: "Install Insiders dependencies"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        run: pip install -r docs/requirements-insiders.txt
-      - name: "Install dependencies"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
-        run: pip install -r docs/requirements.txt
-      - name: "Copy README File"
-        run: |
-          python scripts/transform_readme.py --target mkdocs
-          python scripts/generate_mkdocs.py
-      - name: "Build Insiders docs"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
-        run: mkdocs build --strict -f mkdocs.insiders.yml
-      - name: "Build docs"
-        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
-        run: mkdocs build --strict -f mkdocs.public.yml
-      - name: "Deploy to Cloudflare Pages"
-        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@v3.4.1
-        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}

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

@@ -0,0 +1,236 @@
+name: "[flake8-to-ruff] Release"
+
+on:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  PACKAGE_NAME: flake8-to-ruff
+  CRATE_NAME: flake8_to_ruff
+  PYTHON_VERSION: "3.11"
+  CARGO_INCREMENTAL: 0
+  CARGO_NET_RETRY: 10
+  RUSTUP_MAX_RETRIES: 10
+
+jobs:
+  macos-x86_64:
+    runs-on: macos-12
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          architecture: x64
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          default: true
+      - name: Build wheels - x86_64
+        uses: messense/maturin-action@v1
+        with:
+          target: x86_64
+          args: --release --out dist --sdist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+      - name: Install built wheel - x86_64
+        run: |
+          pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  macos-universal:
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          architecture: x64
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          default: true
+      - name: Build wheels - universal2
+        uses: messense/maturin-action@v1
+        with:
+          args: --release --universal2 --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+      - name: Install built wheel - universal2
+        run: |
+          pip install dist/${{ env.CRATE_NAME }}-*universal2.whl --force-reinstall
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  windows:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        target: [x64, x86]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          architecture: ${{ matrix.target }}
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          default: true
+      - name: Build wheels
+        uses: messense/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+      - name: Install built wheel
+        shell: bash
+        run: |
+          python -m pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  linux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [x86_64, i686]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          architecture: x64
+      - name: Build wheels
+        uses: messense/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          manylinux: auto
+          args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+      - name: Install built wheel
+        if: matrix.target == 'x86_64'
+        run: |
+          pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  linux-cross:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [aarch64, armv7, s390x, ppc64le, ppc64]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+      - name: Build wheels
+        uses: messense/maturin-action@v1
+        with:
+          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.0.5
+        if: matrix.target != 'ppc64'
+        name: Install built wheel
+        with:
+          arch: ${{ matrix.target }}
+          distro: ubuntu20.04
+          githubToken: ${{ github.token }}
+          install: |
+            apt-get update
+            apt-get install -y --no-install-recommends python3 python3-pip
+            pip3 install -U pip
+          run: |
+            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  musllinux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target:
+          - x86_64-unknown-linux-musl
+          - i686-unknown-linux-musl
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          architecture: x64
+      - name: Build wheels
+        uses: messense/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          manylinux: musllinux_1_2
+          args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+      - name: Install built wheel
+        if: matrix.target == 'x86_64-unknown-linux-musl'
+        uses: addnab/docker-run-action@v3
+        with:
+          image: alpine:latest
+          options: -v ${{ github.workspace }}:/io -w /io
+          run: |
+            apk add py3-pip
+            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/dist/ --force-reinstall
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  musllinux-cross:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform:
+          - target: aarch64-unknown-linux-musl
+            arch: aarch64
+          - target: armv7-unknown-linux-musleabihf
+            arch: armv7
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+      - name: Build wheels
+        uses: messense/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          manylinux: musllinux_1_2
+          args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
+      - uses: uraimo/run-on-arch-action@master
+        name: Install built wheel
+        with:
+          arch: ${{ matrix.platform.arch }}
+          distro: alpine_latest
+          githubToken: ${{ github.token }}
+          install: |
+            apk add py3-pip
+          run: |
+            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist

.github/workflows/playground.yaml

@@ -2,25 +2,28 @@ name: "[Playground] Release"
 
 on:
   workflow_dispatch:
-  release:
-    types: [published]
+  push:
+    branches: [main]
 
 env:
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
-  CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
   publish:
     runs-on: ubuntu-latest
     env:
-      CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
+       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
     steps:
-      - uses: actions/checkout@v4
-      - name: "Install Rust toolchain"
-        run: rustup target add wasm32-unknown-unknown
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly-2022-11-01
+          override: true
+          target: wasm32-unknown-unknown
+      - uses: actions/setup-node@v3
         with:
           node-version: 18
           cache: "npm"
@@ -28,7 +31,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 . -- -p ruff
       - name: "Install Node dependencies"
         run: npm ci
         working-directory: playground
@@ -40,9 +43,8 @@ jobs:
         working-directory: playground
       - name: "Deploy to Cloudflare Pages"
         if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@v3.4.1
+        uses: cloudflare/wrangler-action@2.0.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/pr-comment.yaml

@@ -1,79 +0,0 @@
-name: Ecosystem check comment
-
-on:
-  workflow_run:
-    workflows: [CI]
-    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@v3
-        name: Download pull request number
-        with:
-          name: pr-number
-          run_id: ${{ github.event.workflow_run.id ||  github.event.inputs.workflow_run_id }}
-          if_no_artifact_found: ignore
-
-      - name: Parse pull request number
-        id: pr-number
-        run: |
-          if [[ -f pr-number ]]
-          then
-            echo "pr-number=$(<pr-number)" >> $GITHUB_OUTPUT
-          fi
-
-      - uses: dawidd6/action-download-artifact@v3
-        name: "Download ecosystem results"
-        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
-          workflow_conclusion: completed
-          if_no_artifact_found: ignore
-
-      - name: Generate comment content
-        id: generate-comment
-        if: steps.download-ecosystem-result.outputs.found_artifact == 'true'
-        run: |
-          # Note this identifier is used to find the comment to update on
-          # subsequent runs
-          echo '<!-- generated-comment ecosystem -->' >> comment.txt
-
-          echo '## `ruff-ecosystem` results' >> comment.txt
-          cat pr/ecosystem/ecosystem-result >> comment.txt
-          echo "" >> comment.txt
-
-          echo 'comment<<EOF' >> $GITHUB_OUTPUT
-          cat comment.txt >> $GITHUB_OUTPUT
-          echo 'EOF' >> $GITHUB_OUTPUT
-
-      - name: Find existing comment
-        uses: peter-evans/find-comment@v3
-        if: steps.generate-comment.outcome == 'success'
-        id: find-comment
-        with:
-          issue-number: ${{ steps.pr-number.outputs.pr-number }}
-          comment-author: "github-actions[bot]"
-          body-includes: "<!-- generated-comment ecosystem -->"
-
-      - name: Create or update comment
-        if: steps.find-comment.outcome == 'success'
-        uses: peter-evans/create-or-update-comment@v4
-        with:
-          comment-id: ${{ steps.find-comment.outputs.comment-id }}
-          issue-number: ${{ steps.pr-number.outputs.pr-number }}
-          body-path: comment.txt
-          edit-mode: replace

.github/workflows/release.yaml

@@ -1,600 +0,0 @@
-name: "[ruff] Release"
-
-on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: "The version to tag, without the leading 'v'. If omitted, will initiate a dry run (no uploads)."
-        type: string
-      sha:
-        description: "The full sha of the commit to be released. If omitted, the latest commit on the default branch will be used."
-        default: ""
-        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 }}
-  cancel-in-progress: true
-
-env:
-  PACKAGE_NAME: ruff
-  PYTHON_VERSION: "3.11"
-  CARGO_INCREMENTAL: 0
-  CARGO_NET_RETRY: 10
-  CARGO_TERM_COLOR: always
-  RUSTUP_MAX_RETRIES: 10
-
-jobs:
-  sdist:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build sdist"
-        uses: PyO3/maturin-action@v1
-        with:
-          command: sdist
-          args: --out dist
-      - name: "Test sdist"
-        run: |
-          pip install dist/${{ env.PACKAGE_NAME }}-*.tar.gz --force-reinstall
-          ruff --help
-          python -m ruff --help
-      - name: "Upload sdist"
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-sdist
-          path: dist
-
-  macos-x86_64:
-    runs-on: macos-12
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          architecture: x64
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels - x86_64"
-        uses: PyO3/maturin-action@v1
-        with:
-          target: x86_64
-          args: --release --locked --out dist
-      - name: "Test wheel - x86_64"
-        run: |
-          pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-          ruff --help
-          python -m ruff --help
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-macos-x86_64
-          path: dist
-      - name: "Archive binary"
-        run: |
-          ARCHIVE_FILE=ruff-${{ inputs.tag }}-x86_64-apple-darwin.tar.gz
-          tar czvf $ARCHIVE_FILE -C target/x86_64-apple-darwin/release ruff
-          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
-      - name: "Upload binary"
-        uses: actions/upload-artifact@v4
-        with:
-          name: binaries-macos-x86_64
-          path: |
-            *.tar.gz
-            *.sha256
-
-  macos-aarch64:
-    runs-on: macos-14
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          architecture: arm64
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels - aarch64"
-        uses: PyO3/maturin-action@v1
-        with:
-          target: aarch64
-          args: --release --locked --out dist
-      - name: "Test wheel - aarch64"
-        run: |
-          pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-          ruff --help
-          python -m ruff --help
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-aarch64-apple-darwin
-          path: dist
-      - name: "Archive binary"
-        run: |
-          ARCHIVE_FILE=ruff-${{ inputs.tag }}-aarch64-apple-darwin.tar.gz
-          tar czvf $ARCHIVE_FILE -C target/aarch64-apple-darwin/release ruff
-          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
-      - name: "Upload binary"
-        uses: actions/upload-artifact@v4
-        with:
-          name: binaries-aarch64-apple-darwin
-          path: |
-            *.tar.gz
-            *.sha256
-
-  windows:
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        platform:
-          - target: x86_64-pc-windows-msvc
-            arch: x64
-          - target: i686-pc-windows-msvc
-            arch: x86
-          - target: aarch64-pc-windows-msvc
-            arch: x64
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          architecture: ${{ matrix.platform.arch }}
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
-        with:
-          target: ${{ matrix.platform.target }}
-          args: --release --locked --out dist
-      - name: "Test wheel"
-        if: ${{ !startsWith(matrix.platform.target, 'aarch64') }}
-        shell: bash
-        run: |
-          python -m pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-          ruff --help
-          python -m ruff --help
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-${{ matrix.platform.target }}
-          path: dist
-      - name: "Archive binary"
-        shell: bash
-        run: |
-          ARCHIVE_FILE=ruff-${{ inputs.tag }}-${{ matrix.platform.target }}.zip
-          7z a $ARCHIVE_FILE ./target/${{ matrix.platform.target }}/release/ruff.exe
-          sha256sum $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
-      - name: "Upload binary"
-        uses: actions/upload-artifact@v4
-        with:
-          name: binaries-${{ matrix.platform.target }}
-          path: |
-            *.zip
-            *.sha256
-
-  linux:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        target:
-          - x86_64-unknown-linux-gnu
-          - i686-unknown-linux-gnu
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          architecture: x64
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
-        with:
-          target: ${{ matrix.target }}
-          manylinux: auto
-          args: --release --locked --out dist
-      - name: "Test wheel"
-        if: ${{ startsWith(matrix.target, 'x86_64') }}
-        run: |
-          pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-          ruff --help
-          python -m ruff --help
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-${{ matrix.target }}
-          path: dist
-      - name: "Archive binary"
-        run: |
-          ARCHIVE_FILE=ruff-${{ inputs.tag }}-${{ matrix.target }}.tar.gz
-          tar czvf $ARCHIVE_FILE -C target/${{ matrix.target }}/release ruff
-          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
-      - name: "Upload binary"
-        uses: actions/upload-artifact@v4
-        with:
-          name: binaries-${{ matrix.target }}
-          path: |
-            *.tar.gz
-            *.sha256
-
-  linux-cross:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        platform:
-          - target: aarch64-unknown-linux-gnu
-            arch: aarch64
-            # see https://github.com/astral-sh/ruff/issues/3791
-            # and https://github.com/gnzlbg/jemallocator/issues/170#issuecomment-1503228963
-            maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
-          - target: armv7-unknown-linux-gnueabihf
-            arch: armv7
-          - target: s390x-unknown-linux-gnu
-            arch: s390x
-          - target: powerpc64le-unknown-linux-gnu
-            arch: ppc64le
-            # see https://github.com/astral-sh/ruff/issues/10073
-            maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
-          - target: powerpc64-unknown-linux-gnu
-            arch: ppc64
-            # see https://github.com/astral-sh/ruff/issues/10073
-            maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
-        with:
-          target: ${{ matrix.platform.target }}
-          manylinux: auto
-          docker-options: ${{ matrix.platform.maturin_docker_options }}
-          args: --release --locked --out dist
-      - uses: uraimo/run-on-arch-action@v2
-        if: matrix.platform.arch != 'ppc64'
-        name: Test wheel
-        with:
-          arch: ${{ matrix.platform.arch }}
-          distro: ubuntu20.04
-          githubToken: ${{ github.token }}
-          install: |
-            apt-get update
-            apt-get install -y --no-install-recommends python3 python3-pip
-            pip3 install -U pip
-          run: |
-            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-            ruff --help
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-${{ matrix.platform.target }}
-          path: dist
-      - name: "Archive binary"
-        run: |
-          ARCHIVE_FILE=ruff-${{ inputs.tag }}-${{ matrix.platform.target }}.tar.gz
-          tar czvf $ARCHIVE_FILE -C target/${{ matrix.platform.target }}/release ruff
-          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
-      - name: "Upload binary"
-        uses: actions/upload-artifact@v4
-        with:
-          name: binaries-${{ matrix.platform.target }}
-          path: |
-            *.tar.gz
-            *.sha256
-
-  musllinux:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        target:
-          - x86_64-unknown-linux-musl
-          - i686-unknown-linux-musl
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          architecture: x64
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
-        with:
-          target: ${{ matrix.target }}
-          manylinux: musllinux_1_2
-          args: --release --locked --out dist
-      - name: "Test wheel"
-        if: matrix.target == 'x86_64-unknown-linux-musl'
-        uses: addnab/docker-run-action@v3
-        with:
-          image: alpine:latest
-          options: -v ${{ github.workspace }}:/io -w /io
-          run: |
-            apk add python3
-            python -m venv .venv
-            .venv/bin/pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-            .venv/bin/ruff check --help
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-${{ matrix.target }}
-          path: dist
-      - name: "Archive binary"
-        run: |
-          ARCHIVE_FILE=ruff-${{ inputs.tag }}-${{ matrix.target }}.tar.gz
-          tar czvf $ARCHIVE_FILE -C target/${{ matrix.target }}/release ruff
-          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
-      - name: "Upload binary"
-        uses: actions/upload-artifact@v4
-        with:
-          name: binaries-${{ matrix.target }}
-          path: |
-            *.tar.gz
-            *.sha256
-
-  musllinux-cross:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        platform:
-          - target: aarch64-unknown-linux-musl
-            arch: aarch64
-            maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
-          - target: armv7-unknown-linux-musleabihf
-            arch: armv7
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels"
-        uses: PyO3/maturin-action@v1
-        with:
-          target: ${{ matrix.platform.target }}
-          manylinux: musllinux_1_2
-          args: --release --locked --out dist
-          docker-options: ${{ matrix.platform.maturin_docker_options }}
-      - uses: uraimo/run-on-arch-action@v2
-        name: Test wheel
-        with:
-          arch: ${{ matrix.platform.arch }}
-          distro: alpine_latest
-          githubToken: ${{ github.token }}
-          install: |
-            apk add python3
-          run: |
-            python -m venv .venv
-            .venv/bin/pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-            .venv/bin/ruff check --help
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-${{ matrix.platform.target }}
-          path: dist
-      - name: "Archive binary"
-        run: |
-          ARCHIVE_FILE=ruff-${{ inputs.tag }}-${{ matrix.platform.target }}.tar.gz
-          tar czvf $ARCHIVE_FILE -C target/${{ matrix.platform.target }}/release ruff
-          shasum -a 256 $ARCHIVE_FILE > $ARCHIVE_FILE.sha256
-      - name: "Upload binary"
-        uses: actions/upload-artifact@v4
-        with:
-          name: binaries-${{ matrix.platform.target }}
-          path: |
-            *.tar.gz
-            *.sha256
-
-  validate-tag:
-    name: Validate tag
-    runs-on: ubuntu-latest
-    # If you don't set an input tag, it's a dry run (no uploads).
-    if: ${{ inputs.tag }}
-    steps:
-      - uses: actions/checkout@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
-      - 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
-            echo "${{ inputs.tag }}" >&2
-            echo "${version}" >&2
-            exit 1
-          else
-            echo "Releasing ${version}"
-          fi
-
-  upload-release:
-    name: Upload to PyPI
-    runs-on: ubuntu-latest
-    needs:
-      - macos-aarch64
-      - macos-x86_64
-      - windows
-      - linux
-      - linux-cross
-      - musllinux
-      - musllinux-cross
-      - validate-tag
-    # If you don't set an input tag, it's a dry run (no uploads).
-    if: ${{ inputs.tag }}
-    environment:
-      name: release
-    permissions:
-      # For pypi trusted publishing
-      id-token: write
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: wheels-*
-          path: wheels
-          merge-multiple: true
-      - name: Publish to PyPi
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          skip-existing: true
-          packages-dir: wheels
-          verbose: true
-
-  tag-release:
-    name: Tag release
-    runs-on: ubuntu-latest
-    needs: upload-release
-    # If you don't set an input tag, it's a dry run (no uploads).
-    if: ${{ inputs.tag }}
-    permissions:
-      # For git tag
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
-      - name: git tag
-        run: |
-          git config user.email "hey@astral.sh"
-          git config user.name "Ruff Release CI"
-          git tag -m "v${{ inputs.tag }}" "v${{ inputs.tag }}"
-          # If there is duplicate tag, this will fail. The publish to pypi action will have been a noop (due to skip
-          # existing), so we make a non-destructive exit here
-          git push --tags
-
-  publish-release:
-    name: Publish to GitHub
-    runs-on: ubuntu-latest
-    needs: tag-release
-    # If you don't set an input tag, it's a dry run (no uploads).
-    if: ${{ inputs.tag }}
-    permissions:
-      # For GitHub release publishing
-      contents: write
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: binaries-*
-          path: binaries
-          merge-multiple: true
-      - name: "Publish to GitHub"
-        uses: softprops/action-gh-release@v2
-        with:
-          draft: true
-          files: binaries/*
-          tag_name: v${{ inputs.tag }}
-
-  docker-publish:
-    # This action doesn't need to wait on any other task, it's easy to re-tag if something failed and we're validating
-    # the tag here also
-    name: Push Docker image ghcr.io/astral-sh/ruff
-    runs-on: ubuntu-latest
-    environment:
-      name: release
-    permissions:
-      # For the docker push
-      packages: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
-
-      - uses: docker/setup-buildx-action@v3
-
-      - uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/astral-sh/ruff
-
-      - name: Check tag consistency
-        # Unlike validate-tag we don't check if the commit is on the main branch, but it seems good enough since we can
-        # change docker tags
-        if: ${{ inputs.tag }}
-        run: |
-          version=$(grep "version = " pyproject.toml | sed -e 's/version = "\(.*\)"/\1/g')
-          if [ "${{ inputs.tag }}" != "${version}" ]; then
-            echo "The input tag does not match the version from pyproject.toml:" >&2
-            echo "${{ inputs.tag }}" >&2
-            echo "${version}" >&2
-            exit 1
-          else
-            echo "Releasing ${version}"
-          fi
-
-      - name: "Build and push Docker image"
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          # Reuse the builder
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          push: ${{ inputs.tag != '' }}
-          tags: ghcr.io/astral-sh/ruff:latest,ghcr.io/astral-sh/ruff:${{ inputs.tag || 'dry-run' }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  # After the release has been published, we update downstream repositories
-  # This is separate because if this fails the release is still fine, we just need to do some manual workflow triggers
-  update-dependents:
-    name: Update dependents
-    runs-on: ubuntu-latest
-    needs: publish-release
-    steps:
-      - name: "Update pre-commit mirror"
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.RUFF_PRE_COMMIT_PAT }}
-          script: |
-            github.rest.actions.createWorkflowDispatch({
-              owner: 'astral-sh',
-              repo: 'ruff-pre-commit',
-              workflow_id: 'main.yml',
-              ref: 'main',
-            })

.github/workflows/ruff.yaml

@@ -0,0 +1,298 @@
+name: "[ruff] Release"
+
+on:
+  release:
+    types: [published]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  PACKAGE_NAME: ruff
+  PYTHON_VERSION: "3.7" # to build abi3 wheels
+  CARGO_INCREMENTAL: 0
+  CARGO_NET_RETRY: 10
+  RUSTUP_MAX_RETRIES: 10
+
+jobs:
+  macos-x86_64:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          architecture: x64
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          default: true
+      - name: Build wheels - x86_64
+        uses: messense/maturin-action@v1
+        with:
+          target: x86_64
+          args: --release --out dist --sdist
+      - name: Install built wheel - x86_64
+        run: |
+          pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+  macos-universal:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          architecture: x64
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          default: true
+      - name: Build wheels - universal2
+        uses: messense/maturin-action@v1
+        with:
+          args: --release --universal2 --out dist
+      - name: Install built wheel - universal2
+        run: |
+          pip install dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  windows:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        target: [x64, x86]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          architecture: ${{ matrix.target }}
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          default: true
+      - name: Build wheels
+        uses: messense/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          args: --release --out dist
+      - name: Install built wheel
+        shell: bash
+        run: |
+          python -m pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  linux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [x86_64, i686]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          architecture: x64
+      - name: Build wheels
+        uses: messense/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          manylinux: auto
+          args: --release --out dist
+      - name: Install built wheel
+        if: matrix.target == 'x86_64'
+        run: |
+          pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  linux-cross:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [aarch64, armv7, s390x, ppc64le, ppc64]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+      - name: Build wheels
+        uses: messense/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          manylinux: auto
+          args: --no-default-features --release --out dist
+      - uses: uraimo/run-on-arch-action@v2.0.5
+        if: matrix.target != 'ppc64'
+        name: Install built wheel
+        with:
+          arch: ${{ matrix.target }}
+          distro: ubuntu20.04
+          githubToken: ${{ github.token }}
+          install: |
+            apt-get update
+            apt-get install -y --no-install-recommends python3 python3-pip
+            pip3 install -U pip
+          run: |
+            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  musllinux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target:
+          - x86_64-unknown-linux-musl
+          - i686-unknown-linux-musl
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+          architecture: x64
+      - name: Build wheels
+        uses: messense/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          manylinux: musllinux_1_2
+          args: --release --out dist
+      - name: Install built wheel
+        if: matrix.target == 'x86_64-unknown-linux-musl'
+        uses: addnab/docker-run-action@v3
+        with:
+          image: alpine:latest
+          options: -v ${{ github.workspace }}:/io -w /io
+          run: |
+            apk add py3-pip
+            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/dist/ --force-reinstall
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  musllinux-cross:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform:
+          - target: aarch64-unknown-linux-musl
+            arch: aarch64
+          - target: armv7-unknown-linux-musleabihf
+            arch: armv7
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+      - name: Build wheels
+        uses: messense/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          manylinux: musllinux_1_2
+          args: --release --out dist
+      - uses: uraimo/run-on-arch-action@master
+        name: Install built wheel
+        with:
+          arch: ${{ matrix.platform.arch }}
+          distro: alpine_latest
+          githubToken: ${{ github.token }}
+          install: |
+            apk add py3-pip
+          run: |
+            pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  pypy:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        target: [x86_64, aarch64]
+        python-version:
+          - "3.7"
+          - "3.8"
+          - "3.9"
+        exclude:
+          - os: macos-latest
+            target: aarch64
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: pypy${{ matrix.python-version }}
+      - name: Build wheels
+        uses: messense/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          manylinux: auto
+          args: --release --out dist -i pypy${{ matrix.python-version }}
+      - name: Install built wheel
+        if: matrix.target == 'x86_64'
+        run: |
+          pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: dist
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    needs:
+      - macos-universal
+      - macos-x86_64
+      - windows
+      - linux
+      - linux-cross
+      - musllinux
+      - musllinux-cross
+      - pypy
+    if: "startsWith(github.ref, 'refs/tags/')"
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: wheels
+      - uses: actions/setup-python@v4
+      - name: Publish to PyPi
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.RUFF_TOKEN }}
+        run: |
+          pip install --upgrade twine
+          twine upload --skip-existing *
+      - name: Update pre-commit mirror
+        run: |
+          curl -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.RUFF_PRE_COMMIT_PAT }}" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/charliermarsh/ruff-pre-commit/dispatches --data '{"event_type": "pypi_release"}'

.gitignore

@@ -1,25 +1,6 @@
-# Benchmarking cpython (CONTRIBUTING.md)
-crates/ruff_linter/resources/test/cpython
-# generate_mkdocs.py
-mkdocs.generated.yml
-# check_ecosystem.py
-ruff-old
-github_search*.jsonl
-# update_schemastore.py
-schemastore
-# `maturin develop` and ecosystem_all_check.sh
-.venv*
-# Formatter debugging (crates/ruff_python_formatter/README.md)
-scratch.*
-# Created by `perf` (CONTRIBUTING.md)
-perf.data
-perf.data.old
-# Created by `flamegraph` (CONTRIBUTING.md)
-flamegraph.svg
-# Additional target directories that don't invalidate the main compile cache when changing linker settings,
-# e.g. `CARGO_TARGET_DIR=target-maturin maturin build --release --strip` or
-# `CARGO_TARGET_DIR=target-llvm-lines RUSTFLAGS="-Csymbol-mangling-version=v0" cargo llvm-lines -p ruff --lib`
-/target*
+# Local cache
+.ruff_cache
+resources/test/cpython
 
 ###
 # Rust.gitignore
@@ -92,7 +73,6 @@ coverage.xml
 .hypothesis/
 .pytest_cache/
 cover/
-repos/
 
 # Translations
 *.mo
@@ -202,16 +182,3 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
 .vimspector.json
-
-# Visual Studio Code
-.vscode/
-
-# 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

.markdownlint.yaml

@@ -1,20 +0,0 @@
-# default to true for all rules
-default: true
-
-# MD007/unordered-list-indent
-MD007:
-  indent: 4
-
-# MD033/no-inline-html
-MD033: false
-
-# MD041/first-line-h1
-MD041: false
-
-# MD013/line-length
-MD013: false
-
-# MD024/no-duplicate-heading
-MD024:
-  # Allow when nested under different parents e.g. CHANGELOG.md
-  siblings_only: true

.pre-commit-config.yaml

@@ -1,79 +1,18 @@
-fail_fast: true
-
-exclude: |
-  (?x)^(
-    crates/ruff_linter/resources/.*|
-    crates/ruff_linter/src/rules/.*/snapshots/.*|
-    crates/ruff/resources/.*|
-    crates/ruff_python_formatter/resources/.*|
-    crates/ruff_python_formatter/tests/snapshots/.*|
-    crates/ruff_python_resolver/resources/.*|
-    crates/ruff_python_resolver/tests/snapshots/.*
-  )$
-
 repos:
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.0.231
+    hooks:
+      - id: ruff
+
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.16
+    rev: v0.10.1
     hooks:
       - id: validate-pyproject
 
-  - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.17
-    hooks:
-      - id: mdformat
-        additional_dependencies:
-          - mdformat-mkdocs
-          - mdformat-admon
-        exclude: |
-          (?x)^(
-            docs/formatter/black\.md
-            | docs/\w+\.md
-          )$
-
-  - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.39.0
-    hooks:
-      - id: markdownlint-fix
-        exclude: |
-          (?x)^(
-            docs/formatter/black\.md
-            | docs/\w+\.md
-          )$
-
-  - repo: https://github.com/crate-ci/typos
-    rev: v1.20.10
-    hooks:
-      - id: typos
-
   - repo: local
     hooks:
       - id: cargo-fmt
         name: cargo fmt
         entry: cargo fmt --
-        language: system
+        language: rust
         types: [rust]
-        pass_filenames: false # This makes it a lot faster
-
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.2
-    hooks:
-      - id: ruff-format
-      - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
-        types_or: [python, pyi]
-        require_serial: true
-        exclude: |
-          (?x)^(
-            crates/ruff_linter/resources/.*|
-            crates/ruff_python_formatter/resources/.*
-          )$
-
-  # Prettier
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.1.0
-    hooks:
-      - id: prettier
-        types: [yaml]
-
-ci:
-  skip: [cargo-fmt, dev-generate-all]

BREAKING_CHANGES.md

@@ -1,381 +1,15 @@
 # Breaking Changes
 
-## 0.3.0
-
-### Ruff 2024.2 style
-
-The formatter now formats code according to the Ruff 2024.2 style guide. Read the [changelog](./CHANGELOG.md#030) for a detailed list of stabilized style changes.
-
-### `isort`: Use one blank line after imports in typing stub files ([#9971](https://github.com/astral-sh/ruff/pull/9971))
-
-Previously, Ruff used one or two blank lines (or the number configured by `isort.lines-after-imports`) after imports in typing stub files (`.pyi` files).
-The [typing style guide for stubs](https://typing.readthedocs.io/en/latest/source/stubs.html#style-guide) recommends using at most 1 blank line for grouping.
-As of this release, `isort` now always uses one blank line after imports in stub files, the same as the formatter.
-
-### `build` is no longer excluded by default ([#10093](https://github.com/astral-sh/ruff/pull/10093))
-
-Ruff maintains a list of directories and files that are excluded by default. This list now consists of the following patterns:
-
-- `.bzr`
-- `.direnv`
-- `.eggs`
-- `.git`
-- `.git-rewrite`
-- `.hg`
-- `.ipynb_checkpoints`
-- `.mypy_cache`
-- `.nox`
-- `.pants.d`
-- `.pyenv`
-- `.pytest_cache`
-- `.pytype`
-- `.ruff_cache`
-- `.svn`
-- `.tox`
-- `.venv`
-- `.vscode`
-- `__pypackages__`
-- `_build`
-- `buck-out`
-- `dist`
-- `node_modules`
-- `site-packages`
-- `venv`
-
-Previously, the `build` directory was included in this list. However, the `build` directory tends to be a not-unpopular directory
-name, and excluding it by default caused confusion. Ruff now no longer excludes `build` except if it is excluded by a `.gitignore` file
-or because it is listed in `extend-exclude`.
-
-### `--format` is no longer a valid `rule` or `linter` command option
-
-Previously, `ruff rule` and `ruff linter` accepted the `--format <FORMAT>` option as an alias for `--output-format`. Ruff no longer
-supports this alias. Please use `ruff rule --output-format <FORMAT>` and `ruff linter --output-format <FORMAT>` instead.
-
-## 0.1.9
-
-### `site-packages` is now excluded by default ([#5513](https://github.com/astral-sh/ruff/pull/5513))
-
-Ruff maintains a list of default exclusions, which now consists of the following patterns:
-
-- `.bzr`
-- `.direnv`
-- `.eggs`
-- `.git-rewrite`
-- `.git`
-- `.hg`
-- `.ipynb_checkpoints`
-- `.mypy_cache`
-- `.nox`
-- `.pants.d`
-- `.pyenv`
-- `.pytest_cache`
-- `.pytype`
-- `.ruff_cache`
-- `.svn`
-- `.tox`
-- `.venv`
-- `.vscode`
-- `__pypackages__`
-- `_build`
-- `buck-out`
-- `build`
-- `dist`
-- `node_modules`
-- `site-packages`
-- `venv`
-
-Previously, the `site-packages` directory was not excluded by default. While `site-packages` tends
-to be excluded anyway by virtue of the `.venv` exclusion, this may not be the case when using Ruff
-from VS Code outside a virtual environment.
-
-## 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))
-
-Previously, when a target Python version was not specified, Ruff would use a default of Python 3.10. However, it is safer to default to an _older_ Python version to avoid assuming the availability of new features. We now default to the oldest supported Python version which is currently Python 3.8.
-
-(We still support Python 3.7 but since [it has reached EOL](https://devguide.python.org/versions/#unsupported-versions) we've decided not to make it the default here.)
-
-Note this change was announced in 0.0.283 but not active until 0.0.284.
-
-## 0.0.277
-
-### `.ipynb_checkpoints`, `.pyenv`, `.pytest_cache`, and `.vscode` are now excluded by default ([#5513](https://github.com/astral-sh/ruff/pull/5513))
-
-Ruff maintains a list of default exclusions, which now consists of the following patterns:
-
-- `.bzr`
-- `.direnv`
-- `.eggs`
-- `.git`
-- `.git-rewrite`
-- `.hg`
-- `.ipynb_checkpoints`
-- `.mypy_cache`
-- `.nox`
-- `.pants.d`
-- `.pyenv`
-- `.pytest_cache`
-- `.pytype`
-- `.ruff_cache`
-- `.svn`
-- `.tox`
-- `.venv`
-- `.vscode`
-- `__pypackages__`
-- `_build`
-- `buck-out`
-- `build`
-- `dist`
-- `node_modules`
-- `venv`
-
-Previously, the `.ipynb_checkpoints`, `.pyenv`, `.pytest_cache`, and `.vscode` directories were not
-excluded by default. This change brings Ruff's default exclusions in line with other tools like
-Black.
-
-## 0.0.276
-
-### The `keep-runtime-typing` setting has been reinstated ([#5470](https://github.com/astral-sh/ruff/pull/5470))
-
-The `keep-runtime-typing` setting has been reinstated with revised semantics. This setting was
-removed in [#4427](https://github.com/astral-sh/ruff/pull/4427), as it was equivalent to ignoring
-the `UP006` and `UP007` rules via Ruff's standard `ignore` mechanism.
-
-Taking `UP006` (rewrite `List[int]` to `list[int]`) as an example, the setting now behaves as
-follows:
-
-- On Python 3.7 and Python 3.8, setting `keep-runtime-typing = true` will cause Ruff to ignore
-    `UP006` violations, even if `from __future__ import annotations` is present in the file.
-    While such annotations are valid in Python 3.7 and Python 3.8 when combined with
-    `from __future__ import annotations`, they aren't supported by libraries like Pydantic and
-    FastAPI, which rely on runtime type checking.
-- On Python 3.9 and above, the setting has no effect, as `list[int]` is a valid type annotation,
-    and libraries like Pydantic and FastAPI support it without issue.
-
-In short: `keep-runtime-typing` can be used to ensure that Ruff doesn't introduce type annotations
-that are not supported at runtime by the current Python version, which are unsupported by libraries
-like Pydantic and FastAPI.
-
-Note that this is not a breaking change, but is included here to complement the previous removal
-of `keep-runtime-typing`.
-
-## 0.0.268
-
-### The `keep-runtime-typing` setting has been removed ([#4427](https://github.com/astral-sh/ruff/pull/4427))
-
-Enabling the `keep-runtime-typing` option, located under the `pyupgrade` section, is equivalent
-to ignoring the `UP006` and `UP007` rules via Ruff's standard `ignore` mechanism. As there's no
-need for a dedicated setting to disable these rules, the `keep-runtime-typing` option has been
-removed.
-
-## 0.0.267
-
-### `update-check` is no longer a valid configuration option ([#4313](https://github.com/astral-sh/ruff/pull/4313))
-
-The `update-check` functionality was deprecated in [#2530](https://github.com/astral-sh/ruff/pull/2530),
-in that the behavior itself was removed, and Ruff was changed to warn when that option was enabled.
-
-Now, Ruff will throw an error when `update-check` is provided via a configuration file (e.g.,
-`update-check = false`) or through the command-line, since it has no effect. Users should remove
-this option from their configuration.
-
-## 0.0.265
-
-### `--fix-only` now exits with a zero exit code, unless `--exit-non-zero-on-fix` is specified ([#4146](https://github.com/astral-sh/ruff/pull/4146))
-
-Previously, `--fix-only` would exit with a non-zero exit code if any fixes were applied. This
-behavior was inconsistent with `--fix`, and further, meant that `--exit-non-zero-on-fix` was
-effectively ignored when `--fix-only` was specified.
-
-Now, `--fix-only` will exit with a zero exit code, unless `--exit-non-zero-on-fix` is specified,
-in which case it will exit with a non-zero exit code if any fixes were applied.
-
-## 0.0.260
-
-### Fixes are now represented as a list of edits ([#3709](https://github.com/astral-sh/ruff/pull/3709))
-
-Previously, Ruff represented each fix as a single edit, which prohibited Ruff from automatically
-fixing violations that required multiple edits across a file. As such, Ruff now represents each
-fix as a list of edits.
-
-This primarily affects the JSON API. Ruff's JSON representation used to represent the `fix` field as
-a single edit, like so:
-
-```json
-{
-    "message": "Remove unused import: `sys`",
-    "content": "",
-    "location": {"row": 1, "column": 0},
-    "end_location": {"row": 2, "column": 0}
-}
-```
-
-The updated representation instead includes a list of edits:
-
-```json
-{
-    "message": "Remove unused import: `sys`",
-    "edits": [
-        {
-            "content": "",
-            "location": {"row": 1, "column": 0},
-            "end_location": {"row": 2, "column": 0},
-        }
-    ]
-}
-```
-
-## 0.0.246
-
-### `multiple-statements-on-one-line-def` (`E704`) was removed ([#2773](https://github.com/astral-sh/ruff/pull/2773))
-
-This rule was introduced in v0.0.245. However, it turns out that pycodestyle and Flake8 ignore this
-rule by default, as it is not part of PEP 8. As such, we've removed it from Ruff.
-
-## 0.0.245
-
-### Ruff's public `check` method was removed ([#2709](https://github.com/astral-sh/ruff/pull/2709))
-
-Previously, Ruff exposed a `check` method as a public Rust API. This method was used by few,
-if any clients, and was not well documented or supported. As such, it has been removed, with
-the intention of adding a stable public API in the future.
-
-## 0.0.238
-
-### `select`, `extend-select`, `ignore`, and `extend-ignore` have new semantics ([#2312](https://github.com/astral-sh/ruff/pull/2312))
-
-Previously, the interplay between `select` and its related options could lead to unexpected
-behavior. For example, `ruff --select E501 --ignore ALL` and `ruff --select E501 --extend-ignore ALL`
-behaved differently. (See [#2312](https://github.com/astral-sh/ruff/pull/2312) for more
-examples.)
-
-When Ruff determines the enabled rule set, it has to reconcile `select` and `ignore` from a variety
-of sources, including the current `pyproject.toml`, any inherited `pyproject.toml` files, and the
-CLI.
-
-The new semantics are such that Ruff uses the "highest-priority" `select` as the basis for the rule
-set, and then applies any `extend-select`, `ignore`, and `extend-ignore` adjustments. CLI options
-are given higher priority than `pyproject.toml` options, and the current `pyproject.toml` file is
-given higher priority than any inherited `pyproject.toml` files.
-
-`extend-select` and `extend-ignore` are no longer given "top priority"; instead, they merely append
-to the `select` and `ignore` lists, as in Flake8.
-
-This change is largely backwards compatible -- most users should experience no change in behavior.
-However, as an example of a breaking change, consider the following:
-
-```toml
-[tool.ruff]
-ignore = ["F401"]
-```
-
-Running `ruff --select F` would previously have enabled all `F` rules, apart from `F401`. Now, it
-will enable all `F` rules, including `F401`, as the command line's `--select` resets the resolution.
-
-### `remove-six-compat` (`UP016`) has been removed ([#2332](https://github.com/astral-sh/ruff/pull/2332))
-
-The `remove-six-compat` rule has been removed. This rule was only useful for one-time Python 2-to-3
-upgrades.
-
-## 0.0.237
-
-### `--explain`, `--clean`, and `--generate-shell-completion` are now subcommands ([#2190](https://github.com/astral-sh/ruff/pull/2190))
-
-`--explain`, `--clean`, and `--generate-shell-completion` are now implemented as subcommands:
-
-```console
-ruff .         # Still works! And will always work.
-ruff check .   # New! Also works.
-
-ruff --explain E402   # Still works.
-ruff rule E402        # New! Also works. (And preferred.)
-
-# Oops! The command has to come first.
-ruff --format json --explain E402   # No longer works.
-ruff --explain E402 --format json   # Still works!
-ruff rule E402   --format json      # Works! (And preferred.)
-```
-
-This change is largely backwards compatible -- most users should experience
-no change in behavior. However, please note the following exceptions:
-
-- Subcommands will now fail when invoked with unsupported arguments, instead
-    of silently ignoring them. For example, the following will now fail:
-
-    ```console
-    ruff --clean --respect-gitignore
-    ```
-
-    (the `clean` command doesn't support `--respect-gitignore`.)
-
-- The semantics of `ruff <arg>` have changed slightly when `<arg>` is a valid subcommand.
-    For example, prior to this release, running `ruff rule` would run `ruff` over a file or
-    directory called `rule`. Now, `ruff rule` would invoke the `rule` subcommand. This should
-    only impact projects with files or directories named `rule`, `check`, `explain`, `clean`,
-    or `generate-shell-completion`.
-
-- Scripts that invoke ruff should supply `--` before any positional arguments.
-    (The semantics of `ruff -- <arg>` have not changed.)
-
-- `--explain` previously treated `--format grouped` as a synonym for `--format text`.
-    This is no longer supported; instead, use `--format text`.
-
 ## 0.0.226
 
-### `misplaced-comparison-constant` (`PLC2201`) was deprecated in favor of `SIM300` ([#1980](https://github.com/astral-sh/ruff/pull/1980))
+### `misplaced-comparison-constant` (`PLC2201`) was deprecated in favor of `SIM300` ([#1980](https://github.com/charliermarsh/ruff/pull/1980))
 
 These two rules contain (nearly) identical logic. To deduplicate the rule set, we've upgraded
 `SIM300` to handle a few more cases, and deprecated `PLC2201` in favor of `SIM300`.
 
 ## 0.0.225
 
-### `@functools.cache` rewrites have been moved to a standalone rule (`UP033`) ([#1938](https://github.com/astral-sh/ruff/pull/1938))
+### `@functools.cache` rewrites have been moved to a standalone rule (`UP033`) ([#1938](https://github.com/charliermarsh/ruff/pull/1938))
 
 Previously, `UP011` handled both `@functools.lru_cache()`-to-`@functools.lru_cache` conversions,
 _and_ `@functools.lru_cache(maxsize=None)`-to-`@functools.cache` conversions. The latter has been
@@ -384,7 +18,7 @@ to reflect the change in rule code.
 
 ## 0.0.222
 
-### `--max-complexity` has been removed from the CLI ([#1877](https://github.com/astral-sh/ruff/pull/1877))
+### `--max-complexity` has been removed from the CLI ([#1877](https://github.com/charliermarsh/ruff/pull/1877))
 
 The McCabe plugin's `--max-complexity` setting has been removed from the CLI, for consistency with
 the treatment of other, similar settings.
@@ -399,7 +33,7 @@ max-complexity = 10
 
 ## 0.0.181
 
-### Files excluded by `.gitignore` are now ignored ([#1234](https://github.com/astral-sh/ruff/pull/1234))
+### Files excluded by `.gitignore` are now ignored ([#1234](https://github.com/charliermarsh/ruff/pull/1234))
 
 Ruff will now avoid checking files that are excluded by `.ignore`, `.gitignore`,
 `.git/info/exclude`, and global `gitignore` files. This behavior is powered by the [`ignore`](https://docs.rs/ignore/latest/ignore/struct.WalkBuilder.html#ignore-rules)
@@ -412,9 +46,9 @@ default.
 
 ## 0.0.178
 
-### Configuration files are now resolved hierarchically ([#1190](https://github.com/astral-sh/ruff/pull/1190))
+### Configuration files are now resolved hierarchically ([#1190](https://github.com/charliermarsh/ruff/pull/1190))
 
 `pyproject.toml` files are now resolved hierarchically, such that for each Python file, we find
 the first `pyproject.toml` file in its path, and use that to determine its lint settings.
 
-See the [documentation](https://docs.astral.sh/ruff/configuration/#python-file-discovery) for more.
+See the [README](https://github.com/charliermarsh/ruff#pyprojecttoml-discovery) for more.

CODE_OF_CONDUCT.md

@@ -1,17 +1,5 @@
 # Contributor Covenant Code of Conduct
 
-- [Our Pledge](#our-pledge)
-- [Our Standards](#our-standards)
-- [Enforcement Responsibilities](#enforcement-responsibilities)
-- [Scope](#scope)
-- [Enforcement](#enforcement)
-- [Enforcement Guidelines](#enforcement-guidelines)
-    - [1. Correction](#1-correction)
-    - [2. Warning](#2-warning)
-    - [3. Temporary Ban](#3-temporary-ban)
-    - [4. Permanent Ban](#4-permanent-ban)
-- [Attribution](#attribution)
-
 ## Our Pledge
 
 We as members, contributors, and leaders pledge to make participation in our
@@ -29,24 +17,24 @@ diverse, inclusive, and healthy community.
 Examples of behavior that contributes to a positive environment for our
 community include:
 
-- Demonstrating empathy and kindness toward other people
-- Being respectful of differing opinions, viewpoints, and experiences
-- Giving and gracefully accepting constructive feedback
-- Accepting responsibility and apologizing to those affected by our mistakes,
-    and learning from the experience
-- Focusing on what is best not just for us as individuals, but for the
-    overall community
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
 
 Examples of unacceptable behavior include:
 
-- The use of sexualized language or imagery, and sexual attention or
-    advances of any kind
-- Trolling, insulting or derogatory comments, and personal or political attacks
-- Public or private harassment
-- Publishing others' private information, such as a physical or email
-    address, without their explicit permission
-- Other conduct which could reasonably be considered inappropriate in a
-    professional setting
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
 ## Enforcement Responsibilities
 
@@ -72,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-<charlie.r.marsh@gmail.com>.
+charlie.r.marsh@gmail.com.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the
@@ -118,7 +106,7 @@ Violating these terms may lead to a permanent ban.
 ### 4. Permanent Ban
 
 **Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
+standards, including sustained inappropriate behavior,  harassment of an
 individual, or aggression toward or disparagement of classes of individuals.
 
 **Consequence**: A permanent ban from any sort of public interaction within
@@ -127,12 +115,14 @@ the community.
 ## Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available [here](https://www.contributor-covenant.org/version/2/0/code_of_conduct.html).
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
 
 Community Impact Guidelines were inspired by [Mozilla's code of conduct
 enforcement ladder](https://github.com/mozilla/diversity).
 
-For answers to common questions about this code of conduct, see the [FAQ](https://www.contributor-covenant.org/faq).
-Translations are available [here](https://www.contributor-covenant.org/translations).
-
 [homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

@@ -2,50 +2,22 @@
 
 Welcome! We're happy to have you here. Thank you in advance for your contribution to Ruff.
 
-- [The Basics](#the-basics)
-    - [Prerequisites](#prerequisites)
-    - [Development](#development)
-    - [Project Structure](#project-structure)
-    - [Example: Adding a new lint rule](#example-adding-a-new-lint-rule)
-        - [Rule naming convention](#rule-naming-convention)
-        - [Rule testing: fixtures and snapshots](#rule-testing-fixtures-and-snapshots)
-    - [Example: Adding a new configuration option](#example-adding-a-new-configuration-option)
-- [MkDocs](#mkdocs)
-- [Release Process](#release-process)
-    - [Creating a new release](#creating-a-new-release)
-- [Ecosystem CI](#ecosystem-ci)
-- [Benchmarking and Profiling](#benchmarking-and-profiling)
-    - [CPython Benchmark](#cpython-benchmark)
-    - [Microbenchmarks](#microbenchmarks)
-        - [Benchmark-driven Development](#benchmark-driven-development)
-        - [PR Summary](#pr-summary)
-        - [Tips](#tips)
-    - [Profiling Projects](#profiling-projects)
-        - [Linux](#linux)
-        - [Mac](#mac)
-- [`cargo dev`](#cargo-dev)
-- [Subsystems](#subsystems)
-    - [Compilation Pipeline](#compilation-pipeline)
-    - [Import Categorization](#import-categorization)
-        - [Project root](#project-root)
-        - [Package root](#package-root)
-        - [Import categorization](#import-categorization-1)
+## The basics
 
-## The Basics
+Ruff welcomes contributions in the form of Pull Requests. For small changes (e.g., bug fixes), feel
+free to submit a PR. For larger changes (e.g., new lint rules, new functionality, new configuration
+options), consider submitting an [Issue](https://github.com/charliermarsh/ruff/issues) outlining
+your proposed change.
 
-Ruff welcomes contributions in the form of pull requests.
+If you're looking for a place to start, we recommend implementing a new lint rule (see:
+[_Adding a new lint rule_](#example-adding-a-new-lint-rule), which will allow you to learn from and
+pattern-match against the examples in the existing codebase. Many lint rules are inspired by
+existing Python plugins, which can be used as a reference implementation.
 
-For small changes (e.g., bug fixes), feel free to submit a PR.
-
-For larger changes (e.g., new lint rules, new functionality, new configuration options), consider
-creating an [**issue**](https://github.com/astral-sh/ruff/issues) outlining your proposed change.
-You can also join us on [Discord](https://discord.com/invite/astral-sh) to discuss your idea with the
-community. We've labeled [beginner-friendly tasks](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
-in the issue tracker, along with [bugs](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3Abug)
-and [improvements](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3Aaccepted)
-that are ready for contributions.
-
-If you have suggestions on how we might improve the contributing documentation, [let us know](https://github.com/astral-sh/ruff/discussions/5693)!
+As a concrete example: consider taking on one of the rules from the [`tryceratops`](https://github.com/charliermarsh/ruff/issues/2056)
+plugin, and looking to the originating [Python source](https://github.com/guilatrova/tryceratops)
+for guidance. [`flake8-simplify`](https://github.com/charliermarsh/ruff/issues/998) has a few rules
+left too.
 
 ### Prerequisites
 
@@ -58,268 +30,100 @@ You'll also need [Insta](https://insta.rs/docs/) to update snapshot tests:
 cargo install cargo-insta
 ```
 
-And you'll need pre-commit to run some validation checks:
-
-```shell
-pipx install pre-commit  # or `pip install pre-commit` if you have a virtualenv
-```
-
-You can optionally install pre-commit hooks to automatically run the validation checks
-when making a commit:
-
-```shell
-pre-commit install
-```
-
-We recommend [nextest](https://nexte.st/) to run Ruff's test suite (via `cargo nextest run`),
-though it's not strictly necessary:
-
-```shell
-cargo install cargo-nextest --locked
-```
-
-Throughout this guide, any usages of `cargo test` can be replaced with `cargo nextest run`,
-if you choose to install `nextest`.
-
 ### Development
 
-After cloning the repository, run Ruff locally from the repository root with:
+After cloning the repository, run Ruff locally with:
 
 ```shell
-cargo run -p ruff -- check /path/to/file.py --no-cache
+cargo run resources/test/fixtures --no-cache
 ```
 
 Prior to opening a pull request, ensure that your code has been auto-formatted,
-and that it passes both the lint and test validation checks:
+and that it passes both the lint and test validation checks.
+
+For rustfmt and Clippy, we use [nightly Rust][nightly], as it is stricter than stable Rust.
+(However, tests and builds use stable Rust.)
 
 ```shell
-cargo clippy --workspace --all-targets --all-features -- -D warnings  # Rust linting
-RUFF_UPDATE_SCHEMA=1 cargo test  # Rust testing and updating ruff.schema.json
-pre-commit run --all-files --show-diff-on-failure  # Rust and Python formatting, Markdown and Python linting, etc.
+cargo +nightly fmt --all     # Auto-formatting...
+cargo +nightly clippy --fix --workspace --all-targets --all-features -- -W clippy::pedantic  # Linting...
+cargo test --all    # Testing...
 ```
 
-These checks will run on GitHub Actions when you open your pull request, but running them locally
+These checks will run on GitHub Actions when you open your Pull Request, but running them locally
 will save you time and expedite the merge process.
 
-Note that many code changes also require updating the snapshot tests, which is done interactively
-after running `cargo test` like so:
-
-```shell
-cargo insta review
-```
-
-If your pull request relates to a specific lint rule, include the category and rule code in the
-title, as in the following examples:
-
-- \[`flake8-bugbear`\] Avoid false positive for usage after `continue` (`B031`)
-- \[`flake8-simplify`\] Detect implicit `else` cases in `needless-bool` (`SIM103`)
-- \[`pycodestyle`\] Implement `redundant-backslash` (`E502`)
-
-Your pull request will be reviewed by a maintainer, which may involve a few rounds of iteration
+Your Pull Request will be reviewed by a maintainer, which may involve a few rounds of iteration
 prior to merging.
 
-### Project Structure
-
-Ruff is structured as a monorepo with a [flat crate structure](https://matklad.github.io/2021/08/22/large-rust-workspaces.html),
-such that all crates are contained in a flat `crates` directory.
-
-The vast majority of the code, including all lint rules, lives in the `ruff_linter` crate (located
-at `crates/ruff_linter`). As a contributor, that's the crate that'll be most relevant to you.
-
-At the 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.
-    If you're working on a rule, this is the crate for you.
-- `crates/ruff_benchmark`: binary crate for running micro-benchmarks.
-- `crates/ruff_cache`: library crate for caching lint results.
-- `crates/ruff`: binary crate containing Ruff's command-line interface.
-- `crates/ruff_dev`: binary crate containing utilities used in the development of Ruff itself (e.g.,
-    `cargo dev generate-all`), see the [`cargo dev`](#cargo-dev) section below.
-- `crates/ruff_diagnostics`: library crate for the rule-independent abstractions in the lint
-    diagnostics APIs.
-- `crates/ruff_formatter`: library crate for language agnostic code formatting logic based on an
-    intermediate representation. The backend for `ruff_python_formatter`.
-- `crates/ruff_index`: library crate inspired by `rustc_index`.
-- `crates/ruff_macros`: proc macro crate containing macros used by Ruff.
-- `crates/ruff_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
-    intermediate representation for each node, which `ruff_formatter` prints based on the configured
-    line length.
-- `crates/ruff_python_semantic`: library crate containing Python-specific semantic analysis logic,
-    including Ruff's semantic model. Used to resolve queries like "What import does this variable
-    refer to?"
-- `crates/ruff_python_stdlib`: library crate containing Python-specific standard library data, e.g.
-    the names of all built-in exceptions and which standard library types are immutable.
-- `crates/ruff_python_trivia`: library crate containing Python-specific trivia utilities (e.g.,
-    for analyzing indentation, newlines, etc.).
-- `crates/ruff_python_parser`: library crate containing the Python parser.
-- `crates/ruff_wasm`: library crate for exposing Ruff as a WebAssembly module. Powers the
-    [Ruff Playground](https://play.ruff.rs/).
-
 ### Example: Adding a new lint rule
 
 At a high level, the steps involved in adding a new lint rule are as follows:
 
-1. Determine a name for the new rule as per our [rule naming convention](#rule-naming-convention)
-    (e.g., `AssertFalse`, as in, "allow `assert False`").
+1. Create a file for your rule (e.g., `src/rules/flake8_bugbear/rules/abstract_base_class.rs`).
+2. In that file, define a violation struct. You can grep for `define_violation!` to see examples.
+3. Map the violation struct to a rule code in `src/registry.rs` (e.g., `E402`).
+4. Define the logic for triggering the violation in `src/checkers/ast.rs` (for AST-based checks),
+   `src/checkers/tokens.rs` (for token-based checks), `src/checkers/lines.rs` (for text-based
+   checks), or `src/checkers/filesystem.rs` (for filesystem-based checks).
+5. Add a test fixture.
+6. Update the generated files (documentation and generated code).
 
-1. Create a file for your rule (e.g., `crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs`).
+To define the violation, start by creating a dedicated file for your rule under the appropriate
+rule linter (e.g., `src/rules/flake8_bugbear/rules/abstract_base_class.rs`). That file should
+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 `src/violations.rs`, but we're
+looking to place new rules in their own files.)
 
-1. In that file, define a violation struct (e.g., `pub struct AssertFalse`). You can grep for
-    `#[violation]` to see examples.
+To trigger the violation, you'll likely want to augment the logic in `src/checkers/ast.rs`, which
+defines the Python AST visitor, responsible for iterating over the abstract syntax tree and
+collecting diagnostics as it goes.
 
-1. In that file, define a function that adds the violation to the diagnostic list as appropriate
-    (e.g., `pub(crate) fn assert_false`) based on whatever inputs are required for the rule (e.g.,
-    an `ast::StmtAssert` node).
+If you need to inspect the AST, you can run `cargo +nightly dev print-ast` with a Python file. Grep
+for the `Check::new` invocations to understand how other, similar rules are implemented.
 
-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,
-    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).
+To add a test fixture, create a file under `resources/test/fixtures/[linter]`, named to match
+the code you defined earlier (e.g., `resources/test/fixtures/pycodestyle/E402.py`). This file should
+contain a variety of violations and non-violations designed to evaluate and demonstrate the behavior
+of your lint rule.
 
-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`.
+Run `cargo +nightly dev generate-all` to generate the code for your new fixture. Then run Ruff
+locally with (e.g.) `cargo run resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402`.
 
-1. Add proper [testing](#rule-testing-fixtures-and-snapshots) for your rule.
+Once you're satisfied with the output, codify the behavior as a snapshot test by adding a new
+`test_case` macro in the relevant `src/[linter]/mod.rs` file. Then, run `cargo test --all`.
+Your test will fail, but you'll be prompted to follow-up with `cargo insta review`. Accept the
+generated snapshot, then commit the snapshot file alongside the rest of your changes.
 
-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 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.
-
-If you need to inspect the AST, you can run `cargo dev print-ast` with a Python file. Grep
-for the `Diagnostic::new` invocations to understand how other, similar rules are implemented.
-
-Once you're satisfied with your code, add tests for your rule
-(see: [rule testing](#rule-testing-fixtures-and-snapshots)), and regenerate the documentation and
-associated assets (like our JSON Schema) with `cargo dev generate-all`.
-
-Finally, submit a pull request, and include the category, rule name, and rule code in the title, as
-in:
-
-> \[`pycodestyle`\] Implement `redundant-backslash` (`E502`)
-
-#### Rule naming convention
-
-Like Clippy, Ruff's rule names should make grammatical and logical sense when read as "allow
-${rule}" or "allow ${rule} items", as in the context of suppression comments.
-
-For example, `AssertFalse` fits this convention: it flags `assert False` statements, and so a
-suppression comment would be framed as "allow `assert False`".
-
-As such, rule names should...
-
-- Highlight the pattern that is being linted against, rather than the preferred alternative.
-    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`.
-
-- _Not_ contain a redundant prefix, like `Disallow` or `Banned`, which are already implied by the
-    convention.
-
-When re-implementing rules from other linters, we prioritize adhering to this convention over
-preserving the original rule name.
-
-#### Rule testing: fixtures and snapshots
-
-To test rules, Ruff uses snapshots of Ruff's output for a given file (fixture). Generally, there
-will be one file per rule (e.g., `E402.py`), and each file will contain all necessary examples of
-both violations and non-violations. `cargo insta review` will generate a snapshot file containing
-Ruff's output for each fixture, which you can then commit alongside your changes.
-
-Once you've completed the code for the rule itself, you can define tests with the following steps:
-
-1. Add a Python file to `crates/ruff_linter/resources/test/fixtures/[linter]` that contains the code you
-    want to test. The file name should match the rule name (e.g., `E402.py`), and it should include
-    examples of both violations and non-violations.
-
-1. Run Ruff locally against your file and verify the output is as expected. Once you're satisfied
-    with the output (you see the violations you expect, and no others), proceed to the next step.
-    For example, if you're adding a new rule named `E402`, you would run:
-
-    ```shell
-    cargo run -p ruff -- check crates/ruff_linter/resources/test/fixtures/pycodestyle/E402.py --no-cache --preview --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
-    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`)
-
-1. Run `cargo test`. Your test will fail, but you'll be prompted to follow-up
-    with `cargo insta review`. Run `cargo insta review`, review and accept the generated snapshot,
-    then commit the snapshot file alongside the rest of your changes.
-
-1. Run `cargo test` again to ensure that your test passes.
+Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.
 
 ### Example: Adding a new configuration option
 
 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/src/args.rs`.
+First, the command-line options are defined via the `Cli` struct in `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 `src/settings/options.rs` (via the `Options`
+struct), `src/settings/configuration.rs` (via the `Configuration` struct), and `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`).
+`src/flake8_unused_arguments/settings.rs`).
 
-Finally, regenerate the documentation and generated code with `cargo dev generate-all`.
+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 `flake8_to_ruff/src/converter.rs`.
 
-## MkDocs
+Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.
 
-To preview any changes to the documentation locally:
-
-1. Install the [Rust toolchain](https://www.rust-lang.org/tools/install).
-
-1. Install MkDocs and Material for MkDocs with:
-
-    ```shell
-    pip install -r docs/requirements.txt
-    ```
-
-1. Generate the MkDocs site with:
-
-    ```shell
-    python scripts/generate_mkdocs.py
-    ```
-
-1. Run the development server with:
-
-    ```shell
-    # For contributors.
-    mkdocs serve -f mkdocs.public.yml
-
-    # For members of the Astral org, which has access to MkDocs Insiders via sponsorship.
-    mkdocs serve -f mkdocs.insiders.yml
-    ```
-
-The documentation should then be available locally at
-[http://127.0.0.1:8000/ruff/](http://127.0.0.1:8000/ruff/).
-
-## Release Process
+## Release process
 
 As of now, Ruff has an ad hoc release process: releases are cut with high frequency via GitHub
 Actions, which automatically generates the appropriate wheels across architectures and publishes
@@ -328,591 +132,4 @@ them to [PyPI](https://pypi.org/project/ruff/).
 Ruff follows the [semver](https://semver.org/) versioning standard. However, as pre-1.0 software,
 even patch releases may contain [non-backwards-compatible changes](https://semver.org/#spec-item-4).
 
-### Creating a new release
-
-1. Install `uv`: `curl -LsSf https://astral.sh/uv/install.sh | sh`
-1. Run `./scripts/release/bump.sh`; this command will:
-    - Generate a temporary virtual environment with `rooster`
-    - Generate a changelog entry in `CHANGELOG.md`
-    - Update versions in `pyproject.toml` and `Cargo.toml`
-    - Update references to versions in the `README.md` and documentation
-    - Display contributors for the release
-1. The changelog should then be editorialized for consistency
-    - Often labels will be missing from pull requests they will need to be manually organized into the proper section
-    - Changes should be edited to be user-facing descriptions, avoiding internal details
-1. Highlight any breaking changes in `BREAKING_CHANGES.md`
-1. Run `cargo check`. This should update the lock file with new versions.
-1. Create a pull request with the changelog and version updates
-1. Merge the PR
-1. Run the [release workflow](https://github.com/astral-sh/ruff/actions/workflows/release.yaml) with:
-    - The new version number (without starting `v`)
-    - The commit hash of the merged release pull request on `main`
-1. The release workflow will do the following:
-    1. Build all the assets. If this fails (even though we tested in step 4), we haven't tagged or
-        uploaded anything, you can restart after pushing a fix.
-    1. Upload to PyPI.
-    1. Create and push the Git tag (as extracted from `pyproject.toml`). We create the Git tag only
-        after building the wheels and uploading to PyPI, since we can't delete or modify the tag ([#4468](https://github.com/astral-sh/ruff/issues/4468)).
-    1. Attach artifacts to draft GitHub release
-    1. Trigger downstream repositories. This can fail non-catastrophically, as we can run any
-        downstream jobs manually if needed.
-1. Publish the GitHub release
-    1. Open the draft release in the GitHub release section
-    1. Copy the changelog for the release into the GitHub release
-        - See previous releases for formatting of section headers
-    1. Append the contributors from the `bump.sh` script
-1. If needed, [update the schemastore](https://github.com/astral-sh/ruff/blob/main/scripts/update_schemastore.py).
-    1. One can determine if an update is needed when
-        `git diff old-version-tag new-version-tag -- ruff.schema.json` returns a non-empty diff.
-    1. Once run successfully, you should follow the link in the output to create a PR.
-1. If needed, update the `ruff-lsp` and `ruff-vscode` repositories.
-
-## Ecosystem CI
-
-GitHub Actions will run your changes against a number of real-world projects from GitHub and
-report on any linter or formatter differences. You can also run those checks locally via:
-
-```shell
-pip install -e ./python/ruff-ecosystem
-ruff-ecosystem check ruff "./target/debug/ruff"
-ruff-ecosystem format ruff "./target/debug/ruff"
-```
-
-See the [ruff-ecosystem package](https://github.com/astral-sh/ruff/tree/main/python/ruff-ecosystem) for more details.
-
-## Benchmarking and Profiling
-
-We have several ways of benchmarking and profiling Ruff:
-
-- Our main performance benchmark comparing Ruff with other tools on the CPython codebase
-- Microbenchmarks which run the linter or the formatter on individual files. These run on pull requests.
-- Profiling the linter on either the microbenchmarks or entire projects
-
-> \[!NOTE\]
-> When running benchmarks, ensure that your CPU is otherwise idle (e.g., close any background
-> applications, like web browsers). You may also want to switch your CPU to a "performance"
-> mode, if it exists, especially when benchmarking short-lived processes.
-
-### CPython Benchmark
-
-First, clone [CPython](https://github.com/python/cpython). It's a large and diverse Python codebase,
-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
-```
-
-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"
-
-Benchmark 1: ./target/release/ruff ./crates/ruff_linter/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/
-  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'
-```
-
-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" \
-  "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"
-
-Benchmark 1: ./target/release/ruff ./crates/ruff_linter/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
-  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
-
-  Warning: Ignoring non-zero exit code.
-
-Benchmark 3: autoflake --recursive --expand-star-imports --remove-all-unused-imports --remove-unused-variables --remove-duplicate-keys resources/test/cpython
-  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
-  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
-  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
-   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'
-```
-
-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"
-```
-
-You can run `poetry install` from `./scripts/benchmarks` to create a working environment for the
-above. All reported benchmarks were computed using the versions specified by
-`./scripts/benchmarks/pyproject.toml` on Python 3.11.
-
-To benchmark Pylint, remove the following files from the CPython repository:
-
-```shell
-rm Lib/test/bad_coding.py \
-  Lib/test/bad_coding2.py \
-  Lib/test/bad_getattr.py \
-  Lib/test/bad_getattr2.py \
-  Lib/test/bad_getattr3.py \
-  Lib/test/badcert.pem \
-  Lib/test/badkey.pem \
-  Lib/test/badsyntax_3131.py \
-  Lib/test/badsyntax_future10.py \
-  Lib/test/badsyntax_future3.py \
-  Lib/test/badsyntax_future4.py \
-  Lib/test/badsyntax_future5.py \
-  Lib/test/badsyntax_future6.py \
-  Lib/test/badsyntax_future7.py \
-  Lib/test/badsyntax_future8.py \
-  Lib/test/badsyntax_future9.py \
-  Lib/test/badsyntax_pep3120.py \
-  Lib/test/test_asyncio/test_runners.py \
-  Lib/test/test_copy.py \
-  Lib/test/test_inspect.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
-will execute Pylint with maximum parallelism and only report errors.
-
-To benchmark Pyupgrade, run the following from `crates/ruff_linter/resources/test/cpython`:
-
-```shell
-hyperfine --ignore-failure --warmup 5 --prepare "git reset --hard HEAD" \
-  "find . -type f -name \"*.py\" | xargs -P 0 pyupgrade --py311-plus"
-
-Benchmark 1: find . -type f -name "*.py" | xargs -P 0 pyupgrade --py311-plus
-  Time (mean ± σ):     30.119 s ±  0.195 s    [User: 28.638 s, System: 0.390 s]
-  Range (min … max):   29.813 s … 30.356 s    10 runs
-```
-
-### Microbenchmarks
-
-The `ruff_benchmark` crate benchmarks the linter and the formatter on individual files.
-
-You can run the benchmarks with
-
-```shell
-cargo benchmark
-```
-
-#### Benchmark-driven Development
-
-Ruff uses [Criterion.rs](https://bheisler.github.io/criterion.rs/book/) for benchmarks. You can use
-`--save-baseline=<name>` to store an initial baseline benchmark (e.g. on `main`) and then use
-`--benchmark=<name>` to compare against that benchmark. Criterion will print a message telling you
-if the benchmark improved/regressed compared to that baseline.
-
-```shell
-# Run once on your "baseline" code
-cargo bench -p ruff_benchmark -- --save-baseline=main
-
-# Then iterate with
-cargo bench -p ruff_benchmark -- --baseline=main
-```
-
-#### PR Summary
-
-You can use `--save-baseline` and `critcmp` to get a pretty comparison between two recordings.
-This is useful to illustrate the improvements of a PR.
-
-```shell
-# On main
-cargo bench -p ruff_benchmark -- --save-baseline=main
-
-# After applying your changes
-cargo bench -p ruff_benchmark -- --save-baseline=pr
-
-critcmp main pr
-```
-
-You must install [`critcmp`](https://github.com/BurntSushi/critcmp) for the comparison.
-
-```bash
-cargo install critcmp
-```
-
-#### Tips
-
-- Use `cargo bench -p ruff_benchmark <filter>` to only run specific benchmarks. For example: `cargo benchmark lexer`
-    to only run the lexer benchmarks.
-- Use `cargo bench -p ruff_benchmark -- --quiet` for a more cleaned up output (without statistical relevance)
-- Use `cargo bench -p ruff_benchmark -- --quick` to get faster results (more prone to noise)
-
-### Profiling Projects
-
-You can either use the microbenchmarks from above or a project directory for benchmarking. There
-are a lot of profiling tools out there,
-[The Rust Performance Book](https://nnethercote.github.io/perf-book/profiling.html) lists some
-examples.
-
-#### Linux
-
-Install `perf` and build `ruff_benchmark` with the `profiling` profile and then run it with perf
-
-```shell
-cargo bench -p ruff_benchmark --no-run --profile=profiling && perf record --call-graph dwarf -F 9999 cargo bench -p ruff_benchmark --profile=profiling -- --profile-time=1
-```
-
-You can also use the `ruff_dev` launcher to run `ruff check` multiple times on a repository to
-gather enough samples for a good flamegraph (change the 999, the sample rate, and the 30, the number
-of checks, to your liking)
-
-```shell
-cargo build --bin ruff_dev --profile=profiling
-perf record -g -F 999 target/profiling/ruff_dev repeat --repeat 30 --exit-zero --no-cache path/to/cpython > /dev/null
-```
-
-Then convert the recorded profile
-
-```shell
-perf script -F +pid > /tmp/test.perf
-```
-
-You can now view the converted file with [firefox profiler](https://profiler.firefox.com/), with a
-more in-depth guide [here](https://profiler.firefox.com/docs/#/./guide-perf-profiling)
-
-An alternative is to convert the perf data to `flamegraph.svg` using
-[flamegraph](https://github.com/flamegraph-rs/flamegraph) (`cargo install flamegraph`):
-
-```shell
-flamegraph --perfdata perf.data --no-inline
-```
-
-#### Mac
-
-Install [`cargo-instruments`](https://crates.io/crates/cargo-instruments):
-
-```shell
-cargo install cargo-instruments
-```
-
-Then run the profiler with
-
-```shell
-cargo instruments -t time --bench linter --profile profiling -p ruff_benchmark -- --profile-time=1
-```
-
-- `-t`: Specifies what to profile. Useful options are `time` to profile the wall time and `alloc`
-    for profiling the allocations.
-- You may want to pass an additional filter to run a single test file
-
-Otherwise, follow the instructions from the linux section.
-
-## `cargo dev`
-
-`cargo dev` is a shortcut for `cargo run --package ruff_dev --bin ruff_dev`. You can run some useful
-utils with it:
-
-- `cargo dev print-ast <file>`: Print the AST of a python file using the
-    [RustPython parser](https://github.com/astral-sh/ruff/tree/main/crates/ruff_python_parser) that is
-    mainly used in Ruff. For `if True: pass # comment`, you can see the syntax tree, the byte offsets
-    for start and stop of each node and also how the `:` token, the comment and whitespace are not
-    represented anymore:
-
-```text
-[
-    If(
-        StmtIf {
-            range: 0..13,
-            test: Constant(
-                ExprConstant {
-                    range: 3..7,
-                    value: Bool(
-                        true,
-                    ),
-                    kind: None,
-                },
-            ),
-            body: [
-                Pass(
-                    StmtPass {
-                        range: 9..13,
-                    },
-                ),
-            ],
-            orelse: [],
-        },
-    ),
-]
-```
-
-- `cargo dev print-tokens <file>`: Print the tokens that the AST is built upon. Again for
-    `if True: pass # comment`:
-
-```text
-0 If 2
-3 True 7
-7 Colon 8
-9 Pass 13
-14 Comment(
-    "# comment",
-) 23
-23 Newline 24
-```
-
-- `cargo dev print-cst <file>`: Print the CST of a python file using
-    [LibCST](https://github.com/Instagram/LibCST), which is used in addition to the RustPython parser
-    in Ruff. E.g. for `if True: pass # comment` everything including the whitespace is represented:
-
-```text
-Module {
-    body: [
-        Compound(
-            If(
-                If {
-                    test: Name(
-                        Name {
-                            value: "True",
-                            lpar: [],
-                            rpar: [],
-                        },
-                    ),
-                    body: SimpleStatementSuite(
-                        SimpleStatementSuite {
-                            body: [
-                                Pass(
-                                    Pass {
-                                        semicolon: None,
-                                    },
-                                ),
-                            ],
-                            leading_whitespace: SimpleWhitespace(
-                                " ",
-                            ),
-                            trailing_whitespace: TrailingWhitespace {
-                                whitespace: SimpleWhitespace(
-                                    " ",
-                                ),
-                                comment: Some(
-                                    Comment(
-                                        "# comment",
-                                    ),
-                                ),
-                                newline: Newline(
-                                    None,
-                                    Real,
-                                ),
-                            },
-                        },
-                    ),
-                    orelse: None,
-                    leading_lines: [],
-                    whitespace_before_test: SimpleWhitespace(
-                        " ",
-                    ),
-                    whitespace_after_test: SimpleWhitespace(
-                        "",
-                    ),
-                    is_elif: false,
-                },
-            ),
-        ),
-    ],
-    header: [],
-    footer: [],
-    default_indent: "    ",
-    default_newline: "\n",
-    has_trailing_newline: true,
-    encoding: "utf-8",
-}
-```
-
-- `cargo dev generate-all`: Update `ruff.schema.json`, `docs/configuration.md` and `docs/rules`.
-    You can also set `RUFF_UPDATE_SCHEMA=1` to update `ruff.schema.json` during `cargo test`.
-- `cargo dev generate-cli-help`, `cargo dev generate-docs` and `cargo dev generate-json-schema`:
-    Update just `docs/configuration.md`, `docs/rules` and `ruff.schema.json` respectively.
-- `cargo dev generate-options`: Generate a markdown-compatible table of all `pyproject.toml`
-    options. Used for <https://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/>.
-- `cargo dev round-trip <python file or jupyter notebook>`: Read a Python file or Jupyter Notebook,
-    parse it, serialize the parsed representation and write it back. Used to check how good our
-    representation is so that fixes don't rewrite irrelevant parts of a file.
-- `cargo dev format_dev`: See ruff_python_formatter README.md
-
-## Subsystems
-
-### Compilation Pipeline
-
-If we view Ruff as a compiler, in which the inputs are paths to Python files and the outputs are
-diagnostics, then our current compilation pipeline proceeds as follows:
-
-1. **File discovery**: Given paths like `foo/`, locate all Python files in any specified subdirectories, taking into account our hierarchical settings system and any `exclude` options.
-
-1. **Package resolution**: Determine the "package root" for every file by traversing over its parent directories and looking for `__init__.py` files.
-
-1. **Cache initialization**: For every "package root", initialize an empty cache.
-
-1. **Analysis**: For every file, in parallel:
-
-    1. **Cache read**: If the file is cached (i.e., its modification timestamp hasn't changed since it was last analyzed), short-circuit, and return the cached diagnostics.
-
-    1. **Tokenization**: Run the lexer over the file to generate a token stream.
-
-    1. **Indexing**: Extract metadata from the token stream, such as: comment ranges, `# noqa` locations, `# isort: off` locations, "doc lines", etc.
-
-    1. **Token-based rule evaluation**: Run any lint rules that are based on the contents of the token stream (e.g., commented-out code).
-
-    1. **Filesystem-based rule evaluation**: Run any lint rules that are based on the contents of the filesystem (e.g., lack of `__init__.py` file in a package).
-
-    1. **Logical line-based rule evaluation**: Run any lint rules that are based on logical lines (e.g., stylistic rules).
-
-    1. **Parsing**: Run the parser over the token stream to produce an AST. (This consumes the token stream, so anything that relies on the token stream needs to happen before parsing.)
-
-    1. **AST-based rule evaluation**: Run any lint rules that are based on the AST. This includes the vast majority of lint rules. As part of this step, we also build the semantic model for the current file as we traverse over the AST. Some lint rules are evaluated eagerly, as we iterate over the AST, while others are evaluated in a deferred manner (e.g., unused imports, since we can't determine whether an import is unused until we've finished analyzing the entire file), after we've finished the initial traversal.
-
-    1. **Import-based rule evaluation**: Run any lint rules that are based on the module's imports (e.g., import sorting). These could, in theory, be included in the AST-based rule evaluation phase — they're just separated for simplicity.
-
-    1. **Physical line-based rule evaluation**: Run any lint rules that are based on physical lines (e.g., line-length).
-
-    1. **Suppression enforcement**: Remove any violations that are suppressed via `# noqa` directives or `per-file-ignores`.
-
-    1. **Cache write**: Write the generated diagnostics to the package cache using the file as a key.
-
-1. **Reporting**: Print diagnostics in the specified format (text, JSON, etc.), to the specified output channel (stdout, a file, etc.).
-
-### Import Categorization
-
-To understand Ruff's import categorization system, we first need to define two concepts:
-
-- "Project root": The directory containing the `pyproject.toml`, `ruff.toml`, or `.ruff.toml` file,
-    discovered by identifying the "closest" such directory for each Python file. (If you're running
-    via `ruff --config /path/to/pyproject.toml`, then the current working directory is used as the
-    "project root".)
-- "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 in a subtree
-    marked as a [namespace package](https://docs.astral.sh/ruff/settings/#namespace-packages)); take the directory
-    just before that, i.e., the first directory in the package.
-
-For example, given:
-
-```text
-my_project
-├── pyproject.toml
-└── src
-    └── foo
-        ├── __init__.py
-        └── bar
-            ├── __init__.py
-            └── baz.py
-```
-
-Then when analyzing `baz.py`, the project root would be the top-level directory (`./my_project`),
-and the package root would be `./my_project/src/foo`.
-
-#### Project root
-
-The project root does not have a significant impact beyond that all relative paths within the loaded
-configuration file are resolved relative to the project root.
-
-For example, to indicate that `bar` above is a namespace package (it isn't, but let's run with it),
-the `pyproject.toml` would list `namespace-packages = ["./src/bar"]`, which would resolve
-to `my_project/src/bar`.
-
-The same logic applies when providing a configuration file via `--config`. In that case, the
-_current working directory_ is used as the project root, and so all paths in that configuration file
-are resolved relative to the current working directory. (As a general rule, we want to avoid relying
-on the current working directory as much as possible, to ensure that Ruff exhibits the same behavior
-regardless of where and how you invoke it — but that's hard to avoid in this case.)
-
-Additionally, if a `pyproject.toml` file _extends_ another configuration file, Ruff will still use
-the directory containing that `pyproject.toml` file as the project root. For example, if
-`./my_project/pyproject.toml` contains:
-
-```toml
-[tool.ruff]
-extend = "/path/to/pyproject.toml"
-```
-
-Then Ruff will use `./my_project` as the project root, even though the configuration file extends
-`/path/to/pyproject.toml`. As such, if the configuration file at `/path/to/pyproject.toml` contains
-any relative paths, they will be resolved relative to `./my_project`.
-
-If a project uses nested configuration files, then Ruff would detect multiple project roots, one for
-each configuration file.
-
-#### Package root
-
-The package root is used to determine a file's "module path". Consider, again, `baz.py`. In that
-case, `./my_project/src/foo` was identified as the package root, so the module path for `baz.py`
-would resolve to  `foo.bar.baz` — as computed by taking the relative path from the package root
-(inclusive of the root itself). The module path can be thought of as "the path you would use to
-import the module" (e.g., `import foo.bar.baz`).
-
-The package root and module path are used to, e.g., convert relative to absolute imports, and for
-import categorization, as described below.
-
-#### Import categorization
-
-When sorting and formatting import blocks, Ruff categorizes every import into one of five
-categories:
-
-1. **"Future"**: the import is a `__future__` import. That's easy: just look at the name of the
-    imported module!
-1. **"Standard library"**: the import comes from the Python standard library (e.g., `import os`).
-    This is easy too: we include a list of all known standard library modules in Ruff itself, so it's
-    a simple lookup.
-1. **"Local folder"**: the import is a relative import (e.g., `from .foo import bar`). This is easy
-    too: just check if the import includes a `level` (i.e., a dot-prefix).
-1. **"First party"**: the import is part of the current project. (More on this below.)
-1. **"Third party"**: everything else.
-
-The real challenge lies in determining whether an import is first-party — everything else is either
-trivial, or (as in the case of third-party) merely defined as "not first-party".
-
-There are three ways in which an import can be categorized as "first-party":
-
-1. **Explicit settings**: the import is marked as such via the `known-first-party` setting. (This
-    should generally be seen as an escape hatch.)
-1. **Same-package**: the imported module is in the same package as the current file. This gets back
-    to the importance of the "package root" and the file's "module path". Imagine that we're
-    analyzing `baz.py` above. If `baz.py` contains any imports that appear to come from the `foo`
-    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
-    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
-    file `foo.py`.
-
-By default, `src` is set to the project root. In the above example, we'd want to set
-`src = ["./src"]` to ensure that we locate `./my_project/src/foo` and thus categorize `import foo`
-as first-party in `baz.py`. In practice, for this limited example, setting `src = ["./src"]` is
-unnecessary, as all imports within `./my_project/src/foo` would be categorized as first-party via
-the same-package heuristic; but if your project contains multiple packages, you'll want to set `src`
-explicitly.
+[nightly]: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust

Cargo.toml

@@ -1,174 +1,91 @@
 [workspace]
-members = ["crates/*"]
-resolver = "2"
+members = [
+  "flake8_to_ruff",
+  "ruff_dev",
+  "ruff_cli",
+]
+default-members = [".", "ruff_cli"]
 
-[workspace.package]
-edition = "2021"
-rust-version = "1.71"
-homepage = "https://docs.astral.sh/ruff"
-documentation = "https://docs.astral.sh/ruff"
-repository = "https://github.com/astral-sh/ruff"
+[package]
+name = "ruff"
+version = "0.0.231"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
+edition = "2021"
+rust-version = "1.65.0"
+documentation = "https://github.com/charliermarsh/ruff"
+homepage = "https://github.com/charliermarsh/ruff"
+repository = "https://github.com/charliermarsh/ruff"
+readme = "README.md"
 license = "MIT"
 
-[workspace.dependencies]
-aho-corasick = { version = "1.1.3" }
-annotate-snippets = { version = "0.9.2", features = ["color"] }
-anyhow = { version = "1.0.80" }
-argfile = { version = "0.2.0" }
-bincode = { version = "1.3.3" }
-bitflags = { version = "2.5.0" }
-bstr = { version = "1.9.1" }
-cachedir = { version = "0.3.1" }
-chrono = { version = "0.4.35", default-features = false, features = ["clock"] }
-clap = { version = "4.5.3", features = ["derive"] }
-clap_complete_command = { version = "0.5.1" }
-clearscreen = { version = "3.0.0" }
-codspeed-criterion-compat = { version = "2.6.0", default-features = false }
-colored = { version = "2.1.0" }
-console_error_panic_hook = { version = "0.1.7" }
-console_log = { version = "1.0.0" }
-countme = { version = "3.0.1" }
-criterion = { version = "0.5.1", default-features = false }
-crossbeam = { version = "0.8.4" }
-dashmap = { version = "5.5.3" }
-dirs = { version = "5.0.0" }
-drop_bomb = { version = "0.1.5" }
-env_logger = { version = "0.11.0" }
+[lib]
+name = "ruff"
+crate-type = ["cdylib", "rlib"]
+doctest = false
+
+[dependencies]
+anyhow = { version = "1.0.66" }
+bitflags = { version = "1.3.2" }
+cfg-if = { version = "1.0.0" }
+chrono = { version = "0.4.21", default-features = false, features = ["clock"] }
+clap = { version = "4.0.1", features = ["derive", "env"] }
+colored = { version = "2.0.0" }
+dirs = { version = "4.0.0" }
 fern = { version = "0.6.1" }
-filetime = { version = "0.2.23" }
-fs-err = { version = "2.11.0" }
-glob = { version = "0.3.1" }
-globset = { version = "0.4.14" }
-hashbrown = "0.14.3"
-hexf-parse = { version = "0.2.1" }
-ignore = { version = "0.4.22" }
-imara-diff = { version = "0.1.5" }
-imperative = { version = "1.0.4" }
-indexmap = { version = "2.2.6" }
-indicatif = { version = "0.17.8" }
-indoc = { version = "2.0.4" }
-insta = { version = "1.35.1", feature = ["filters", "glob"] }
-insta-cmd = { version = "0.6.0" }
-is-macro = { version = "0.3.5" }
-is-wsl = { version = "0.4.0" }
-itertools = { version = "0.12.1" }
-js-sys = { version = "0.3.69" }
-jod-thread = { version = "0.1.2" }
-lexical-parse-float = { version = "0.8.0", features = ["format"] }
-libc = { version = "0.2.153" }
-libcst = { version = "1.1.0", default-features = false }
+glob = { version = "0.3.0" }
+globset = { version = "0.4.9" }
+ignore = { version = "0.4.18" }
+imperative = { version = "1.0.3" }
+itertools = { version = "0.10.5" }
+libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
 log = { version = "0.4.17" }
-lsp-server = { version = "0.7.6" }
-lsp-types = { version = "0.95.0", features = ["proposed"] }
-matchit = { version = "0.8.1" }
-memchr = { version = "2.7.1" }
-mimalloc = { version = "0.1.39" }
 natord = { version = "1.0.9" }
-notify = { version = "6.1.1" }
-num_cpus = { version = "1.16.0" }
-once_cell = { version = "1.19.0" }
-path-absolutize = { version = "3.1.1" }
-path-slash = { version = "0.2.1" }
-pathdiff = { version = "0.2.1" }
-parking_lot = "0.12.1"
-pep440_rs = { version = "0.6.0", features = ["serde"] }
-pretty_assertions = "1.3.0"
-proc-macro2 = { version = "1.0.79" }
-pyproject-toml = { version = "0.9.0" }
-quick-junit = { version = "0.4.0" }
-quote = { version = "1.0.23" }
-rand = { version = "0.8.5" }
-rayon = { version = "1.10.0" }
-regex = { version = "1.10.2" }
-result-like = { version = "0.5.0" }
+nohash-hasher = { version = "0.2.0" }
+num-bigint = { version = "0.4.3" }
+num-traits = "0.2.15"
+once_cell = { version = "1.16.0" }
+path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] }
+regex = { version = "1.6.0" }
+ruff_macros = { version = "0.0.231", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-schemars = { version = "0.8.16" }
-seahash = { version = "4.1.0" }
-serde = { version = "1.0.197", features = ["derive"] }
-serde-wasm-bindgen = { version = "0.6.4" }
-serde_json = { version = "1.0.113" }
-serde_test = { version = "1.0.152" }
-serde_with = { version = "3.6.0", default-features = false, features = ["macros"] }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+schemars = { version = "0.8.11" }
+semver = { version = "1.0.16" }
+serde = { version = "1.0.147", features = ["derive"] }
 shellexpand = { version = "3.0.0" }
-shlex = { version = "1.3.0" }
-similar = { version = "2.4.0", features = ["inline"] }
-smallvec = { version = "1.13.2" }
-static_assertions = "1.1.0"
-strum = { version = "0.26.0", features = ["strum_macros"] }
-strum_macros = { version = "0.26.0" }
-syn = { version = "2.0.55" }
-tempfile = { version = "3.9.0" }
-test-case = { version = "3.3.1" }
-thiserror = { version = "1.0.58" }
-tikv-jemallocator = { version = "0.5.0" }
-toml = { version = "0.8.11" }
-tracing = { version = "0.1.40" }
-tracing-indicatif = { version = "0.3.6" }
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-tracing-tree = { version = "0.3.0" }
-typed-arena = { version = "2.0.2" }
-unic-ucd-category = { version = "0.9" }
-unicode-ident = { version = "1.0.12" }
-unicode-width = { version = "0.1.11" }
-unicode_names2 = { version = "1.2.2" }
-unicode-normalization = { version = "0.1.23" }
-ureq = { version = "2.9.6" }
-url = { version = "2.5.0" }
-uuid = { version = "1.6.1", features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
-walkdir = { version = "2.3.2" }
-wasm-bindgen = { version = "0.2.92" }
-wasm-bindgen-test = { version = "0.3.42" }
-wild = { version = "2" }
+smallvec = { version = "1.10.0" }
+strum = { version = "0.24.1", features = ["strum_macros"] }
+strum_macros = { version = "0.24.3" }
+textwrap = { version = "0.16.0" }
+thiserror = { version = "1.0" }
+titlecase = { version = "2.2.1" }
+toml_edit = { version = "0.17.1", features = ["easy"] }
 
-[workspace.lints.rust]
-unsafe_code = "warn"
-unreachable_pub = "warn"
+# https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support
+# For (future) wasm-pack support
+[target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies]
+getrandom = { version = "0.2.7", features = ["js"] }
+console_error_panic_hook = { version = "0.1.7" }
+console_log = { version = "0.2.0" }
+serde-wasm-bindgen = { version = "0.4" }
+js-sys = { version = "0.3.60" }
+wasm-bindgen = { version = "0.2.83" }
 
-[workspace.lints.clippy]
-pedantic = { level = "warn", priority = -2 }
-# Allowed pedantic lints
-char_lit_as_u8 = "allow"
-collapsible_else_if = "allow"
-collapsible_if = "allow"
-implicit_hasher = "allow"
-match_same_arms = "allow"
-missing_errors_doc = "allow"
-missing_panics_doc = "allow"
-module_name_repetitions = "allow"
-must_use_candidate = "allow"
-similar_names = "allow"
-too_many_lines = "allow"
-# To allow `#[allow(clippy::all)]` in `crates/ruff_python_parser/src/python.rs`.
-needless_raw_string_hashes = "allow"
-# Disallowed restriction lints
-print_stdout = "warn"
-print_stderr = "warn"
-dbg_macro = "warn"
-empty_drop = "warn"
-empty_structs_with_brackets = "warn"
-exit = "warn"
-get_unwrap = "warn"
-rc_buffer = "warn"
-rc_mutex = "warn"
-rest_pat_in_fully_bound_structs = "warn"
+[dev-dependencies]
+insta = { version = "1.19.1", features = ["yaml"] }
+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" }
 
 [profile.release]
-# Note that we set these explicitly, and these values
-# were chosen based on a trade-off between compile times
-# and runtime performance[1].
-#
-# [1]: https://github.com/astral-sh/ruff/pull/9031
+panic = "abort"
 lto = "thin"
-codegen-units = 16
-
-# Some crates don't change as much but benefit more from
-# more expensive optimization passes, so we selectively
-# decrease codegen-units in some cases.
-[profile.release.package.ruff_python_parser]
-codegen-units = 1
-[profile.release.package.ruff_python_ast]
 codegen-units = 1
+opt-level = 3
 
 [profile.dev.package.insta]
 opt-level = 3
@@ -178,11 +95,5 @@ opt-level = 3
 
 # Reduce complexity of a parser function that would trigger a locals limit in a wasm tool.
 # https://github.com/bytecodealliance/wasm-tools/blob/b5c3d98e40590512a3b12470ef358d5c7b983b15/crates/wasmparser/src/limits.rs#L29
-[profile.dev.package.ruff_python_parser]
+[profile.dev.package.rustpython-parser]
 opt-level = 1
-
-# Use the `--profile profiling` flag to show symbols in release mode.
-# e.g. `cargo build --profile profiling`
-[profile.profiling]
-inherits = "release"
-debug = 1

Dockerfile

@@ -1,38 +0,0 @@
-FROM --platform=$BUILDPLATFORM ubuntu as build
-ENV HOME="/root"
-WORKDIR $HOME
-
-RUN apt update && apt install -y build-essential curl python3-venv
-
-# Setup zig as cross compiling linker
-RUN python3 -m venv $HOME/.venv
-RUN .venv/bin/pip install cargo-zigbuild
-ENV PATH="$HOME/.venv/bin:$PATH"
-
-# Install rust
-ARG TARGETPLATFORM
-RUN case "$TARGETPLATFORM" in \
-    "linux/arm64") echo "aarch64-unknown-linux-musl" > rust_target.txt ;; \
-    "linux/amd64") echo "x86_64-unknown-linux-musl" > rust_target.txt ;; \
-    *) exit 1 ;; \
-    esac
-# Update rustup whenever we bump the rust version
-COPY rust-toolchain.toml rust-toolchain.toml
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --target $(cat rust_target.txt) --profile minimal --default-toolchain none
-ENV PATH="$HOME/.cargo/bin:$PATH"
-# Installs the correct toolchain version from rust-toolchain.toml and then the musl target
-RUN rustup target add $(cat rust_target.txt)
-
-# Build
-COPY crates crates
-COPY Cargo.toml Cargo.toml
-COPY Cargo.lock Cargo.lock
-RUN cargo zigbuild --bin ruff --target $(cat rust_target.txt) --release
-RUN cp target/$(cat rust_target.txt)/release/ruff /ruff
-# TODO: Optimize binary size, with a version that also works when cross compiling
-# RUN strip --strip-all /ruff
-
-FROM scratch
-COPY --from=build /ruff /ruff
-WORKDIR /io
-ENTRYPOINT ["/ruff"]

_typos.toml

@@ -1,19 +0,0 @@
-[files]
-# https://github.com/crate-ci/typos/issues/868
-extend-exclude = ["**/resources/**/*", "**/snapshots/**/*"]
-
-[default.extend-words]
-"arange" = "arange"  # e.g. `numpy.arange`
-hel = "hel"
-whos = "whos"
-spawnve = "spawnve"
-ned = "ned"
-pn = "pn"  # `import panel as pd` is a thing
-poit = "poit"
-BA = "BA" # acronym for "Bad Allowed", used in testing.
-
-[default]
-extend-ignore-re = [
-  # Line ignore with trailing "spellchecker:disable-line"
-  "(?Rm)^.*#\\s*spellchecker:disable-line$"
-]

assets/badge/format.json

@@ -1,8 +0,0 @@
-{
-  "label": "code style",
-  "message": "Ruff",
-  "logoSvg": "<svg width=\"510\" height=\"622\" viewBox=\"0 0 510 622\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M206.701 0C200.964 0 196.314 4.64131 196.314 10.3667V41.4667C196.314 47.192 191.663 51.8333 185.927 51.8333H156.843C151.107 51.8333 146.456 56.4746 146.456 62.2V145.133C146.456 150.859 141.806 155.5 136.069 155.5H106.986C101.249 155.5 96.5988 160.141 96.5988 165.867V222.883C96.5988 228.609 91.9484 233.25 86.2118 233.25H57.1283C51.3917 233.25 46.7413 237.891 46.7413 243.617V300.633C46.7413 306.359 42.0909 311 36.3544 311H10.387C4.6504 311 0 315.641 0 321.367V352.467C0 358.192 4.6504 362.833 10.387 362.833H145.418C151.154 362.833 155.804 367.475 155.804 373.2V430.217C155.804 435.942 151.154 440.583 145.418 440.583H116.334C110.597 440.583 105.947 445.225 105.947 450.95V507.967C105.947 513.692 101.297 518.333 95.5601 518.333H66.4766C60.74 518.333 56.0896 522.975 56.0896 528.7V611.633C56.0896 617.359 60.74 622 66.4766 622H149.572C155.309 622 159.959 617.359 159.959 611.633V570.167H201.507C207.244 570.167 211.894 565.525 211.894 559.8V528.7C211.894 522.975 216.544 518.333 222.281 518.333H251.365C257.101 518.333 261.752 513.692 261.752 507.967V476.867C261.752 471.141 266.402 466.5 272.138 466.5H301.222C306.959 466.5 311.609 461.859 311.609 456.133V425.033C311.609 419.308 316.259 414.667 321.996 414.667H351.079C356.816 414.667 361.466 410.025 361.466 404.3V373.2C361.466 367.475 366.117 362.833 371.853 362.833H400.937C406.673 362.833 411.324 358.192 411.324 352.467V321.367C411.324 315.641 415.974 311 421.711 311H450.794C456.531 311 461.181 306.359 461.181 300.633V217.7C461.181 211.975 456.531 207.333 450.794 207.333H420.672C414.936 207.333 410.285 202.692 410.285 196.967V165.867C410.285 160.141 414.936 155.5 420.672 155.5H449.756C455.492 155.5 460.143 150.859 460.143 145.133V114.033C460.143 108.308 464.793 103.667 470.53 103.667H499.613C505.35 103.667 510 99.0253 510 93.3V10.3667C510 4.64132 505.35 0 499.613 0H206.701ZM168.269 440.583C162.532 440.583 157.882 445.225 157.882 450.95V507.967C157.882 513.692 153.231 518.333 147.495 518.333H118.411C112.675 518.333 108.024 522.975 108.024 528.7V559.8C108.024 565.525 112.675 570.167 118.411 570.167H159.959V528.7C159.959 522.975 164.61 518.333 170.346 518.333H199.43C205.166 518.333 209.817 513.692 209.817 507.967V476.867C209.817 471.141 214.467 466.5 220.204 466.5H249.287C255.024 466.5 259.674 461.859 259.674 456.133V425.033C259.674 419.308 264.325 414.667 270.061 414.667H299.145C304.881 414.667 309.532 410.025 309.532 404.3V373.2C309.532 367.475 314.182 362.833 319.919 362.833H349.002C354.739 362.833 359.389 358.192 359.389 352.467V321.367C359.389 315.641 364.039 311 369.776 311H398.859C404.596 311 409.246 306.359 409.246 300.633V269.533C409.246 263.808 404.596 259.167 398.859 259.167H318.88C313.143 259.167 308.493 254.525 308.493 248.8V217.7C308.493 211.975 313.143 207.333 318.88 207.333H347.963C353.7 207.333 358.35 202.692 358.35 196.967V165.867C358.35 160.141 363.001 155.5 368.737 155.5H397.821C403.557 155.5 408.208 150.859 408.208 145.133V114.033C408.208 108.308 412.858 103.667 418.595 103.667H447.678C453.415 103.667 458.065 99.0253 458.065 93.3V62.2C458.065 56.4746 453.415 51.8333 447.678 51.8333H208.778C203.041 51.8333 198.391 56.4746 198.391 62.2V145.133C198.391 150.859 193.741 155.5 188.004 155.5H158.921C153.184 155.5 148.534 160.141 148.534 165.867V222.883C148.534 228.609 143.883 233.25 138.147 233.25H109.063C103.327 233.25 98.6762 237.891 98.6762 243.617V300.633C98.6762 306.359 103.327 311 109.063 311H197.352C203.089 311 207.739 315.641 207.739 321.367V430.217C207.739 435.942 203.089 440.583 197.352 440.583H168.269Z\" fill=\"#D7FF64\"/></svg>",
-  "logoWidth": 10,
-  "labelColor": "grey",
-  "color": "#261230"
-}

assets/badge/v2.json

@@ -1,8 +0,0 @@
-{
-  "label": "",
-  "message": "Ruff",
-  "logoSvg": "<svg width=\"510\" height=\"622\" viewBox=\"0 0 510 622\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M206.701 0C200.964 0 196.314 4.64131 196.314 10.3667V41.4667C196.314 47.192 191.663 51.8333 185.927 51.8333H156.843C151.107 51.8333 146.456 56.4746 146.456 62.2V145.133C146.456 150.859 141.806 155.5 136.069 155.5H106.986C101.249 155.5 96.5988 160.141 96.5988 165.867V222.883C96.5988 228.609 91.9484 233.25 86.2118 233.25H57.1283C51.3917 233.25 46.7413 237.891 46.7413 243.617V300.633C46.7413 306.359 42.0909 311 36.3544 311H10.387C4.6504 311 0 315.641 0 321.367V352.467C0 358.192 4.6504 362.833 10.387 362.833H145.418C151.154 362.833 155.804 367.475 155.804 373.2V430.217C155.804 435.942 151.154 440.583 145.418 440.583H116.334C110.597 440.583 105.947 445.225 105.947 450.95V507.967C105.947 513.692 101.297 518.333 95.5601 518.333H66.4766C60.74 518.333 56.0896 522.975 56.0896 528.7V611.633C56.0896 617.359 60.74 622 66.4766 622H149.572C155.309 622 159.959 617.359 159.959 611.633V570.167H201.507C207.244 570.167 211.894 565.525 211.894 559.8V528.7C211.894 522.975 216.544 518.333 222.281 518.333H251.365C257.101 518.333 261.752 513.692 261.752 507.967V476.867C261.752 471.141 266.402 466.5 272.138 466.5H301.222C306.959 466.5 311.609 461.859 311.609 456.133V425.033C311.609 419.308 316.259 414.667 321.996 414.667H351.079C356.816 414.667 361.466 410.025 361.466 404.3V373.2C361.466 367.475 366.117 362.833 371.853 362.833H400.937C406.673 362.833 411.324 358.192 411.324 352.467V321.367C411.324 315.641 415.974 311 421.711 311H450.794C456.531 311 461.181 306.359 461.181 300.633V217.7C461.181 211.975 456.531 207.333 450.794 207.333H420.672C414.936 207.333 410.285 202.692 410.285 196.967V165.867C410.285 160.141 414.936 155.5 420.672 155.5H449.756C455.492 155.5 460.143 150.859 460.143 145.133V114.033C460.143 108.308 464.793 103.667 470.53 103.667H499.613C505.35 103.667 510 99.0253 510 93.3V10.3667C510 4.64132 505.35 0 499.613 0H206.701ZM168.269 440.583C162.532 440.583 157.882 445.225 157.882 450.95V507.967C157.882 513.692 153.231 518.333 147.495 518.333H118.411C112.675 518.333 108.024 522.975 108.024 528.7V559.8C108.024 565.525 112.675 570.167 118.411 570.167H159.959V528.7C159.959 522.975 164.61 518.333 170.346 518.333H199.43C205.166 518.333 209.817 513.692 209.817 507.967V476.867C209.817 471.141 214.467 466.5 220.204 466.5H249.287C255.024 466.5 259.674 461.859 259.674 456.133V425.033C259.674 419.308 264.325 414.667 270.061 414.667H299.145C304.881 414.667 309.532 410.025 309.532 404.3V373.2C309.532 367.475 314.182 362.833 319.919 362.833H349.002C354.739 362.833 359.389 358.192 359.389 352.467V321.367C359.389 315.641 364.039 311 369.776 311H398.859C404.596 311 409.246 306.359 409.246 300.633V269.533C409.246 263.808 404.596 259.167 398.859 259.167H318.88C313.143 259.167 308.493 254.525 308.493 248.8V217.7C308.493 211.975 313.143 207.333 318.88 207.333H347.963C353.7 207.333 358.35 202.692 358.35 196.967V165.867C358.35 160.141 363.001 155.5 368.737 155.5H397.821C403.557 155.5 408.208 150.859 408.208 145.133V114.033C408.208 108.308 412.858 103.667 418.595 103.667H447.678C453.415 103.667 458.065 99.0253 458.065 93.3V62.2C458.065 56.4746 453.415 51.8333 447.678 51.8333H208.778C203.041 51.8333 198.391 56.4746 198.391 62.2V145.133C198.391 150.859 193.741 155.5 188.004 155.5H158.921C153.184 155.5 148.534 160.141 148.534 165.867V222.883C148.534 228.609 143.883 233.25 138.147 233.25H109.063C103.327 233.25 98.6762 237.891 98.6762 243.617V300.633C98.6762 306.359 103.327 311 109.063 311H197.352C203.089 311 207.739 315.641 207.739 321.367V430.217C207.739 435.942 203.089 440.583 197.352 440.583H168.269Z\" fill=\"#D7FF64\"/></svg>",
-  "logoWidth": 10,
-  "labelColor": "grey",
-  "color": "#261230"
-}

assets/svg/Astral.svg

@@ -1,24 +0,0 @@
-<svg width="139" height="24" viewBox="0 0 139 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <rect width="138.764" height="24" rx="2.18182" fill="#261230"/>
-  <path
-    d="M8.72798 15.2726H9.91316V11.8697L9.6887 10.4062L9.8952 10.3343L12.1309 15.1649L14.3486 10.3343L14.5461 10.4062L14.3486 11.8607V15.2726H15.5248V8.72714H13.9535L12.2117 12.7137H12.0142L10.2723 8.72714H8.72798V15.2726Z"
-    fill="#D7FF64"/>
-  <path
-    d="M22.3432 15.2726H23.6631L21.3017 8.72714H19.7574L17.4589 15.2726H18.7069L19.1558 13.9797H21.9033L22.3432 15.2726ZM19.497 13.0279L19.901 11.8607L20.4308 10.0021H20.6463L21.176 11.8607L21.5711 13.0279H19.497Z"
-    fill="#D7FF64"/>
-  <path
-    d="M25.4209 15.2726H28.1234C30.1077 15.2726 30.9876 14.1413 30.9876 12.0044C30.9876 9.92131 30.1706 8.72714 28.1234 8.72714H25.4209V15.2726ZM26.624 14.2131V9.77765H28.0965C29.147 9.77765 29.7306 10.1907 29.7306 11.4477V12.5521C29.7306 13.6923 29.2817 14.2131 28.0965 14.2131H26.624Z"
-    fill="#D7FF64"/>
-  <path
-    d="M33.079 15.2726H37.6491V14.2131H34.2822V12.3815H37.2002V11.3938H34.2822V9.77765H37.6491V8.72714H33.079V15.2726Z"
-    fill="#D7FF64"/>
-  <path
-    d="M42.923 15.2726H46.2451C47.4572 15.2726 48.2025 14.5812 48.2025 13.5487C48.2025 12.7675 47.8343 12.175 47.0532 11.9954V11.7799C47.6637 11.5734 48.0319 11.0436 48.0319 10.3433C48.0319 9.38259 47.4572 8.72714 46.281 8.72714H42.923V15.2726ZM44.0992 11.4746V9.65195H45.9578C46.4875 9.65195 46.7928 9.92131 46.7928 10.3523V10.7653C46.7928 11.1873 46.4965 11.4746 45.9758 11.4746H44.0992ZM44.0992 14.3388V12.3904H46.0296C46.5863 12.3904 46.9365 12.6418 46.9365 13.1806V13.5666C46.9365 14.0425 46.5684 14.3388 45.9309 14.3388H44.0992Z"
-    fill="#D7FF64"/>
-  <path
-    d="M49.6959 8.72714L52.174 12.579V14.1952H50.1898V15.2726H53.3772V12.579L55.8553 8.72714H54.4456L53.5119 10.2535L52.8744 11.3759H52.6679L52.0483 10.2715L51.1056 8.72714H49.6959Z"
-    fill="#D7FF64"/>
-  <path fill-rule="evenodd" clip-rule="evenodd"
-    d="M74.1824 7.63626C74.1824 7.03377 74.6708 6.54535 75.2733 6.54535H84.0006C84.6031 6.54535 85.0915 7.03377 85.0915 7.63626V9.81808H80.0733V8.94535H79.2006V10.6908H84.0006C84.6031 10.6908 85.0915 11.1792 85.0915 11.7817V16.3635C85.0915 16.966 84.6031 17.4544 84.0006 17.4544H75.2733C74.6708 17.4544 74.1824 16.966 74.1824 16.3635V14.1817L79.2006 14.1817V15.0544H80.0733V13.309L75.2733 13.309C74.6708 13.309 74.1824 12.8206 74.1824 12.2181V7.63626ZM63.4912 6.54545C62.8887 6.54545 62.4003 7.03387 62.4003 7.63636V17.4545H67.4185V14.1818H68.2912V17.4545H73.3094V7.63636C73.3094 7.03387 72.821 6.54545 72.2185 6.54545H63.4912ZM69.164 10.6909V11.5636H66.5458V10.6909H69.164ZM110.619 6.54545C110.016 6.54545 109.528 7.03387 109.528 7.63636V17.4545H114.546V14.1818H115.419V17.4545H120.437V7.63636C120.437 7.03387 119.948 6.54545 119.346 6.54545H110.619ZM116.291 10.6909V11.5636H113.673V10.6909H116.291ZM91.8549 8.29091H96.8731V11.3455C96.8731 11.9479 96.3847 12.4364 95.7822 12.4364H91.8549V13.3091H96.8731V17.4545H87.9276C87.3251 17.4545 86.8367 16.9661 86.8367 16.3636V12.4364H85.964V8.29091H86.8367V6.54545H91.8549V8.29091ZM108.655 7.63636C108.655 7.03387 108.166 6.54545 107.564 6.54545H97.7458V17.4545H102.764V14.1818H103.637V17.4545H108.655V13.3091H106.473V12.4364H107.564C108.166 12.4364 108.655 11.9479 108.655 11.3455V7.63636ZM104.509 10.6909V11.5636H101.891V10.6909H104.509ZM132.218 13.3091L126.327 13.3091V6.54547L121.309 6.54547V17.4546H132.218V13.3091Z"
-    fill="#D7FF64"/>
-</svg>

clippy.toml

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

crates/red_knot/Cargo.toml

@@ -1,47 +0,0 @@
-[package]
-name = "red_knot"
-version = "0.1.0"
-edition.workspace = true
-rust-version.workspace = true
-homepage.workspace = true
-documentation.workspace = true
-repository.workspace = true
-authors.workspace = true
-license.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-ruff_formatter = { path = "../ruff_formatter" }
-ruff_index = { path = "../ruff_index" }
-ruff_notebook = { path = "../ruff_notebook" }
-ruff_python_ast = { path = "../ruff_python_ast" }
-ruff_python_formatter = { path = "../ruff_python_formatter" }
-ruff_python_parser = { path = "../ruff_python_parser" }
-ruff_python_trivia = { path = "../ruff_python_trivia" }
-ruff_text_size = { path = "../ruff_text_size" }
-
-anyhow = { workspace = true }
-bitflags = { workspace = true }
-ctrlc = "3.4.4"
-crossbeam = { workspace = true }
-dashmap = { workspace = true }
-hashbrown = { workspace = true }
-indexmap = { workspace = true }
-log = { workspace = true }
-notify = { workspace = true }
-parking_lot = { workspace = true }
-rayon = { workspace = true }
-rustc-hash = { workspace = true }
-smallvec = { workspace = true }
-smol_str = "0.2.1"
-tracing = { workspace = true }
-tracing-subscriber = { workspace = true }
-tracing-tree = { workspace = true }
-
-[dev-dependencies]
-textwrap = "0.16.1"
-tempfile = { workspace = true }
-
-[lints]
-workspace = true

crates/red_knot/src/ast_ids.rs

@@ -1,415 +0,0 @@
-use std::any::type_name;
-use std::fmt::{Debug, Formatter};
-use std::hash::{Hash, Hasher};
-use std::marker::PhantomData;
-
-use rustc_hash::FxHashMap;
-
-use ruff_index::{Idx, IndexVec};
-use ruff_python_ast::visitor::preorder;
-use ruff_python_ast::visitor::preorder::{PreorderVisitor, TraversalSignal};
-use ruff_python_ast::{
-    AnyNodeRef, AstNode, ExceptHandler, ExceptHandlerExceptHandler, Expr, MatchCase, ModModule,
-    NodeKind, Parameter, Stmt, StmtAnnAssign, StmtAssign, StmtAugAssign, StmtClassDef,
-    StmtFunctionDef, StmtGlobal, StmtImport, StmtImportFrom, StmtNonlocal, StmtTypeAlias,
-    TypeParam, TypeParamParamSpec, TypeParamTypeVar, TypeParamTypeVarTuple, WithItem,
-};
-use ruff_text_size::{Ranged, TextRange};
-
-/// A type agnostic ID that uniquely identifies an AST node in a file.
-#[ruff_index::newtype_index]
-pub struct AstId;
-
-/// A typed ID that uniquely identifies an AST node in a file.
-///
-/// This is different from [`AstId`] in that it is a combination of ID and the type of the node the ID identifies.
-/// Typing the ID prevents mixing IDs of different node types and allows to restrict the API to only accept
-/// nodes for which an ID has been created (not all AST nodes get an ID).
-pub struct TypedAstId<N: HasAstId> {
-    erased: AstId,
-    _marker: PhantomData<fn() -> N>,
-}
-
-impl<N: HasAstId> TypedAstId<N> {
-    /// Upcasts this ID from a more specific node type to a more general node type.
-    pub fn upcast<M: HasAstId>(self) -> TypedAstId<M>
-    where
-        N: Into<M>,
-    {
-        TypedAstId {
-            erased: self.erased,
-            _marker: PhantomData,
-        }
-    }
-}
-
-impl<N: HasAstId> Copy for TypedAstId<N> {}
-impl<N: HasAstId> Clone for TypedAstId<N> {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-
-impl<N: HasAstId> PartialEq for TypedAstId<N> {
-    fn eq(&self, other: &Self) -> bool {
-        self.erased == other.erased
-    }
-}
-
-impl<N: HasAstId> Eq for TypedAstId<N> {}
-impl<N: HasAstId> Hash for TypedAstId<N> {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.erased.hash(state);
-    }
-}
-
-impl<N: HasAstId> Debug for TypedAstId<N> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.debug_tuple("TypedAstId")
-            .field(&self.erased)
-            .field(&type_name::<N>())
-            .finish()
-    }
-}
-
-pub struct AstIds {
-    ids: IndexVec<AstId, NodeKey>,
-    reverse: FxHashMap<NodeKey, AstId>,
-}
-
-impl AstIds {
-    // TODO rust analyzer doesn't allocate an ID for every node. It only allocates ids for
-    //  nodes with a corresponding HIR element, that is nodes that are definitions.
-    pub fn from_module(module: &ModModule) -> Self {
-        let mut visitor = AstIdsVisitor::default();
-
-        // TODO: visit_module?
-        // Make sure we visit the root
-        visitor.create_id(module);
-        visitor.visit_body(&module.body);
-
-        while let Some(deferred) = visitor.deferred.pop() {
-            match deferred {
-                DeferredNode::FunctionDefinition(def) => {
-                    def.visit_preorder(&mut visitor);
-                }
-                DeferredNode::ClassDefinition(def) => def.visit_preorder(&mut visitor),
-            }
-        }
-
-        AstIds {
-            ids: visitor.ids,
-            reverse: visitor.reverse,
-        }
-    }
-
-    /// Returns the ID to the root node.
-    pub fn root(&self) -> NodeKey {
-        self.ids[AstId::new(0)]
-    }
-
-    /// Returns the [`TypedAstId`] for a node.
-    pub fn ast_id<N: HasAstId>(&self, node: &N) -> TypedAstId<N> {
-        let key = node.syntax_node_key();
-        TypedAstId {
-            erased: self.reverse.get(&key).copied().unwrap(),
-            _marker: PhantomData,
-        }
-    }
-
-    /// Returns the [`TypedAstId`] for the node identified with the given [`TypedNodeKey`].
-    pub fn ast_id_for_key<N: HasAstId>(&self, node: &TypedNodeKey<N>) -> TypedAstId<N> {
-        let ast_id = self.ast_id_for_node_key(node.inner);
-
-        TypedAstId {
-            erased: ast_id,
-            _marker: PhantomData,
-        }
-    }
-
-    /// Returns the untyped [`AstId`] for the node identified by the given `node` key.
-    pub fn ast_id_for_node_key(&self, node: NodeKey) -> AstId {
-        self.reverse
-            .get(&node)
-            .copied()
-            .expect("Can't find node in AstIds map.")
-    }
-
-    /// Returns the [`TypedNodeKey`] for the node identified by the given [`TypedAstId`].
-    pub fn key<N: HasAstId>(&self, id: TypedAstId<N>) -> TypedNodeKey<N> {
-        let syntax_key = self.ids[id.erased];
-
-        TypedNodeKey::new(syntax_key).unwrap()
-    }
-
-    pub fn node_key<H: HasAstId>(&self, id: TypedAstId<H>) -> NodeKey {
-        self.ids[id.erased]
-    }
-}
-
-impl std::fmt::Debug for AstIds {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let mut map = f.debug_map();
-        for (key, value) in self.ids.iter_enumerated() {
-            map.entry(&key, &value);
-        }
-
-        map.finish()
-    }
-}
-
-impl PartialEq for AstIds {
-    fn eq(&self, other: &Self) -> bool {
-        self.ids == other.ids
-    }
-}
-
-impl Eq for AstIds {}
-
-#[derive(Default)]
-struct AstIdsVisitor<'a> {
-    ids: IndexVec<AstId, NodeKey>,
-    reverse: FxHashMap<NodeKey, AstId>,
-    deferred: Vec<DeferredNode<'a>>,
-}
-
-impl<'a> AstIdsVisitor<'a> {
-    fn create_id<A: HasAstId>(&mut self, node: &A) {
-        let node_key = node.syntax_node_key();
-
-        let id = self.ids.push(node_key);
-        self.reverse.insert(node_key, id);
-    }
-}
-
-impl<'a> PreorderVisitor<'a> for AstIdsVisitor<'a> {
-    fn visit_stmt(&mut self, stmt: &'a Stmt) {
-        match stmt {
-            Stmt::FunctionDef(def) => {
-                self.create_id(def);
-                self.deferred.push(DeferredNode::FunctionDefinition(def));
-                return;
-            }
-            // TODO defer visiting the assignment body, type alias parameters etc?
-            Stmt::ClassDef(def) => {
-                self.create_id(def);
-                self.deferred.push(DeferredNode::ClassDefinition(def));
-                return;
-            }
-            Stmt::Expr(_) => {
-                // Skip
-                return;
-            }
-            Stmt::Return(_) => {}
-            Stmt::Delete(_) => {}
-            Stmt::Assign(assignment) => self.create_id(assignment),
-            Stmt::AugAssign(assignment) => {
-                self.create_id(assignment);
-            }
-            Stmt::AnnAssign(assignment) => self.create_id(assignment),
-            Stmt::TypeAlias(assignment) => self.create_id(assignment),
-            Stmt::For(_) => {}
-            Stmt::While(_) => {}
-            Stmt::If(_) => {}
-            Stmt::With(_) => {}
-            Stmt::Match(_) => {}
-            Stmt::Raise(_) => {}
-            Stmt::Try(_) => {}
-            Stmt::Assert(_) => {}
-            Stmt::Import(import) => self.create_id(import),
-            Stmt::ImportFrom(import_from) => self.create_id(import_from),
-            Stmt::Global(global) => self.create_id(global),
-            Stmt::Nonlocal(non_local) => self.create_id(non_local),
-            Stmt::Pass(_) => {}
-            Stmt::Break(_) => {}
-            Stmt::Continue(_) => {}
-            Stmt::IpyEscapeCommand(_) => {}
-        }
-
-        preorder::walk_stmt(self, stmt);
-    }
-
-    fn visit_expr(&mut self, _expr: &'a Expr) {}
-
-    fn visit_parameter(&mut self, parameter: &'a Parameter) {
-        self.create_id(parameter);
-        preorder::walk_parameter(self, parameter);
-    }
-
-    fn visit_except_handler(&mut self, except_handler: &'a ExceptHandler) {
-        match except_handler {
-            ExceptHandler::ExceptHandler(except_handler) => {
-                self.create_id(except_handler);
-            }
-        }
-
-        preorder::walk_except_handler(self, except_handler);
-    }
-
-    fn visit_with_item(&mut self, with_item: &'a WithItem) {
-        self.create_id(with_item);
-        preorder::walk_with_item(self, with_item);
-    }
-
-    fn visit_match_case(&mut self, match_case: &'a MatchCase) {
-        self.create_id(match_case);
-        preorder::walk_match_case(self, match_case);
-    }
-
-    fn visit_type_param(&mut self, type_param: &'a TypeParam) {
-        self.create_id(type_param);
-    }
-}
-
-enum DeferredNode<'a> {
-    FunctionDefinition(&'a StmtFunctionDef),
-    ClassDefinition(&'a StmtClassDef),
-}
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
-pub struct TypedNodeKey<N: AstNode> {
-    /// The type erased node key.
-    inner: NodeKey,
-    _marker: PhantomData<fn() -> N>,
-}
-
-impl<N: AstNode> TypedNodeKey<N> {
-    pub fn from_node(node: &N) -> Self {
-        let inner = NodeKey {
-            kind: node.as_any_node_ref().kind(),
-            range: node.range(),
-        };
-        Self {
-            inner,
-            _marker: PhantomData,
-        }
-    }
-
-    pub fn new(node_key: NodeKey) -> Option<Self> {
-        N::can_cast(node_key.kind).then_some(TypedNodeKey {
-            inner: node_key,
-            _marker: PhantomData,
-        })
-    }
-
-    pub fn resolve<'a>(&self, root: AnyNodeRef<'a>) -> Option<N::Ref<'a>> {
-        let node_ref = self.inner.resolve(root)?;
-
-        Some(N::cast_ref(node_ref).unwrap())
-    }
-
-    pub fn resolve_unwrap<'a>(&self, root: AnyNodeRef<'a>) -> N::Ref<'a> {
-        self.resolve(root).expect("node should resolve")
-    }
-
-    pub fn erased(&self) -> &NodeKey {
-        &self.inner
-    }
-}
-
-struct FindNodeKeyVisitor<'a> {
-    key: NodeKey,
-    result: Option<AnyNodeRef<'a>>,
-}
-
-impl<'a> PreorderVisitor<'a> for FindNodeKeyVisitor<'a> {
-    fn enter_node(&mut self, node: AnyNodeRef<'a>) -> TraversalSignal {
-        if self.result.is_some() {
-            return TraversalSignal::Skip;
-        }
-
-        if node.range() == self.key.range && node.kind() == self.key.kind {
-            self.result = Some(node);
-            TraversalSignal::Skip
-        } else if node.range().contains_range(self.key.range) {
-            TraversalSignal::Traverse
-        } else {
-            TraversalSignal::Skip
-        }
-    }
-
-    fn visit_body(&mut self, body: &'a [Stmt]) {
-        // TODO it would be more efficient to use binary search instead of linear
-        for stmt in body {
-            if stmt.range().start() > self.key.range.end() {
-                break;
-            }
-
-            self.visit_stmt(stmt);
-        }
-    }
-}
-
-// TODO an alternative to this is to have a `NodeId` on each node (in increasing order depending on the position).
-//  This would allow to reduce the size of this to a u32.
-//  What would be nice if we could use an `Arc::weak_ref` here but that only works if we use
-//   `Arc` internally
-// TODO: Implement the logic to resolve a node, given a db (and the correct file).
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
-pub struct NodeKey {
-    kind: NodeKind,
-    range: TextRange,
-}
-
-impl NodeKey {
-    pub fn resolve<'a>(&self, root: AnyNodeRef<'a>) -> Option<AnyNodeRef<'a>> {
-        // We need to do a binary search here. Only traverse into a node if the range is withint the node
-        let mut visitor = FindNodeKeyVisitor {
-            key: *self,
-            result: None,
-        };
-
-        if visitor.enter_node(root) == TraversalSignal::Traverse {
-            root.visit_preorder(&mut visitor);
-        }
-
-        visitor.result
-    }
-}
-
-/// Marker trait implemented by AST nodes for which we extract the `AstId`.
-pub trait HasAstId: AstNode {
-    fn node_key(&self) -> TypedNodeKey<Self>
-    where
-        Self: Sized,
-    {
-        TypedNodeKey {
-            inner: self.syntax_node_key(),
-            _marker: PhantomData,
-        }
-    }
-
-    fn syntax_node_key(&self) -> NodeKey {
-        NodeKey {
-            kind: self.as_any_node_ref().kind(),
-            range: self.range(),
-        }
-    }
-}
-
-impl HasAstId for StmtFunctionDef {}
-impl HasAstId for StmtClassDef {}
-impl HasAstId for StmtAnnAssign {}
-impl HasAstId for StmtAugAssign {}
-impl HasAstId for StmtAssign {}
-impl HasAstId for StmtTypeAlias {}
-
-impl HasAstId for ModModule {}
-
-impl HasAstId for StmtImport {}
-
-impl HasAstId for StmtImportFrom {}
-
-impl HasAstId for Parameter {}
-
-impl HasAstId for TypeParam {}
-impl HasAstId for Stmt {}
-impl HasAstId for TypeParamTypeVar {}
-impl HasAstId for TypeParamTypeVarTuple {}
-impl HasAstId for TypeParamParamSpec {}
-impl HasAstId for StmtGlobal {}
-impl HasAstId for StmtNonlocal {}
-
-impl HasAstId for ExceptHandlerExceptHandler {}
-impl HasAstId for WithItem {}
-impl HasAstId for MatchCase {}

crates/red_knot/src/cache.rs

@@ -1,165 +0,0 @@
-use std::fmt::Formatter;
-use std::hash::Hash;
-use std::sync::atomic::{AtomicUsize, Ordering};
-
-use crate::db::QueryResult;
-use dashmap::mapref::entry::Entry;
-
-use crate::FxDashMap;
-
-/// Simple key value cache that locks on a per-key level.
-pub struct KeyValueCache<K, V> {
-    map: FxDashMap<K, V>,
-    statistics: CacheStatistics,
-}
-
-impl<K, V> KeyValueCache<K, V>
-where
-    K: Eq + Hash + Clone,
-    V: Clone,
-{
-    pub fn try_get(&self, key: &K) -> Option<V> {
-        if let Some(existing) = self.map.get(key) {
-            self.statistics.hit();
-            Some(existing.clone())
-        } else {
-            self.statistics.miss();
-            None
-        }
-    }
-
-    pub fn get<F>(&self, key: &K, compute: F) -> QueryResult<V>
-    where
-        F: FnOnce(&K) -> QueryResult<V>,
-    {
-        Ok(match self.map.entry(key.clone()) {
-            Entry::Occupied(cached) => {
-                self.statistics.hit();
-
-                cached.get().clone()
-            }
-            Entry::Vacant(vacant) => {
-                self.statistics.miss();
-
-                let value = compute(key)?;
-                vacant.insert(value.clone());
-                value
-            }
-        })
-    }
-
-    pub fn set(&mut self, key: K, value: V) {
-        self.map.insert(key, value);
-    }
-
-    pub fn remove(&mut self, key: &K) -> Option<V> {
-        self.map.remove(key).map(|(_, value)| value)
-    }
-
-    pub fn clear(&mut self) {
-        self.map.clear();
-        self.map.shrink_to_fit();
-    }
-
-    pub fn statistics(&self) -> Option<Statistics> {
-        self.statistics.to_statistics()
-    }
-}
-
-impl<K, V> Default for KeyValueCache<K, V>
-where
-    K: Eq + Hash,
-    V: Clone,
-{
-    fn default() -> Self {
-        Self {
-            map: FxDashMap::default(),
-            statistics: CacheStatistics::default(),
-        }
-    }
-}
-
-impl<K, V> std::fmt::Debug for KeyValueCache<K, V>
-where
-    K: std::fmt::Debug + Eq + Hash,
-    V: std::fmt::Debug,
-{
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let mut debug = f.debug_map();
-
-        for entry in &self.map {
-            debug.entry(&entry.value(), &entry.key());
-        }
-
-        debug.finish()
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Statistics {
-    pub hits: usize,
-    pub misses: usize,
-}
-
-impl Statistics {
-    #[allow(clippy::cast_precision_loss)]
-    pub fn hit_rate(&self) -> Option<f64> {
-        if self.hits + self.misses == 0 {
-            return None;
-        }
-
-        Some((self.hits as f64) / (self.hits + self.misses) as f64)
-    }
-}
-
-#[cfg(debug_assertions)]
-pub type CacheStatistics = DebugStatistics;
-
-#[cfg(not(debug_assertions))]
-pub type CacheStatistics = ReleaseStatistics;
-
-pub trait StatisticsRecorder {
-    fn hit(&self);
-    fn miss(&self);
-    fn to_statistics(&self) -> Option<Statistics>;
-}
-
-#[derive(Debug, Default)]
-pub struct DebugStatistics {
-    hits: AtomicUsize,
-    misses: AtomicUsize,
-}
-
-impl StatisticsRecorder for DebugStatistics {
-    // TODO figure out appropriate Ordering
-    fn hit(&self) {
-        self.hits.fetch_add(1, Ordering::SeqCst);
-    }
-
-    fn miss(&self) {
-        self.misses.fetch_add(1, Ordering::SeqCst);
-    }
-
-    fn to_statistics(&self) -> Option<Statistics> {
-        let hits = self.hits.load(Ordering::SeqCst);
-        let misses = self.misses.load(Ordering::SeqCst);
-
-        Some(Statistics { hits, misses })
-    }
-}
-
-#[derive(Debug, Default)]
-pub struct ReleaseStatistics;
-
-impl StatisticsRecorder for ReleaseStatistics {
-    #[inline]
-    fn hit(&self) {}
-
-    #[inline]
-    fn miss(&self) {}
-
-    #[inline]
-    fn to_statistics(&self) -> Option<Statistics> {
-        None
-    }
-}

crates/red_knot/src/cancellation.rs

@@ -1,42 +0,0 @@
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-#[derive(Debug, Clone, Default)]
-pub struct CancellationTokenSource {
-    signal: Arc<AtomicBool>,
-}
-
-impl CancellationTokenSource {
-    pub fn new() -> Self {
-        Self {
-            signal: Arc::new(AtomicBool::new(false)),
-        }
-    }
-
-    #[tracing::instrument(level = "trace", skip_all)]
-    pub fn cancel(&self) {
-        self.signal.store(true, std::sync::atomic::Ordering::SeqCst);
-    }
-
-    pub fn is_cancelled(&self) -> bool {
-        self.signal.load(std::sync::atomic::Ordering::SeqCst)
-    }
-
-    pub fn token(&self) -> CancellationToken {
-        CancellationToken {
-            signal: self.signal.clone(),
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct CancellationToken {
-    signal: Arc<AtomicBool>,
-}
-
-impl CancellationToken {
-    /// Returns `true` if cancellation has been requested.
-    pub fn is_cancelled(&self) -> bool {
-        self.signal.load(std::sync::atomic::Ordering::SeqCst)
-    }
-}

crates/red_knot/src/db.rs

@@ -1,296 +0,0 @@
-use std::path::Path;
-use std::sync::Arc;
-
-pub use jars::{HasJar, HasJars};
-pub use query::{QueryError, QueryResult};
-pub use runtime::DbRuntime;
-pub use storage::JarsStorage;
-
-use crate::files::FileId;
-use crate::lint::{Diagnostics, LintSemanticStorage, LintSyntaxStorage};
-use crate::module::{Module, ModuleData, ModuleName, ModuleResolver, ModuleSearchPath};
-use crate::parse::{Parsed, ParsedStorage};
-use crate::source::{Source, SourceStorage};
-use crate::symbols::{SymbolId, SymbolTable, SymbolTablesStorage};
-use crate::types::{Type, TypeStore};
-
-mod jars;
-mod query;
-mod runtime;
-mod storage;
-
-pub trait Database {
-    /// Returns a reference to the runtime of the current worker.
-    fn runtime(&self) -> &DbRuntime;
-
-    /// Returns a mutable reference to the runtime. Only one worker can hold a mutable reference to the runtime.
-    fn runtime_mut(&mut self) -> &mut DbRuntime;
-
-    /// Returns `Ok` if the queries have not been cancelled and `Err(QueryError::Cancelled)` otherwise.
-    fn cancelled(&self) -> QueryResult<()> {
-        self.runtime().cancelled()
-    }
-
-    /// Returns `true` if the queries have been cancelled.
-    fn is_cancelled(&self) -> bool {
-        self.runtime().is_cancelled()
-    }
-}
-
-/// Database that supports running queries from multiple threads.
-pub trait ParallelDatabase: Database + Send {
-    /// Creates a snapshot of the database state that can be used to query the database in another thread.
-    ///
-    /// The snapshot is a read-only view of the database but query results are shared between threads.
-    /// All queries will be automatically cancelled when applying any mutations (calling [`HasJars::jars_mut`])
-    /// to the database (not the snapshot, because they're readonly).
-    ///
-    /// ## Creating a snapshot
-    ///
-    /// Creating a snapshot of the database's jars is cheap but creating a snapshot of
-    /// other state stored on the database might require deep-cloning data. That's why you should
-    /// avoid creating snapshots in a hot function (e.g. don't create a snapshot for each file, instead
-    /// create a snapshot when scheduling the check of an entire program).
-    ///
-    /// ## Salsa compatibility
-    /// Salsa prohibits creating a snapshot while running a local query (it's fine if other workers run a query) [[source](https://github.com/salsa-rs/salsa/issues/80)].
-    /// We should avoid creating snapshots while running a query because we might want to adopt Salsa in the future (if we can figure out persistent caching).
-    /// Unfortunately, the infrastructure doesn't provide an automated way of knowing when a query is run, that's
-    /// why we have to "enforce" this constraint manually.
-    fn snapshot(&self) -> Snapshot<Self>;
-}
-
-/// Readonly snapshot of a database.
-///
-/// ## Dead locks
-/// A snapshot should always be dropped as soon as it is no longer necessary to run queries.
-/// Storing the snapshot without running a query or periodically checking if cancellation was requested
-/// can lead to deadlocks because mutating the [`Database`] requires cancels all pending queries
-/// and waiting for all [`Snapshot`]s to be dropped.
-#[derive(Debug)]
-pub struct Snapshot<DB: ?Sized>
-where
-    DB: ParallelDatabase,
-{
-    db: DB,
-}
-
-impl<DB> Snapshot<DB>
-where
-    DB: ParallelDatabase,
-{
-    pub fn new(db: DB) -> Self {
-        Snapshot { db }
-    }
-}
-
-impl<DB> std::ops::Deref for Snapshot<DB>
-where
-    DB: ParallelDatabase,
-{
-    type Target = DB;
-
-    fn deref(&self) -> &DB {
-        &self.db
-    }
-}
-
-// Red knot specific databases code.
-
-pub trait SourceDb: Database {
-    // queries
-    fn file_id(&self, path: &std::path::Path) -> FileId;
-
-    fn file_path(&self, file_id: FileId) -> Arc<std::path::Path>;
-
-    fn source(&self, file_id: FileId) -> QueryResult<Source>;
-
-    fn parse(&self, file_id: FileId) -> QueryResult<Parsed>;
-}
-
-pub trait SemanticDb: SourceDb {
-    // queries
-    fn resolve_module(&self, name: ModuleName) -> QueryResult<Option<Module>>;
-
-    fn file_to_module(&self, file_id: FileId) -> QueryResult<Option<Module>>;
-
-    fn path_to_module(&self, path: &Path) -> QueryResult<Option<Module>>;
-
-    fn symbol_table(&self, file_id: FileId) -> QueryResult<Arc<SymbolTable>>;
-
-    fn infer_symbol_type(&self, file_id: FileId, symbol_id: SymbolId) -> QueryResult<Type>;
-
-    // mutations
-
-    fn add_module(&mut self, path: &Path) -> Option<(Module, Vec<Arc<ModuleData>>)>;
-
-    fn set_module_search_paths(&mut self, paths: Vec<ModuleSearchPath>);
-}
-
-pub trait LintDb: SemanticDb {
-    fn lint_syntax(&self, file_id: FileId) -> QueryResult<Diagnostics>;
-
-    fn lint_semantic(&self, file_id: FileId) -> QueryResult<Diagnostics>;
-}
-
-pub trait Db: LintDb {}
-
-#[derive(Debug, Default)]
-pub struct SourceJar {
-    pub sources: SourceStorage,
-    pub parsed: ParsedStorage,
-}
-
-#[derive(Debug, Default)]
-pub struct SemanticJar {
-    pub module_resolver: ModuleResolver,
-    pub symbol_tables: SymbolTablesStorage,
-    pub type_store: TypeStore,
-}
-
-#[derive(Debug, Default)]
-pub struct LintJar {
-    pub lint_syntax: LintSyntaxStorage,
-    pub lint_semantic: LintSemanticStorage,
-}
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use std::path::Path;
-    use std::sync::Arc;
-
-    use crate::db::{
-        Database, DbRuntime, HasJar, HasJars, JarsStorage, LintDb, LintJar, QueryResult, SourceDb,
-        SourceJar,
-    };
-    use crate::files::{FileId, Files};
-    use crate::lint::{lint_semantic, lint_syntax, Diagnostics};
-    use crate::module::{
-        add_module, file_to_module, path_to_module, resolve_module, set_module_search_paths,
-        Module, ModuleData, ModuleName, ModuleSearchPath,
-    };
-    use crate::parse::{parse, Parsed};
-    use crate::source::{source_text, Source};
-    use crate::symbols::{symbol_table, SymbolId, SymbolTable};
-    use crate::types::{infer_symbol_type, Type};
-
-    use super::{SemanticDb, SemanticJar};
-
-    // This can be a partial database used in a single crate for testing.
-    // It would hold fewer data than the full database.
-    #[derive(Debug, Default)]
-    pub(crate) struct TestDb {
-        files: Files,
-        jars: JarsStorage<Self>,
-    }
-
-    impl HasJar<SourceJar> for TestDb {
-        fn jar(&self) -> QueryResult<&SourceJar> {
-            Ok(&self.jars()?.0)
-        }
-
-        fn jar_mut(&mut self) -> &mut SourceJar {
-            &mut self.jars_mut().0
-        }
-    }
-
-    impl HasJar<SemanticJar> for TestDb {
-        fn jar(&self) -> QueryResult<&SemanticJar> {
-            Ok(&self.jars()?.1)
-        }
-
-        fn jar_mut(&mut self) -> &mut SemanticJar {
-            &mut self.jars_mut().1
-        }
-    }
-
-    impl HasJar<LintJar> for TestDb {
-        fn jar(&self) -> QueryResult<&LintJar> {
-            Ok(&self.jars()?.2)
-        }
-
-        fn jar_mut(&mut self) -> &mut LintJar {
-            &mut self.jars_mut().2
-        }
-    }
-
-    impl SourceDb for TestDb {
-        fn file_id(&self, path: &Path) -> FileId {
-            self.files.intern(path)
-        }
-
-        fn file_path(&self, file_id: FileId) -> Arc<Path> {
-            self.files.path(file_id)
-        }
-
-        fn source(&self, file_id: FileId) -> QueryResult<Source> {
-            source_text(self, file_id)
-        }
-
-        fn parse(&self, file_id: FileId) -> QueryResult<Parsed> {
-            parse(self, file_id)
-        }
-    }
-
-    impl SemanticDb for TestDb {
-        fn resolve_module(&self, name: ModuleName) -> QueryResult<Option<Module>> {
-            resolve_module(self, name)
-        }
-
-        fn file_to_module(&self, file_id: FileId) -> QueryResult<Option<Module>> {
-            file_to_module(self, file_id)
-        }
-
-        fn path_to_module(&self, path: &Path) -> QueryResult<Option<Module>> {
-            path_to_module(self, path)
-        }
-
-        fn symbol_table(&self, file_id: FileId) -> QueryResult<Arc<SymbolTable>> {
-            symbol_table(self, file_id)
-        }
-
-        fn infer_symbol_type(&self, file_id: FileId, symbol_id: SymbolId) -> QueryResult<Type> {
-            infer_symbol_type(self, file_id, symbol_id)
-        }
-
-        fn add_module(&mut self, path: &Path) -> Option<(Module, Vec<Arc<ModuleData>>)> {
-            add_module(self, path)
-        }
-
-        fn set_module_search_paths(&mut self, paths: Vec<ModuleSearchPath>) {
-            set_module_search_paths(self, paths);
-        }
-    }
-
-    impl LintDb for TestDb {
-        fn lint_syntax(&self, file_id: FileId) -> QueryResult<Diagnostics> {
-            lint_syntax(self, file_id)
-        }
-
-        fn lint_semantic(&self, file_id: FileId) -> QueryResult<Diagnostics> {
-            lint_semantic(self, file_id)
-        }
-    }
-
-    impl HasJars for TestDb {
-        type Jars = (SourceJar, SemanticJar, LintJar);
-
-        fn jars(&self) -> QueryResult<&Self::Jars> {
-            self.jars.jars()
-        }
-
-        fn jars_mut(&mut self) -> &mut Self::Jars {
-            self.jars.jars_mut()
-        }
-    }
-
-    impl Database for TestDb {
-        fn runtime(&self) -> &DbRuntime {
-            self.jars.runtime()
-        }
-
-        fn runtime_mut(&mut self) -> &mut DbRuntime {
-            self.jars.runtime_mut()
-        }
-    }
-}

crates/red_knot/src/db/jars.rs

@@ -1,37 +0,0 @@
-use crate::db::query::QueryResult;
-
-/// Gives access to a specific jar in the database.
-///
-/// Nope, the terminology isn't borrowed from Java but from Salsa <https://salsa-rs.github.io/salsa/>,
-/// which is an analogy to storing the salsa in different jars.
-///
-/// The basic idea is that each crate can define its own jar and the jars can be combined to a single
-/// database in the top level crate. Each crate also defines its own `Database` trait. The combination of
-/// `Database` trait and the jar allows to write queries in isolation without having to know how they get composed at the upper levels.
-///
-/// Salsa further defines a `HasIngredient` trait which slices the jar to a specific storage (e.g. a specific cache).
-/// We don't need this just jet because we write our queries by hand. We may want a similar trait if we decide
-/// to use a macro to generate the queries.
-pub trait HasJar<T> {
-    /// Gives a read-only reference to the jar.
-    fn jar(&self) -> QueryResult<&T>;
-
-    /// Gives a mutable reference to the jar.
-    fn jar_mut(&mut self) -> &mut T;
-}
-
-/// Gives access to the jars in a database.
-pub trait HasJars {
-    /// A type storing the jars.
-    ///
-    /// Most commonly, this is a tuple where each jar is a tuple element.
-    type Jars: Default;
-
-    /// Gives access to the underlying jars but tests if the queries have been cancelled.
-    ///
-    /// Returns `Err(QueryError::Cancelled)` if the queries have been cancelled.
-    fn jars(&self) -> QueryResult<&Self::Jars>;
-
-    /// Gives mutable access to the underlying jars.
-    fn jars_mut(&mut self) -> &mut Self::Jars;
-}

crates/red_knot/src/db/query.rs

@@ -1,20 +0,0 @@
-use std::fmt::{Display, Formatter};
-
-/// Reason why a db query operation failed.
-#[derive(Debug, Clone, Copy)]
-pub enum QueryError {
-    /// The query was cancelled because the DB was mutated or the query was cancelled by the host (e.g. on a file change or when pressing CTRL+C).
-    Cancelled,
-}
-
-impl Display for QueryError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            QueryError::Cancelled => f.write_str("query was cancelled"),
-        }
-    }
-}
-
-impl std::error::Error for QueryError {}
-
-pub type QueryResult<T> = Result<T, QueryError>;

crates/red_knot/src/db/runtime.rs

@@ -1,41 +0,0 @@
-use crate::cancellation::CancellationTokenSource;
-use crate::db::{QueryError, QueryResult};
-
-/// Holds the jar agnostic state of the database.
-#[derive(Debug, Default)]
-pub struct DbRuntime {
-    /// The cancellation token source used to signal other works that the queries should be aborted and
-    /// exit at the next possible point.
-    cancellation_token: CancellationTokenSource,
-}
-
-impl DbRuntime {
-    pub(super) fn snapshot(&self) -> Self {
-        Self {
-            cancellation_token: self.cancellation_token.clone(),
-        }
-    }
-
-    /// Cancels the pending queries of other workers. The current worker cannot have any pending
-    /// queries because we're holding a mutable reference to the runtime.
-    pub(super) fn cancel_other_workers(&mut self) {
-        self.cancellation_token.cancel();
-        // Set a new cancellation token so that we're in a non-cancelled state again when running the next
-        // query.
-        self.cancellation_token = CancellationTokenSource::default();
-    }
-
-    /// Returns `Ok` if the queries have not been cancelled and `Err(QueryError::Cancelled)` otherwise.
-    pub(super) fn cancelled(&self) -> QueryResult<()> {
-        if self.cancellation_token.is_cancelled() {
-            Err(QueryError::Cancelled)
-        } else {
-            Ok(())
-        }
-    }
-
-    /// Returns `true` if the queries have been cancelled.
-    pub(super) fn is_cancelled(&self) -> bool {
-        self.cancellation_token.is_cancelled()
-    }
-}

crates/red_knot/src/db/storage.rs

@@ -1,117 +0,0 @@
-use std::fmt::Formatter;
-use std::sync::Arc;
-
-use crossbeam::sync::WaitGroup;
-
-use crate::db::query::QueryResult;
-use crate::db::runtime::DbRuntime;
-use crate::db::{HasJars, ParallelDatabase};
-
-/// Stores the jars of a database and the state for each worker.
-///
-/// Today, all state is shared across all workers, but it may be desired to store data per worker in the future.
-pub struct JarsStorage<T>
-where
-    T: HasJars + Sized,
-{
-    // It's important that `jars_wait_group` is declared after `jars` to ensure that `jars` is dropped first.
-    // See https://doc.rust-lang.org/reference/destructors.html
-    /// Stores the jars of the database.
-    jars: Arc<T::Jars>,
-
-    /// Used to count the references to `jars`. Allows implementing `jars_mut` without requiring to clone `jars`.
-    jars_wait_group: WaitGroup,
-
-    /// The data agnostic state.
-    runtime: DbRuntime,
-}
-
-impl<Db> JarsStorage<Db>
-where
-    Db: HasJars,
-{
-    pub(super) fn new() -> Self {
-        Self {
-            jars: Arc::new(Db::Jars::default()),
-            jars_wait_group: WaitGroup::default(),
-            runtime: DbRuntime::default(),
-        }
-    }
-
-    /// Creates a snapshot of the jars.
-    ///
-    /// Creating the snapshot is cheap because it doesn't clone the jars, it only increments a ref counter.
-    #[must_use]
-    pub fn snapshot(&self) -> JarsStorage<Db>
-    where
-        Db: ParallelDatabase,
-    {
-        Self {
-            jars: self.jars.clone(),
-            jars_wait_group: self.jars_wait_group.clone(),
-            runtime: self.runtime.snapshot(),
-        }
-    }
-
-    pub(crate) fn jars(&self) -> QueryResult<&Db::Jars> {
-        self.runtime.cancelled()?;
-        Ok(&self.jars)
-    }
-
-    /// Returns a mutable reference to the jars without cloning their content.
-    ///
-    /// The method cancels any pending queries of other works and waits for them to complete so that
-    /// this instance is the only instance holding a reference to the jars.
-    pub(crate) fn jars_mut(&mut self) -> &mut Db::Jars {
-        // We have a mutable ref here, so no more workers can be spawned between calling this function and taking the mut ref below.
-        self.cancel_other_workers();
-
-        // Now all other references to `self.jars` should have been released. We can now safely return a mutable reference
-        // to the Arc's content.
-        let jars =
-            Arc::get_mut(&mut self.jars).expect("All references to jars should have been released");
-
-        jars
-    }
-
-    pub(crate) fn runtime(&self) -> &DbRuntime {
-        &self.runtime
-    }
-
-    pub(crate) fn runtime_mut(&mut self) -> &mut DbRuntime {
-        // Note: This method may need to use a similar trick to `jars_mut` if `DbRuntime` is ever to store data that is shared between workers.
-        &mut self.runtime
-    }
-
-    #[tracing::instrument(level = "trace", skip(self))]
-    fn cancel_other_workers(&mut self) {
-        self.runtime.cancel_other_workers();
-
-        // Wait for all other works to complete.
-        let existing_wait = std::mem::take(&mut self.jars_wait_group);
-        existing_wait.wait();
-    }
-}
-
-impl<Db> Default for JarsStorage<Db>
-where
-    Db: HasJars,
-{
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl<T> std::fmt::Debug for JarsStorage<T>
-where
-    T: HasJars,
-    <T as HasJars>::Jars: std::fmt::Debug,
-{
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("SharedStorage")
-            .field("jars", &self.jars)
-            .field("jars_wait_group", &self.jars_wait_group)
-            .field("runtime", &self.runtime)
-            .finish()
-    }
-}

crates/red_knot/src/files.rs

@@ -1,148 +0,0 @@
-use std::fmt::{Debug, Formatter};
-use std::hash::{Hash, Hasher};
-use std::path::Path;
-use std::sync::Arc;
-
-use hashbrown::hash_map::RawEntryMut;
-use parking_lot::RwLock;
-use rustc_hash::FxHasher;
-
-use ruff_index::{newtype_index, IndexVec};
-
-type Map<K, V> = hashbrown::HashMap<K, V, ()>;
-
-#[newtype_index]
-pub struct FileId;
-
-// TODO we'll need a higher level virtual file system abstraction that allows testing if a file exists
-// or retrieving its content (ideally lazily and in a way that the memory can be retained later)
-// I suspect that we'll end up with a FileSystem trait and our own Path abstraction.
-#[derive(Clone, Default)]
-pub struct Files {
-    inner: Arc<RwLock<FilesInner>>,
-}
-
-impl Files {
-    #[tracing::instrument(level = "debug", skip(self))]
-    pub fn intern(&self, path: &Path) -> FileId {
-        self.inner.write().intern(path)
-    }
-
-    pub fn try_get(&self, path: &Path) -> Option<FileId> {
-        self.inner.read().try_get(path)
-    }
-
-    #[tracing::instrument(level = "debug", skip(self))]
-    pub fn path(&self, id: FileId) -> Arc<Path> {
-        self.inner.read().path(id)
-    }
-}
-
-impl Debug for Files {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let files = self.inner.read();
-        let mut debug = f.debug_map();
-        for item in files.iter() {
-            debug.entry(&item.0, &item.1);
-        }
-
-        debug.finish()
-    }
-}
-
-impl PartialEq for Files {
-    fn eq(&self, other: &Self) -> bool {
-        self.inner.read().eq(&other.inner.read())
-    }
-}
-
-impl Eq for Files {}
-
-#[derive(Default)]
-struct FilesInner {
-    by_path: Map<FileId, ()>,
-    // TODO should we use a map here to reclaim the space for removed files?
-    // TODO I think we should use our own path abstraction here to avoid having to normalize paths
-    // and dealing with non-utf paths everywhere.
-    by_id: IndexVec<FileId, Arc<Path>>,
-}
-
-impl FilesInner {
-    /// Inserts the path and returns a new id for it or returns the id if it is an existing path.
-    // TODO should this accept Path or PathBuf?
-    pub(crate) fn intern(&mut self, path: &Path) -> FileId {
-        let mut hasher = FxHasher::default();
-        path.hash(&mut hasher);
-        let hash = hasher.finish();
-
-        let entry = self
-            .by_path
-            .raw_entry_mut()
-            .from_hash(hash, |existing_file| &*self.by_id[*existing_file] == path);
-
-        match entry {
-            RawEntryMut::Occupied(entry) => *entry.key(),
-            RawEntryMut::Vacant(entry) => {
-                let id = self.by_id.push(Arc::from(path));
-                entry.insert_with_hasher(hash, id, (), |_| hash);
-                id
-            }
-        }
-    }
-
-    pub(crate) fn try_get(&self, path: &Path) -> Option<FileId> {
-        let mut hasher = FxHasher::default();
-        path.hash(&mut hasher);
-        let hash = hasher.finish();
-
-        Some(
-            *self
-                .by_path
-                .raw_entry()
-                .from_hash(hash, |existing_file| &*self.by_id[*existing_file] == path)?
-                .0,
-        )
-    }
-
-    /// Returns the path for the file with the given id.
-    pub(crate) fn path(&self, id: FileId) -> Arc<Path> {
-        self.by_id[id].clone()
-    }
-
-    pub(crate) fn iter(&self) -> impl Iterator<Item = (FileId, Arc<Path>)> + '_ {
-        self.by_path.keys().map(|id| (*id, self.by_id[*id].clone()))
-    }
-}
-
-impl PartialEq for FilesInner {
-    fn eq(&self, other: &Self) -> bool {
-        self.by_id == other.by_id
-    }
-}
-
-impl Eq for FilesInner {}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::path::PathBuf;
-
-    #[test]
-    fn insert_path_twice_same_id() {
-        let files = Files::default();
-        let path = PathBuf::from("foo/bar");
-        let id1 = files.intern(&path);
-        let id2 = files.intern(&path);
-        assert_eq!(id1, id2);
-    }
-
-    #[test]
-    fn insert_different_paths_different_ids() {
-        let files = Files::default();
-        let path1 = PathBuf::from("foo/bar");
-        let path2 = PathBuf::from("foo/bar/baz");
-        let id1 = files.intern(&path1);
-        let id2 = files.intern(&path2);
-        assert_ne!(id1, id2);
-    }
-}

crates/red_knot/src/format.rs

@@ -1,135 +0,0 @@
-use std::ops::{Deref, DerefMut};
-
-use ruff_formatter::PrintedRange;
-use ruff_python_formatter::{FormatModuleError, PyFormatOptions};
-use ruff_text_size::TextRange;
-
-use crate::cache::KeyValueCache;
-use crate::db::{HasJar, QueryError, SourceDb};
-use crate::files::FileId;
-use crate::lint::Diagnostics;
-use crate::FxDashSet;
-
-pub(crate) trait FormatDb: SourceDb {
-    /// Formats a file and returns its formatted content or an indicator that it is unchanged.
-    fn format_file(&self, file_id: FileId) -> Result<FormattedFile, FormatError>;
-
-    /// Formats a range in a file.
-    fn format_file_range(
-        &self,
-        file_id: FileId,
-        range: TextRange,
-    ) -> Result<PrintedRange, FormatError>;
-
-    fn check_file_formatted(&self, file_id: FileId) -> Result<Diagnostics, FormatError>;
-}
-
-#[tracing::instrument(level = "trace", skip(db))]
-pub(crate) fn format_file<Db>(db: &Db, file_id: FileId) -> Result<FormattedFile, FormatError>
-where
-    Db: FormatDb + HasJar<FormatJar>,
-{
-    let formatted = &db.jar()?.formatted;
-
-    if formatted.contains(&file_id) {
-        return Ok(FormattedFile::Unchanged);
-    }
-
-    let source = db.source(file_id)?;
-
-    // TODO use the `format_module` method here to re-use the AST.
-    let printed =
-        ruff_python_formatter::format_module_source(source.text(), PyFormatOptions::default())?;
-
-    Ok(if printed.as_code() == source.text() {
-        formatted.insert(file_id);
-        FormattedFile::Unchanged
-    } else {
-        FormattedFile::Formatted(printed.into_code())
-    })
-}
-
-#[tracing::instrument(level = "trace", skip(db))]
-pub(crate) fn format_file_range<Db: FormatDb + HasJar<FormatJar>>(
-    db: &Db,
-    file_id: FileId,
-    range: TextRange,
-) -> Result<PrintedRange, FormatError> {
-    let formatted = &db.jar()?.formatted;
-    let source = db.source(file_id)?;
-
-    if formatted.contains(&file_id) {
-        return Ok(PrintedRange::new(source.text()[range].into(), range));
-    }
-
-    // TODO use the `format_module` method here to re-use the AST.
-
-    let result =
-        ruff_python_formatter::format_range(source.text(), range, PyFormatOptions::default())?;
-    Ok(result)
-}
-
-/// Checks if the file is correctly formatted. It creates a diagnostic for formatting issues.
-#[tracing::instrument(level = "trace", skip(db))]
-pub(crate) fn check_formatted<Db>(db: &Db, file_id: FileId) -> Result<Diagnostics, FormatError>
-where
-    Db: FormatDb + HasJar<FormatJar>,
-{
-    Ok(if db.format_file(file_id)?.is_unchanged() {
-        Diagnostics::Empty
-    } else {
-        Diagnostics::from(vec!["File is not formatted".to_string()])
-    })
-}
-
-#[derive(Debug)]
-pub(crate) enum FormatError {
-    Format(FormatModuleError),
-    Query(QueryError),
-}
-
-impl From<FormatModuleError> for FormatError {
-    fn from(value: FormatModuleError) -> Self {
-        Self::Format(value)
-    }
-}
-
-impl From<QueryError> for FormatError {
-    fn from(value: QueryError) -> Self {
-        Self::Query(value)
-    }
-}
-
-#[derive(Clone, Eq, PartialEq, Debug)]
-pub(crate) enum FormattedFile {
-    Formatted(String),
-    Unchanged,
-}
-
-impl FormattedFile {
-    pub(crate) const fn is_unchanged(&self) -> bool {
-        matches!(self, FormattedFile::Unchanged)
-    }
-}
-
-#[derive(Debug, Default)]
-pub struct FormatJar {
-    pub formatted: FxDashSet<FileId>,
-}
-
-#[derive(Default, Debug)]
-pub(crate) struct FormattedStorage(KeyValueCache<FileId, ()>);
-
-impl Deref for FormattedStorage {
-    type Target = KeyValueCache<FileId, ()>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for FormattedStorage {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}

crates/red_knot/src/hir.rs

@@ -1,67 +0,0 @@
-//! Key observations
-//!
-//! The HIR avoids allocations to large extends by:
-//! * Using an arena per node type
-//! * using ids and id ranges to reference items.
-//!
-//! Using separate arena per node type has the advantage that the IDs are relatively stable, because
-//! they only change when a node of the same kind has been added or removed. (What's unclear is if that matters or if
-//! it still triggers a re-compute because the AST-id in the node has changed).
-//!
-//! The HIR does not store all details. It mainly stores the *public* interface. There's a reference
-//! back to the AST node to get more details.
-//!
-//!
-
-use crate::ast_ids::{HasAstId, TypedAstId};
-use crate::files::FileId;
-use std::fmt::Formatter;
-use std::hash::{Hash, Hasher};
-
-pub struct HirAstId<N: HasAstId> {
-    file_id: FileId,
-    node_id: TypedAstId<N>,
-}
-
-impl<N: HasAstId> Copy for HirAstId<N> {}
-impl<N: HasAstId> Clone for HirAstId<N> {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-
-impl<N: HasAstId> PartialEq for HirAstId<N> {
-    fn eq(&self, other: &Self) -> bool {
-        self.file_id == other.file_id && self.node_id == other.node_id
-    }
-}
-
-impl<N: HasAstId> Eq for HirAstId<N> {}
-
-impl<N: HasAstId> std::fmt::Debug for HirAstId<N> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("HirAstId")
-            .field("file_id", &self.file_id)
-            .field("node_id", &self.node_id)
-            .finish()
-    }
-}
-
-impl<N: HasAstId> Hash for HirAstId<N> {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.file_id.hash(state);
-        self.node_id.hash(state);
-    }
-}
-
-impl<N: HasAstId> HirAstId<N> {
-    pub fn upcast<M: HasAstId>(self) -> HirAstId<M>
-    where
-        N: Into<M>,
-    {
-        HirAstId {
-            file_id: self.file_id,
-            node_id: self.node_id.upcast(),
-        }
-    }
-}

crates/red_knot/src/hir/definition.rs

@@ -1,556 +0,0 @@
-use std::ops::{Index, Range};
-
-use ruff_index::{newtype_index, IndexVec};
-use ruff_python_ast::visitor::preorder;
-use ruff_python_ast::visitor::preorder::PreorderVisitor;
-use ruff_python_ast::{
-    Decorator, ExceptHandler, ExceptHandlerExceptHandler, Expr, MatchCase, ModModule, Stmt,
-    StmtAnnAssign, StmtAssign, StmtClassDef, StmtFunctionDef, StmtGlobal, StmtImport,
-    StmtImportFrom, StmtNonlocal, StmtTypeAlias, TypeParam, TypeParamParamSpec, TypeParamTypeVar,
-    TypeParamTypeVarTuple, WithItem,
-};
-
-use crate::ast_ids::{AstIds, HasAstId};
-use crate::files::FileId;
-use crate::hir::HirAstId;
-use crate::Name;
-
-#[newtype_index]
-pub struct FunctionId;
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub struct Function {
-    ast_id: HirAstId<StmtFunctionDef>,
-    name: Name,
-    parameters: Range<ParameterId>,
-    type_parameters: Range<TypeParameterId>, // TODO: type_parameters, return expression, decorators
-}
-
-#[newtype_index]
-pub struct ParameterId;
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub struct Parameter {
-    kind: ParameterKind,
-    name: Name,
-    default: Option<()>, // TODO use expression HIR
-    ast_id: HirAstId<ruff_python_ast::Parameter>,
-}
-
-// TODO or should `Parameter` be an enum?
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
-pub enum ParameterKind {
-    PositionalOnly,
-    Arguments,
-    Vararg,
-    KeywordOnly,
-    Kwarg,
-}
-
-#[newtype_index]
-pub struct ClassId;
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub struct Class {
-    name: Name,
-    ast_id: HirAstId<StmtClassDef>,
-    // TODO type parameters, inheritance, decorators, members
-}
-
-#[newtype_index]
-pub struct AssignmentId;
-
-// This can have more than one name...
-// but that means we can't implement `name()` on `ModuleItem`.
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub struct Assignment {
-    // TODO: Handle multiple names  / targets
-    name: Name,
-    ast_id: HirAstId<StmtAssign>,
-}
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub struct AnnotatedAssignment {
-    name: Name,
-    ast_id: HirAstId<StmtAnnAssign>,
-}
-
-#[newtype_index]
-pub struct AnnotatedAssignmentId;
-
-#[newtype_index]
-pub struct TypeAliasId;
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub struct TypeAlias {
-    name: Name,
-    ast_id: HirAstId<StmtTypeAlias>,
-    parameters: Range<TypeParameterId>,
-}
-
-#[newtype_index]
-pub struct TypeParameterId;
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub enum TypeParameter {
-    TypeVar(TypeParameterTypeVar),
-    ParamSpec(TypeParameterParamSpec),
-    TypeVarTuple(TypeParameterTypeVarTuple),
-}
-
-impl TypeParameter {
-    pub fn ast_id(&self) -> HirAstId<TypeParam> {
-        match self {
-            TypeParameter::TypeVar(type_var) => type_var.ast_id.upcast(),
-            TypeParameter::ParamSpec(param_spec) => param_spec.ast_id.upcast(),
-            TypeParameter::TypeVarTuple(type_var_tuple) => type_var_tuple.ast_id.upcast(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub struct TypeParameterTypeVar {
-    name: Name,
-    ast_id: HirAstId<TypeParamTypeVar>,
-}
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub struct TypeParameterParamSpec {
-    name: Name,
-    ast_id: HirAstId<TypeParamParamSpec>,
-}
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub struct TypeParameterTypeVarTuple {
-    name: Name,
-    ast_id: HirAstId<TypeParamTypeVarTuple>,
-}
-
-#[newtype_index]
-pub struct GlobalId;
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub struct Global {
-    // TODO track names
-    ast_id: HirAstId<StmtGlobal>,
-}
-
-#[newtype_index]
-pub struct NonLocalId;
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub struct NonLocal {
-    // TODO track names
-    ast_id: HirAstId<StmtNonlocal>,
-}
-
-pub enum DefinitionId {
-    Function(FunctionId),
-    Parameter(ParameterId),
-    Class(ClassId),
-    Assignment(AssignmentId),
-    AnnotatedAssignment(AnnotatedAssignmentId),
-    Global(GlobalId),
-    NonLocal(NonLocalId),
-    TypeParameter(TypeParameterId),
-    TypeAlias(TypeAlias),
-}
-
-pub enum DefinitionItem {
-    Function(Function),
-    Parameter(Parameter),
-    Class(Class),
-    Assignment(Assignment),
-    AnnotatedAssignment(AnnotatedAssignment),
-    Global(Global),
-    NonLocal(NonLocal),
-    TypeParameter(TypeParameter),
-    TypeAlias(TypeAlias),
-}
-
-// The closest is rust-analyzers item-tree. It only represents "Items" which make the public interface of a module
-// (it excludes any other statement or expressions). rust-analyzer uses it as the main input to the name resolution
-// algorithm
-// > It is the input to the name resolution algorithm, as well as to the queries defined in `adt.rs`,
-// > `data.rs`, and most things in `attr.rs`.
-//
-// > One important purpose of this layer is to provide an "invalidation barrier" for incremental
-// > computations: when typing inside an item body, the `ItemTree` of the modified file is typically
-// > unaffected, so we don't have to recompute name resolution results or item data (see `data.rs`).
-//
-// I haven't fully figured this out but I think that this composes the "public" interface of a module?
-// But maybe that's too optimistic.
-//
-//
-#[derive(Debug, Clone, Default, Eq, PartialEq)]
-pub struct Definitions {
-    functions: IndexVec<FunctionId, Function>,
-    parameters: IndexVec<ParameterId, Parameter>,
-    classes: IndexVec<ClassId, Class>,
-    assignments: IndexVec<AssignmentId, Assignment>,
-    annotated_assignments: IndexVec<AnnotatedAssignmentId, AnnotatedAssignment>,
-    type_aliases: IndexVec<TypeAliasId, TypeAlias>,
-    type_parameters: IndexVec<TypeParameterId, TypeParameter>,
-    globals: IndexVec<GlobalId, Global>,
-    non_locals: IndexVec<NonLocalId, NonLocal>,
-}
-
-impl Definitions {
-    pub fn from_module(module: &ModModule, ast_ids: &AstIds, file_id: FileId) -> Self {
-        let mut visitor = DefinitionsVisitor {
-            definitions: Definitions::default(),
-            ast_ids,
-            file_id,
-        };
-
-        visitor.visit_body(&module.body);
-
-        visitor.definitions
-    }
-}
-
-impl Index<FunctionId> for Definitions {
-    type Output = Function;
-
-    fn index(&self, index: FunctionId) -> &Self::Output {
-        &self.functions[index]
-    }
-}
-
-impl Index<ParameterId> for Definitions {
-    type Output = Parameter;
-
-    fn index(&self, index: ParameterId) -> &Self::Output {
-        &self.parameters[index]
-    }
-}
-
-impl Index<ClassId> for Definitions {
-    type Output = Class;
-
-    fn index(&self, index: ClassId) -> &Self::Output {
-        &self.classes[index]
-    }
-}
-
-impl Index<AssignmentId> for Definitions {
-    type Output = Assignment;
-
-    fn index(&self, index: AssignmentId) -> &Self::Output {
-        &self.assignments[index]
-    }
-}
-
-impl Index<AnnotatedAssignmentId> for Definitions {
-    type Output = AnnotatedAssignment;
-
-    fn index(&self, index: AnnotatedAssignmentId) -> &Self::Output {
-        &self.annotated_assignments[index]
-    }
-}
-
-impl Index<TypeAliasId> for Definitions {
-    type Output = TypeAlias;
-
-    fn index(&self, index: TypeAliasId) -> &Self::Output {
-        &self.type_aliases[index]
-    }
-}
-
-impl Index<GlobalId> for Definitions {
-    type Output = Global;
-
-    fn index(&self, index: GlobalId) -> &Self::Output {
-        &self.globals[index]
-    }
-}
-
-impl Index<NonLocalId> for Definitions {
-    type Output = NonLocal;
-
-    fn index(&self, index: NonLocalId) -> &Self::Output {
-        &self.non_locals[index]
-    }
-}
-
-impl Index<TypeParameterId> for Definitions {
-    type Output = TypeParameter;
-
-    fn index(&self, index: TypeParameterId) -> &Self::Output {
-        &self.type_parameters[index]
-    }
-}
-
-struct DefinitionsVisitor<'a> {
-    definitions: Definitions,
-    ast_ids: &'a AstIds,
-    file_id: FileId,
-}
-
-impl DefinitionsVisitor<'_> {
-    fn ast_id<N: HasAstId>(&self, node: &N) -> HirAstId<N> {
-        HirAstId {
-            file_id: self.file_id,
-            node_id: self.ast_ids.ast_id(node),
-        }
-    }
-
-    fn lower_function_def(&mut self, function: &StmtFunctionDef) -> FunctionId {
-        let name = Name::new(&function.name);
-
-        let first_type_parameter_id = self.definitions.type_parameters.next_index();
-        let mut last_type_parameter_id = first_type_parameter_id;
-
-        if let Some(type_params) = &function.type_params {
-            for parameter in &type_params.type_params {
-                let id = self.lower_type_parameter(parameter);
-                last_type_parameter_id = id;
-            }
-        }
-
-        let parameters = self.lower_parameters(&function.parameters);
-
-        self.definitions.functions.push(Function {
-            name,
-            ast_id: self.ast_id(function),
-            parameters,
-            type_parameters: first_type_parameter_id..last_type_parameter_id,
-        })
-    }
-
-    fn lower_parameters(&mut self, parameters: &ruff_python_ast::Parameters) -> Range<ParameterId> {
-        let first_parameter_id = self.definitions.parameters.next_index();
-        let mut last_parameter_id = first_parameter_id;
-
-        for parameter in &parameters.posonlyargs {
-            last_parameter_id = self.definitions.parameters.push(Parameter {
-                kind: ParameterKind::PositionalOnly,
-                name: Name::new(&parameter.parameter.name),
-                default: None,
-                ast_id: self.ast_id(&parameter.parameter),
-            });
-        }
-
-        if let Some(vararg) = &parameters.vararg {
-            last_parameter_id = self.definitions.parameters.push(Parameter {
-                kind: ParameterKind::Vararg,
-                name: Name::new(&vararg.name),
-                default: None,
-                ast_id: self.ast_id(vararg),
-            });
-        }
-
-        for parameter in &parameters.kwonlyargs {
-            last_parameter_id = self.definitions.parameters.push(Parameter {
-                kind: ParameterKind::KeywordOnly,
-                name: Name::new(&parameter.parameter.name),
-                default: None,
-                ast_id: self.ast_id(&parameter.parameter),
-            });
-        }
-
-        if let Some(kwarg) = &parameters.kwarg {
-            last_parameter_id = self.definitions.parameters.push(Parameter {
-                kind: ParameterKind::KeywordOnly,
-                name: Name::new(&kwarg.name),
-                default: None,
-                ast_id: self.ast_id(kwarg),
-            });
-        }
-
-        first_parameter_id..last_parameter_id
-    }
-
-    fn lower_class_def(&mut self, class: &StmtClassDef) -> ClassId {
-        let name = Name::new(&class.name);
-
-        self.definitions.classes.push(Class {
-            name,
-            ast_id: self.ast_id(class),
-        })
-    }
-
-    fn lower_assignment(&mut self, assignment: &StmtAssign) {
-        // FIXME handle multiple names
-        if let Some(Expr::Name(name)) = assignment.targets.first() {
-            self.definitions.assignments.push(Assignment {
-                name: Name::new(&name.id),
-                ast_id: self.ast_id(assignment),
-            });
-        }
-    }
-
-    fn lower_annotated_assignment(&mut self, annotated_assignment: &StmtAnnAssign) {
-        if let Expr::Name(name) = &*annotated_assignment.target {
-            self.definitions
-                .annotated_assignments
-                .push(AnnotatedAssignment {
-                    name: Name::new(&name.id),
-                    ast_id: self.ast_id(annotated_assignment),
-                });
-        }
-    }
-
-    fn lower_type_alias(&mut self, type_alias: &StmtTypeAlias) {
-        if let Expr::Name(name) = &*type_alias.name {
-            let name = Name::new(&name.id);
-
-            let lower_parameters_id = self.definitions.type_parameters.next_index();
-            let mut last_parameter_id = lower_parameters_id;
-
-            if let Some(type_params) = &type_alias.type_params {
-                for type_parameter in &type_params.type_params {
-                    let id = self.lower_type_parameter(type_parameter);
-                    last_parameter_id = id;
-                }
-            }
-
-            self.definitions.type_aliases.push(TypeAlias {
-                name,
-                ast_id: self.ast_id(type_alias),
-                parameters: lower_parameters_id..last_parameter_id,
-            });
-        }
-    }
-
-    fn lower_type_parameter(&mut self, type_parameter: &TypeParam) -> TypeParameterId {
-        match type_parameter {
-            TypeParam::TypeVar(type_var) => {
-                self.definitions
-                    .type_parameters
-                    .push(TypeParameter::TypeVar(TypeParameterTypeVar {
-                        name: Name::new(&type_var.name),
-                        ast_id: self.ast_id(type_var),
-                    }))
-            }
-            TypeParam::ParamSpec(param_spec) => {
-                self.definitions
-                    .type_parameters
-                    .push(TypeParameter::ParamSpec(TypeParameterParamSpec {
-                        name: Name::new(&param_spec.name),
-                        ast_id: self.ast_id(param_spec),
-                    }))
-            }
-            TypeParam::TypeVarTuple(type_var_tuple) => {
-                self.definitions
-                    .type_parameters
-                    .push(TypeParameter::TypeVarTuple(TypeParameterTypeVarTuple {
-                        name: Name::new(&type_var_tuple.name),
-                        ast_id: self.ast_id(type_var_tuple),
-                    }))
-            }
-        }
-    }
-
-    fn lower_import(&mut self, _import: &StmtImport) {
-        // TODO
-    }
-
-    fn lower_import_from(&mut self, _import_from: &StmtImportFrom) {
-        // TODO
-    }
-
-    fn lower_global(&mut self, global: &StmtGlobal) -> GlobalId {
-        self.definitions.globals.push(Global {
-            ast_id: self.ast_id(global),
-        })
-    }
-
-    fn lower_non_local(&mut self, non_local: &StmtNonlocal) -> NonLocalId {
-        self.definitions.non_locals.push(NonLocal {
-            ast_id: self.ast_id(non_local),
-        })
-    }
-
-    fn lower_except_handler(&mut self, _except_handler: &ExceptHandlerExceptHandler) {
-        // TODO
-    }
-
-    fn lower_with_item(&mut self, _with_item: &WithItem) {
-        // TODO
-    }
-
-    fn lower_match_case(&mut self, _match_case: &MatchCase) {
-        // TODO
-    }
-}
-
-impl PreorderVisitor<'_> for DefinitionsVisitor<'_> {
-    fn visit_stmt(&mut self, stmt: &Stmt) {
-        match stmt {
-            // Definition statements
-            Stmt::FunctionDef(definition) => {
-                self.lower_function_def(definition);
-                self.visit_body(&definition.body);
-            }
-            Stmt::ClassDef(definition) => {
-                self.lower_class_def(definition);
-                self.visit_body(&definition.body);
-            }
-            Stmt::Assign(assignment) => {
-                self.lower_assignment(assignment);
-            }
-            Stmt::AnnAssign(annotated_assignment) => {
-                self.lower_annotated_assignment(annotated_assignment);
-            }
-            Stmt::TypeAlias(type_alias) => {
-                self.lower_type_alias(type_alias);
-            }
-
-            Stmt::Import(import) => self.lower_import(import),
-            Stmt::ImportFrom(import_from) => self.lower_import_from(import_from),
-            Stmt::Global(global) => {
-                self.lower_global(global);
-            }
-            Stmt::Nonlocal(non_local) => {
-                self.lower_non_local(non_local);
-            }
-
-            // Visit the compound statement bodies because they can contain other definitions.
-            Stmt::For(_)
-            | Stmt::While(_)
-            | Stmt::If(_)
-            | Stmt::With(_)
-            | Stmt::Match(_)
-            | Stmt::Try(_) => {
-                preorder::walk_stmt(self, stmt);
-            }
-
-            // Skip over simple statements because they can't contain any other definitions.
-            Stmt::Return(_)
-            | Stmt::Delete(_)
-            | Stmt::AugAssign(_)
-            | Stmt::Raise(_)
-            | Stmt::Assert(_)
-            | Stmt::Expr(_)
-            | Stmt::Pass(_)
-            | Stmt::Break(_)
-            | Stmt::Continue(_)
-            | Stmt::IpyEscapeCommand(_) => {
-                // No op
-            }
-        }
-    }
-
-    fn visit_expr(&mut self, _: &'_ Expr) {}
-
-    fn visit_decorator(&mut self, _decorator: &'_ Decorator) {}
-
-    fn visit_except_handler(&mut self, except_handler: &'_ ExceptHandler) {
-        match except_handler {
-            ExceptHandler::ExceptHandler(except_handler) => {
-                self.lower_except_handler(except_handler);
-            }
-        }
-    }
-
-    fn visit_with_item(&mut self, with_item: &'_ WithItem) {
-        self.lower_with_item(with_item);
-    }
-
-    fn visit_match_case(&mut self, match_case: &'_ MatchCase) {
-        self.lower_match_case(match_case);
-        self.visit_body(&match_case.body);
-    }
-}

crates/red_knot/src/lib.rs

@@ -1,110 +0,0 @@
-use std::fmt::Formatter;
-use std::hash::BuildHasherDefault;
-use std::ops::Deref;
-use std::path::{Path, PathBuf};
-
-use rustc_hash::{FxHashSet, FxHasher};
-
-use crate::files::FileId;
-
-pub mod ast_ids;
-pub mod cache;
-pub mod cancellation;
-pub mod db;
-pub mod files;
-mod format;
-pub mod hir;
-pub mod lint;
-pub mod module;
-mod parse;
-pub mod program;
-pub mod source;
-mod symbols;
-mod types;
-pub mod watch;
-
-pub(crate) type FxDashMap<K, V> = dashmap::DashMap<K, V, BuildHasherDefault<FxHasher>>;
-#[allow(unused)]
-pub(crate) type FxDashSet<V> = dashmap::DashSet<V, BuildHasherDefault<FxHasher>>;
-pub(crate) type FxIndexSet<V> = indexmap::set::IndexSet<V, BuildHasherDefault<FxHasher>>;
-
-#[derive(Debug, Clone)]
-pub struct Workspace {
-    /// TODO this should be a resolved path. We should probably use a newtype wrapper that guarantees that
-    /// PATH is a UTF-8 path and is normalized.
-    root: PathBuf,
-    /// The files that are open in the workspace.
-    ///
-    /// * Editor: The files that are actively being edited in the editor (the user has a tab open with the file).
-    /// * CLI: The resolved files passed as arguments to the CLI.
-    open_files: FxHashSet<FileId>,
-}
-
-impl Workspace {
-    pub fn new(root: PathBuf) -> Self {
-        Self {
-            root,
-            open_files: FxHashSet::default(),
-        }
-    }
-
-    pub fn root(&self) -> &Path {
-        self.root.as_path()
-    }
-
-    // TODO having the content in workspace feels wrong.
-    pub fn open_file(&mut self, file_id: FileId) {
-        self.open_files.insert(file_id);
-    }
-
-    pub fn close_file(&mut self, file_id: FileId) {
-        self.open_files.remove(&file_id);
-    }
-
-    // TODO introduce an `OpenFile` type instead of using an anonymous tuple.
-    pub fn open_files(&self) -> impl Iterator<Item = FileId> + '_ {
-        self.open_files.iter().copied()
-    }
-
-    pub fn is_file_open(&self, file_id: FileId) -> bool {
-        self.open_files.contains(&file_id)
-    }
-}
-
-#[derive(Debug, Clone, Eq, PartialEq, Hash)]
-pub struct Name(smol_str::SmolStr);
-
-impl Name {
-    #[inline]
-    pub fn new(name: &str) -> Self {
-        Self(smol_str::SmolStr::new(name))
-    }
-
-    pub fn as_str(&self) -> &str {
-        self.0.as_str()
-    }
-}
-
-impl Deref for Name {
-    type Target = str;
-
-    #[inline]
-    fn deref(&self) -> &Self::Target {
-        self.as_str()
-    }
-}
-
-impl<T> From<T> for Name
-where
-    T: Into<smol_str::SmolStr>,
-{
-    fn from(value: T) -> Self {
-        Self(value.into())
-    }
-}
-
-impl std::fmt::Display for Name {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.write_str(self.as_str())
-    }
-}

crates/red_knot/src/lint.rs

@@ -1,264 +0,0 @@
-use std::cell::RefCell;
-use std::ops::{Deref, DerefMut};
-use std::sync::Arc;
-use std::time::Duration;
-
-use ruff_python_ast::visitor::Visitor;
-use ruff_python_ast::{ModModule, StringLiteral};
-
-use crate::cache::KeyValueCache;
-use crate::db::{HasJar, LintDb, LintJar, QueryResult, SemanticDb};
-use crate::files::FileId;
-use crate::parse::Parsed;
-use crate::source::Source;
-use crate::symbols::{Definition, SymbolId, SymbolTable};
-use crate::types::Type;
-
-#[tracing::instrument(level = "debug", skip(db))]
-pub(crate) fn lint_syntax<Db>(db: &Db, file_id: FileId) -> QueryResult<Diagnostics>
-where
-    Db: LintDb + HasJar<LintJar>,
-{
-    let storage = &db.jar()?.lint_syntax;
-
-    #[allow(clippy::print_stdout)]
-    if std::env::var("RED_KNOT_SLOW_LINT").is_ok() {
-        for i in 0..10 {
-            db.cancelled()?;
-            println!("RED_KNOT_SLOW_LINT is set, sleeping for {i}/10 seconds");
-            std::thread::sleep(Duration::from_secs(1));
-        }
-    }
-
-    storage.get(&file_id, |file_id| {
-        let mut diagnostics = Vec::new();
-
-        let source = db.source(*file_id)?;
-        lint_lines(source.text(), &mut diagnostics);
-
-        let parsed = db.parse(*file_id)?;
-
-        if parsed.errors().is_empty() {
-            let ast = parsed.ast();
-
-            let mut visitor = SyntaxLintVisitor {
-                diagnostics,
-                source: source.text(),
-            };
-            visitor.visit_body(&ast.body);
-            diagnostics = visitor.diagnostics;
-        } else {
-            diagnostics.extend(parsed.errors().iter().map(std::string::ToString::to_string));
-        }
-
-        Ok(Diagnostics::from(diagnostics))
-    })
-}
-
-fn lint_lines(source: &str, diagnostics: &mut Vec<String>) {
-    for (line_number, line) in source.lines().enumerate() {
-        if line.len() < 88 {
-            continue;
-        }
-
-        let char_count = line.chars().count();
-        if char_count > 88 {
-            diagnostics.push(format!(
-                "Line {} is too long ({} characters)",
-                line_number + 1,
-                char_count
-            ));
-        }
-    }
-}
-
-#[tracing::instrument(level = "debug", skip(db))]
-pub(crate) fn lint_semantic<Db>(db: &Db, file_id: FileId) -> QueryResult<Diagnostics>
-where
-    Db: LintDb + HasJar<LintJar>,
-{
-    let storage = &db.jar()?.lint_semantic;
-
-    storage.get(&file_id, |file_id| {
-        let source = db.source(*file_id)?;
-        let parsed = db.parse(*file_id)?;
-        let symbols = db.symbol_table(*file_id)?;
-
-        let context = SemanticLintContext {
-            file_id: *file_id,
-            source,
-            parsed,
-            symbols,
-            db,
-            diagnostics: RefCell::new(Vec::new()),
-        };
-
-        lint_unresolved_imports(&context)?;
-
-        Ok(Diagnostics::from(context.diagnostics.take()))
-    })
-}
-
-fn lint_unresolved_imports(context: &SemanticLintContext) -> QueryResult<()> {
-    // TODO: Consider iterating over the dependencies (imports) only instead of all definitions.
-    for (symbol, definition) in context.symbols().all_definitions() {
-        match definition {
-            Definition::Import(import) => {
-                let ty = context.infer_symbol_type(symbol)?;
-
-                if ty.is_unknown() {
-                    context.push_diagnostic(format!("Unresolved module {}", import.module));
-                }
-            }
-            Definition::ImportFrom(import) => {
-                let ty = context.infer_symbol_type(symbol)?;
-
-                if ty.is_unknown() {
-                    let module_name = import.module().map(Deref::deref).unwrap_or_default();
-                    let message = if import.level() > 0 {
-                        format!(
-                            "Unresolved relative import '{}' from {}{}",
-                            import.name(),
-                            ".".repeat(import.level() as usize),
-                            module_name
-                        )
-                    } else {
-                        format!(
-                            "Unresolved import '{}' from '{}'",
-                            import.name(),
-                            module_name
-                        )
-                    };
-
-                    context.push_diagnostic(message);
-                }
-            }
-            _ => {}
-        }
-    }
-
-    Ok(())
-}
-
-pub struct SemanticLintContext<'a> {
-    file_id: FileId,
-    source: Source,
-    parsed: Parsed,
-    symbols: Arc<SymbolTable>,
-    db: &'a dyn SemanticDb,
-    diagnostics: RefCell<Vec<String>>,
-}
-
-impl<'a> SemanticLintContext<'a> {
-    pub fn source_text(&self) -> &str {
-        self.source.text()
-    }
-
-    pub fn file_id(&self) -> FileId {
-        self.file_id
-    }
-
-    pub fn ast(&self) -> &ModModule {
-        self.parsed.ast()
-    }
-
-    pub fn symbols(&self) -> &SymbolTable {
-        &self.symbols
-    }
-
-    pub fn infer_symbol_type(&self, symbol_id: SymbolId) -> QueryResult<Type> {
-        self.db.infer_symbol_type(self.file_id, symbol_id)
-    }
-
-    pub fn push_diagnostic(&self, diagnostic: String) {
-        self.diagnostics.borrow_mut().push(diagnostic);
-    }
-
-    pub fn extend_diagnostics(&mut self, diagnostics: impl IntoIterator<Item = String>) {
-        self.diagnostics.get_mut().extend(diagnostics);
-    }
-}
-
-#[derive(Debug)]
-struct SyntaxLintVisitor<'a> {
-    diagnostics: Vec<String>,
-    source: &'a str,
-}
-
-impl Visitor<'_> for SyntaxLintVisitor<'_> {
-    fn visit_string_literal(&mut self, string_literal: &'_ StringLiteral) {
-        // A very naive implementation of use double quotes
-        let text = &self.source[string_literal.range];
-
-        if text.starts_with('\'') {
-            self.diagnostics
-                .push("Use double quotes for strings".to_string());
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum Diagnostics {
-    Empty,
-    List(Arc<Vec<String>>),
-}
-
-impl Diagnostics {
-    pub fn as_slice(&self) -> &[String] {
-        match self {
-            Diagnostics::Empty => &[],
-            Diagnostics::List(list) => list.as_slice(),
-        }
-    }
-}
-
-impl Deref for Diagnostics {
-    type Target = [String];
-    fn deref(&self) -> &Self::Target {
-        self.as_slice()
-    }
-}
-
-impl From<Vec<String>> for Diagnostics {
-    fn from(value: Vec<String>) -> Self {
-        if value.is_empty() {
-            Diagnostics::Empty
-        } else {
-            Diagnostics::List(Arc::new(value))
-        }
-    }
-}
-
-#[derive(Default, Debug)]
-pub struct LintSyntaxStorage(KeyValueCache<FileId, Diagnostics>);
-
-impl Deref for LintSyntaxStorage {
-    type Target = KeyValueCache<FileId, Diagnostics>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for LintSyntaxStorage {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-#[derive(Default, Debug)]
-pub struct LintSemanticStorage(KeyValueCache<FileId, Diagnostics>);
-
-impl Deref for LintSemanticStorage {
-    type Target = KeyValueCache<FileId, Diagnostics>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for LintSemanticStorage {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}

crates/red_knot/src/main.rs

@@ -1,446 +0,0 @@
-#![allow(clippy::dbg_macro)]
-
-use std::collections::hash_map::Entry;
-use std::path::Path;
-use std::sync::Mutex;
-
-use crossbeam::channel as crossbeam_channel;
-use rustc_hash::FxHashMap;
-use tracing::subscriber::Interest;
-use tracing::{Level, Metadata};
-use tracing_subscriber::filter::LevelFilter;
-use tracing_subscriber::layer::{Context, Filter, SubscriberExt};
-use tracing_subscriber::{Layer, Registry};
-use tracing_tree::time::Uptime;
-
-use red_knot::db::{
-    Database, HasJar, ParallelDatabase, QueryError, SemanticDb, SourceDb, SourceJar,
-};
-use red_knot::files::FileId;
-use red_knot::module::{ModuleSearchPath, ModuleSearchPathKind};
-use red_knot::program::check::ExecutionMode;
-use red_knot::program::{FileChange, FileChangeKind, Program};
-use red_knot::watch::FileWatcher;
-use red_knot::Workspace;
-
-#[allow(clippy::print_stdout, clippy::unnecessary_wraps, clippy::print_stderr)]
-fn main() -> anyhow::Result<()> {
-    setup_tracing();
-
-    let arguments: Vec<_> = std::env::args().collect();
-
-    if arguments.len() < 2 {
-        eprintln!("Usage: red_knot <path>");
-        return Err(anyhow::anyhow!("Invalid arguments"));
-    }
-
-    let entry_point = Path::new(&arguments[1]);
-
-    if !entry_point.exists() {
-        eprintln!("The entry point does not exist.");
-        return Err(anyhow::anyhow!("Invalid arguments"));
-    }
-
-    if !entry_point.is_file() {
-        eprintln!("The entry point is not a file.");
-        return Err(anyhow::anyhow!("Invalid arguments"));
-    }
-
-    let workspace_folder = entry_point.parent().unwrap();
-    let workspace = Workspace::new(workspace_folder.to_path_buf());
-
-    let workspace_search_path = ModuleSearchPath::new(
-        workspace.root().to_path_buf(),
-        ModuleSearchPathKind::FirstParty,
-    );
-    let mut program = Program::new(workspace);
-    program.set_module_search_paths(vec![workspace_search_path]);
-
-    let entry_id = program.file_id(entry_point);
-    program.workspace_mut().open_file(entry_id);
-
-    let (main_loop, main_loop_cancellation_token) = MainLoop::new();
-
-    // Listen to Ctrl+C and abort the watch mode.
-    let main_loop_cancellation_token = Mutex::new(Some(main_loop_cancellation_token));
-    ctrlc::set_handler(move || {
-        let mut lock = main_loop_cancellation_token.lock().unwrap();
-
-        if let Some(token) = lock.take() {
-            token.stop();
-        }
-    })?;
-
-    let file_changes_notifier = main_loop.file_changes_notifier();
-
-    // Watch for file changes and re-trigger the analysis.
-    let mut file_watcher = FileWatcher::new(
-        move |changes| {
-            file_changes_notifier.notify(changes);
-        },
-        program.files().clone(),
-    )?;
-
-    file_watcher.watch_folder(workspace_folder)?;
-
-    main_loop.run(&mut program);
-
-    let source_jar: &SourceJar = program.jar().unwrap();
-
-    dbg!(source_jar.parsed.statistics());
-    dbg!(source_jar.sources.statistics());
-
-    Ok(())
-}
-
-struct MainLoop {
-    orchestrator_sender: crossbeam_channel::Sender<OrchestratorMessage>,
-    main_loop_receiver: crossbeam_channel::Receiver<MainLoopMessage>,
-}
-
-impl MainLoop {
-    fn new() -> (Self, MainLoopCancellationToken) {
-        let (orchestrator_sender, orchestrator_receiver) = crossbeam_channel::bounded(1);
-        let (main_loop_sender, main_loop_receiver) = crossbeam_channel::bounded(1);
-
-        let mut orchestrator = Orchestrator {
-            receiver: orchestrator_receiver,
-            sender: main_loop_sender.clone(),
-            revision: 0,
-        };
-
-        std::thread::spawn(move || {
-            orchestrator.run();
-        });
-
-        (
-            Self {
-                orchestrator_sender,
-                main_loop_receiver,
-            },
-            MainLoopCancellationToken {
-                sender: main_loop_sender,
-            },
-        )
-    }
-
-    fn file_changes_notifier(&self) -> FileChangesNotifier {
-        FileChangesNotifier {
-            sender: self.orchestrator_sender.clone(),
-        }
-    }
-
-    fn run(self, program: &mut Program) {
-        self.orchestrator_sender
-            .send(OrchestratorMessage::Run)
-            .unwrap();
-
-        for message in &self.main_loop_receiver {
-            tracing::trace!("Main Loop: Tick");
-
-            match message {
-                MainLoopMessage::CheckProgram { revision } => {
-                    {
-                        let program = program.snapshot();
-                        let sender = self.orchestrator_sender.clone();
-
-                        // Spawn a new task that checks the program. This needs to be done in a separate thread
-                        // to prevent blocking the main loop here.
-                        rayon::spawn(move || match program.check(ExecutionMode::ThreadPool) {
-                            Ok(result) => {
-                                sender
-                                    .send(OrchestratorMessage::CheckProgramCompleted {
-                                        diagnostics: result,
-                                        revision,
-                                    })
-                                    .unwrap();
-                            }
-                            Err(QueryError::Cancelled) => {}
-                        });
-                    }
-
-                    if !program.is_cancelled() {
-                        let _ = program.format();
-                    }
-                }
-                MainLoopMessage::ApplyChanges(changes) => {
-                    // Automatically cancels any pending queries and waits for them to complete.
-                    program.apply_changes(changes.iter());
-                }
-                MainLoopMessage::CheckCompleted(diagnostics) => {
-                    dbg!(diagnostics);
-                }
-                MainLoopMessage::Exit => {
-                    return;
-                }
-            }
-        }
-    }
-}
-
-impl Drop for MainLoop {
-    fn drop(&mut self) {
-        self.orchestrator_sender
-            .send(OrchestratorMessage::Shutdown)
-            .unwrap();
-    }
-}
-
-#[derive(Debug, Clone)]
-struct FileChangesNotifier {
-    sender: crossbeam_channel::Sender<OrchestratorMessage>,
-}
-
-impl FileChangesNotifier {
-    fn notify(&self, changes: Vec<FileChange>) {
-        self.sender
-            .send(OrchestratorMessage::FileChanges(changes))
-            .unwrap();
-    }
-}
-
-#[derive(Debug)]
-struct MainLoopCancellationToken {
-    sender: crossbeam_channel::Sender<MainLoopMessage>,
-}
-
-impl MainLoopCancellationToken {
-    fn stop(self) {
-        self.sender.send(MainLoopMessage::Exit).unwrap();
-    }
-}
-
-struct Orchestrator {
-    /// Sends messages to the main loop.
-    sender: crossbeam_channel::Sender<MainLoopMessage>,
-    /// Receives messages from the main loop.
-    receiver: crossbeam_channel::Receiver<OrchestratorMessage>,
-    revision: usize,
-}
-
-impl Orchestrator {
-    fn run(&mut self) {
-        while let Ok(message) = self.receiver.recv() {
-            match message {
-                OrchestratorMessage::Run => {
-                    self.sender
-                        .send(MainLoopMessage::CheckProgram {
-                            revision: self.revision,
-                        })
-                        .unwrap();
-                }
-
-                OrchestratorMessage::CheckProgramCompleted {
-                    diagnostics,
-                    revision,
-                } => {
-                    // Only take the diagnostics if they are for the latest revision.
-                    if self.revision == revision {
-                        self.sender
-                            .send(MainLoopMessage::CheckCompleted(diagnostics))
-                            .unwrap();
-                    } else {
-                        tracing::debug!("Discarding diagnostics for outdated revision {revision} (current: {}).", self.revision);
-                    }
-                }
-
-                OrchestratorMessage::FileChanges(changes) => {
-                    // Request cancellation, but wait until all analysis tasks have completed to
-                    // avoid stale messages in the next main loop.
-
-                    self.revision += 1;
-                    self.debounce_changes(changes);
-                }
-                OrchestratorMessage::Shutdown => {
-                    return self.shutdown();
-                }
-            }
-        }
-    }
-
-    fn debounce_changes(&self, changes: Vec<FileChange>) {
-        let mut aggregated_changes = AggregatedChanges::default();
-        aggregated_changes.extend(changes);
-
-        loop {
-            // Consume possibly incoming file change messages before running a new analysis, but don't wait for more than 100ms.
-            crossbeam_channel::select! {
-                recv(self.receiver) -> message => {
-                    match message {
-                        Ok(OrchestratorMessage::Shutdown) => {
-                            return self.shutdown();
-                        }
-                        Ok(OrchestratorMessage::FileChanges(file_changes)) => {
-                            aggregated_changes.extend(file_changes);
-                        }
-
-                        Ok(OrchestratorMessage::CheckProgramCompleted { .. })=> {
-                            // disregard any outdated completion message.
-                        }
-                        Ok(OrchestratorMessage::Run) => unreachable!("The orchestrator is already running."),
-
-                        Err(_) => {
-                            // There are no more senders, no point in waiting for more messages
-                            return;
-                        }
-                    }
-                },
-                default(std::time::Duration::from_millis(10)) => {
-                    // No more file changes after 10 ms, send the changes and schedule a new analysis
-                    self.sender.send(MainLoopMessage::ApplyChanges(aggregated_changes)).unwrap();
-                    self.sender.send(MainLoopMessage::CheckProgram { revision: self.revision}).unwrap();
-                    return;
-                }
-            }
-        }
-    }
-
-    #[allow(clippy::unused_self)]
-    fn shutdown(&self) {
-        tracing::trace!("Shutting down orchestrator.");
-    }
-}
-
-/// Message sent from the orchestrator to the main loop.
-#[derive(Debug)]
-enum MainLoopMessage {
-    CheckProgram { revision: usize },
-    CheckCompleted(Vec<String>),
-    ApplyChanges(AggregatedChanges),
-    Exit,
-}
-
-#[derive(Debug)]
-enum OrchestratorMessage {
-    Run,
-    Shutdown,
-
-    CheckProgramCompleted {
-        diagnostics: Vec<String>,
-        revision: usize,
-    },
-
-    FileChanges(Vec<FileChange>),
-}
-
-#[derive(Default, Debug)]
-struct AggregatedChanges {
-    changes: FxHashMap<FileId, FileChangeKind>,
-}
-
-impl AggregatedChanges {
-    fn add(&mut self, change: FileChange) {
-        match self.changes.entry(change.file_id()) {
-            Entry::Occupied(mut entry) => {
-                let merged = entry.get_mut();
-
-                match (merged, change.kind()) {
-                    (FileChangeKind::Created, FileChangeKind::Deleted) => {
-                        // Deletion after creations means that ruff never saw the file.
-                        entry.remove();
-                    }
-                    (FileChangeKind::Created, FileChangeKind::Modified) => {
-                        // No-op, for ruff, modifying a file that it doesn't yet know that it exists is still considered a creation.
-                    }
-
-                    (FileChangeKind::Modified, FileChangeKind::Created) => {
-                        // Uhh, that should probably not happen. Continue considering it a modification.
-                    }
-
-                    (FileChangeKind::Modified, FileChangeKind::Deleted) => {
-                        *entry.get_mut() = FileChangeKind::Deleted;
-                    }
-
-                    (FileChangeKind::Deleted, FileChangeKind::Created) => {
-                        *entry.get_mut() = FileChangeKind::Modified;
-                    }
-
-                    (FileChangeKind::Deleted, FileChangeKind::Modified) => {
-                        // That's weird, but let's consider it a modification.
-                        *entry.get_mut() = FileChangeKind::Modified;
-                    }
-
-                    (FileChangeKind::Created, FileChangeKind::Created)
-                    | (FileChangeKind::Modified, FileChangeKind::Modified)
-                    | (FileChangeKind::Deleted, FileChangeKind::Deleted) => {
-                        // No-op transitions. Some of them should be impossible but we handle them anyway.
-                    }
-                }
-            }
-            Entry::Vacant(entry) => {
-                entry.insert(change.kind());
-            }
-        }
-    }
-
-    fn extend<I>(&mut self, changes: I)
-    where
-        I: IntoIterator<Item = FileChange>,
-        I::IntoIter: ExactSizeIterator,
-    {
-        let iter = changes.into_iter();
-        self.changes.reserve(iter.len());
-
-        for change in iter {
-            self.add(change);
-        }
-    }
-
-    fn iter(&self) -> impl Iterator<Item = FileChange> + '_ {
-        self.changes
-            .iter()
-            .map(|(id, kind)| FileChange::new(*id, *kind))
-    }
-}
-
-fn setup_tracing() {
-    let subscriber = Registry::default().with(
-        tracing_tree::HierarchicalLayer::default()
-            .with_indent_lines(true)
-            .with_indent_amount(2)
-            .with_bracketed_fields(true)
-            .with_thread_ids(true)
-            .with_targets(true)
-            .with_writer(|| Box::new(std::io::stderr()))
-            .with_timer(Uptime::default())
-            .with_filter(LoggingFilter {
-                trace_level: Level::TRACE,
-            }),
-    );
-
-    tracing::subscriber::set_global_default(subscriber).unwrap();
-}
-
-struct LoggingFilter {
-    trace_level: Level,
-}
-
-impl LoggingFilter {
-    fn is_enabled(&self, meta: &Metadata<'_>) -> bool {
-        let filter = if meta.target().starts_with("red_knot") || meta.target().starts_with("ruff") {
-            self.trace_level
-        } else {
-            Level::INFO
-        };
-
-        meta.level() <= &filter
-    }
-}
-
-impl<S> Filter<S> for LoggingFilter {
-    fn enabled(&self, meta: &Metadata<'_>, _cx: &Context<'_, S>) -> bool {
-        self.is_enabled(meta)
-    }
-
-    fn callsite_enabled(&self, meta: &'static Metadata<'static>) -> Interest {
-        if self.is_enabled(meta) {
-            Interest::always()
-        } else {
-            Interest::never()
-        }
-    }
-
-    fn max_level_hint(&self) -> Option<LevelFilter> {
-        Some(LevelFilter::from_level(self.trace_level))
-    }
-}

crates/red_knot/src/parse.rs

@@ -1,95 +0,0 @@
-use std::ops::{Deref, DerefMut};
-use std::sync::Arc;
-
-use ruff_python_ast as ast;
-use ruff_python_parser::{Mode, ParseError};
-use ruff_text_size::{Ranged, TextRange};
-
-use crate::cache::KeyValueCache;
-use crate::db::{HasJar, QueryResult, SourceDb, SourceJar};
-use crate::files::FileId;
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct Parsed {
-    inner: Arc<ParsedInner>,
-}
-
-#[derive(Debug, PartialEq)]
-struct ParsedInner {
-    ast: ast::ModModule,
-    errors: Vec<ParseError>,
-}
-
-impl Parsed {
-    fn new(ast: ast::ModModule, errors: Vec<ParseError>) -> Self {
-        Self {
-            inner: Arc::new(ParsedInner { ast, errors }),
-        }
-    }
-
-    pub(crate) fn from_text(text: &str) -> Self {
-        let result = ruff_python_parser::parse(text, Mode::Module);
-
-        let (module, errors) = match result {
-            Ok(ast::Mod::Module(module)) => (module, vec![]),
-            Ok(ast::Mod::Expression(expression)) => (
-                ast::ModModule {
-                    range: expression.range(),
-                    body: vec![ast::Stmt::Expr(ast::StmtExpr {
-                        range: expression.range(),
-                        value: expression.body,
-                    })],
-                },
-                vec![],
-            ),
-            Err(errors) => (
-                ast::ModModule {
-                    range: TextRange::default(),
-                    body: Vec::new(),
-                },
-                vec![errors],
-            ),
-        };
-
-        Parsed::new(module, errors)
-    }
-
-    pub fn ast(&self) -> &ast::ModModule {
-        &self.inner.ast
-    }
-
-    pub fn errors(&self) -> &[ParseError] {
-        &self.inner.errors
-    }
-}
-
-#[tracing::instrument(level = "debug", skip(db))]
-pub(crate) fn parse<Db>(db: &Db, file_id: FileId) -> QueryResult<Parsed>
-where
-    Db: SourceDb + HasJar<SourceJar>,
-{
-    let parsed = db.jar()?;
-
-    parsed.parsed.get(&file_id, |file_id| {
-        let source = db.source(*file_id)?;
-
-        Ok(Parsed::from_text(source.text()))
-    })
-}
-
-#[derive(Debug, Default)]
-pub struct ParsedStorage(KeyValueCache<FileId, Parsed>);
-
-impl Deref for ParsedStorage {
-    type Target = KeyValueCache<FileId, Parsed>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for ParsedStorage {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}

crates/red_knot/src/program/check.rs

@@ -1,425 +0,0 @@
-use rayon::{current_num_threads, yield_local};
-use rustc_hash::FxHashSet;
-
-use crate::db::{Database, LintDb, QueryError, QueryResult, SemanticDb};
-use crate::files::FileId;
-use crate::format::{FormatDb, FormatError};
-use crate::lint::Diagnostics;
-use crate::program::Program;
-use crate::symbols::Dependency;
-
-impl Program {
-    /// Checks all open files in the workspace and its dependencies.
-    #[tracing::instrument(level = "debug", skip_all)]
-    pub fn check(&self, mode: ExecutionMode) -> QueryResult<Vec<String>> {
-        self.cancelled()?;
-
-        let mut context = CheckContext::new(self);
-
-        match mode {
-            ExecutionMode::SingleThreaded => SingleThreadedExecutor.run(&mut context)?,
-            ExecutionMode::ThreadPool => ThreadPoolExecutor.run(&mut context)?,
-        };
-
-        Ok(context.finish())
-    }
-
-    #[tracing::instrument(level = "debug", skip(self, context))]
-    fn check_file(&self, file: FileId, context: &CheckFileContext) -> QueryResult<Diagnostics> {
-        self.cancelled()?;
-
-        let symbol_table = self.symbol_table(file)?;
-        let dependencies = symbol_table.dependencies();
-
-        if !dependencies.is_empty() {
-            let module = self.file_to_module(file)?;
-
-            // TODO scheduling all dependencies here is wasteful if we don't infer any types on them
-            //  but I think that's unlikely, so it is okay?
-            //  Anyway, we need to figure out a way to retrieve the dependencies of a module
-            //  from the persistent cache. So maybe it should be a separate query after all.
-            for dependency in dependencies {
-                let dependency_name = match dependency {
-                    Dependency::Module(name) => Some(name.clone()),
-                    Dependency::Relative { .. } => match &module {
-                        Some(module) => module.resolve_dependency(self, dependency)?,
-                        None => None,
-                    },
-                };
-
-                if let Some(dependency_name) = dependency_name {
-                    // TODO We may want to have a different check functions for non-first-party
-                    //   files because we only need to index them and not check them.
-                    //   Supporting non-first-party code also requires supporting typing stubs.
-                    if let Some(dependency) = self.resolve_module(dependency_name)? {
-                        if dependency.path(self)?.root().kind().is_first_party() {
-                            context.schedule_dependency(dependency.path(self)?.file());
-                        }
-                    }
-                }
-            }
-        }
-
-        let mut diagnostics = Vec::new();
-
-        if self.workspace().is_file_open(file) {
-            diagnostics.extend_from_slice(&self.lint_syntax(file)?);
-            diagnostics.extend_from_slice(&self.lint_semantic(file)?);
-
-            match self.check_file_formatted(file) {
-                Ok(format_diagnostics) => {
-                    diagnostics.extend_from_slice(&format_diagnostics);
-                }
-                Err(FormatError::Query(err)) => {
-                    return Err(err);
-                }
-                Err(FormatError::Format(error)) => {
-                    diagnostics.push(format!("Error formatting file: {error}"));
-                }
-            }
-        }
-
-        Ok(Diagnostics::from(diagnostics))
-    }
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub enum ExecutionMode {
-    SingleThreaded,
-    ThreadPool,
-}
-
-/// Context that stores state information about the entire check operation.
-struct CheckContext<'a> {
-    /// IDs of the files that have been queued for checking.
-    ///
-    /// Used to avoid queuing the same file twice.
-    scheduled_files: FxHashSet<FileId>,
-
-    /// Reference to the program that is checked.
-    program: &'a Program,
-
-    /// The aggregated diagnostics
-    diagnostics: Vec<String>,
-}
-
-impl<'a> CheckContext<'a> {
-    fn new(program: &'a Program) -> Self {
-        Self {
-            scheduled_files: FxHashSet::default(),
-            program,
-            diagnostics: Vec::new(),
-        }
-    }
-
-    /// Returns the tasks to check all open files in the workspace.
-    fn check_open_files(&mut self) -> Vec<CheckOpenFileTask> {
-        self.scheduled_files
-            .extend(self.program.workspace().open_files());
-
-        self.program
-            .workspace()
-            .open_files()
-            .map(|file_id| CheckOpenFileTask { file_id })
-            .collect()
-    }
-
-    /// Returns the task to check a dependency.
-    fn check_dependency(&mut self, file_id: FileId) -> Option<CheckDependencyTask> {
-        if self.scheduled_files.insert(file_id) {
-            Some(CheckDependencyTask { file_id })
-        } else {
-            None
-        }
-    }
-
-    /// Pushes the result for a single file check operation
-    fn push_diagnostics(&mut self, diagnostics: &Diagnostics) {
-        self.diagnostics.extend_from_slice(diagnostics);
-    }
-
-    /// Returns a reference to the program that is being checked.
-    fn program(&self) -> &'a Program {
-        self.program
-    }
-
-    /// Creates a task context that is used to check a single file.
-    fn task_context<'b, S>(&self, dependency_scheduler: &'b S) -> CheckTaskContext<'a, 'b, S>
-    where
-        S: ScheduleDependency,
-    {
-        CheckTaskContext {
-            program: self.program,
-            dependency_scheduler,
-        }
-    }
-
-    fn finish(self) -> Vec<String> {
-        self.diagnostics
-    }
-}
-
-/// Trait that abstracts away how a dependency of a file gets scheduled for checking.
-trait ScheduleDependency {
-    /// Schedules the file with the given ID for checking.
-    fn schedule(&self, file_id: FileId);
-}
-
-impl<T> ScheduleDependency for T
-where
-    T: Fn(FileId),
-{
-    fn schedule(&self, file_id: FileId) {
-        let f = self;
-        f(file_id);
-    }
-}
-
-/// Context that is used to run a single file check task.
-///
-/// The task is generic over `S` because it is passed across thread boundaries and
-/// we don't want to add the requirement that [`ScheduleDependency`] must be [`Send`].
-struct CheckTaskContext<'a, 'scheduler, S>
-where
-    S: ScheduleDependency,
-{
-    dependency_scheduler: &'scheduler S,
-    program: &'a Program,
-}
-
-impl<'a, 'scheduler, S> CheckTaskContext<'a, 'scheduler, S>
-where
-    S: ScheduleDependency,
-{
-    fn as_file_context(&self) -> CheckFileContext<'scheduler> {
-        CheckFileContext {
-            dependency_scheduler: self.dependency_scheduler,
-        }
-    }
-}
-
-/// Context passed when checking a single file.
-///
-/// This is a trimmed down version of [`CheckTaskContext`] with the type parameter `S` erased
-/// to avoid monomorphization of [`Program:check_file`].
-struct CheckFileContext<'a> {
-    dependency_scheduler: &'a dyn ScheduleDependency,
-}
-
-impl<'a> CheckFileContext<'a> {
-    fn schedule_dependency(&self, file_id: FileId) {
-        self.dependency_scheduler.schedule(file_id);
-    }
-}
-
-#[derive(Debug)]
-enum CheckFileTask {
-    OpenFile(CheckOpenFileTask),
-    Dependency(CheckDependencyTask),
-}
-
-impl CheckFileTask {
-    /// Runs the task and returns the results for checking this file.
-    fn run<S>(&self, context: &CheckTaskContext<S>) -> QueryResult<Diagnostics>
-    where
-        S: ScheduleDependency,
-    {
-        match self {
-            Self::OpenFile(task) => task.run(context),
-            Self::Dependency(task) => task.run(context),
-        }
-    }
-
-    fn file_id(&self) -> FileId {
-        match self {
-            CheckFileTask::OpenFile(task) => task.file_id,
-            CheckFileTask::Dependency(task) => task.file_id,
-        }
-    }
-}
-
-/// Task to check an open file.
-
-#[derive(Debug)]
-struct CheckOpenFileTask {
-    file_id: FileId,
-}
-
-impl CheckOpenFileTask {
-    fn run<S>(&self, context: &CheckTaskContext<S>) -> QueryResult<Diagnostics>
-    where
-        S: ScheduleDependency,
-    {
-        context
-            .program
-            .check_file(self.file_id, &context.as_file_context())
-    }
-}
-
-/// Task to check a dependency file.
-#[derive(Debug)]
-struct CheckDependencyTask {
-    file_id: FileId,
-}
-
-impl CheckDependencyTask {
-    fn run<S>(&self, context: &CheckTaskContext<S>) -> QueryResult<Diagnostics>
-    where
-        S: ScheduleDependency,
-    {
-        context
-            .program
-            .check_file(self.file_id, &context.as_file_context())
-    }
-}
-
-/// Executor that schedules the checking of individual program files.
-trait CheckExecutor {
-    fn run(self, context: &mut CheckContext) -> QueryResult<()>;
-}
-
-/// Executor that runs all check operations on the current thread.
-///
-/// The executor does not schedule dependencies for checking.
-/// The main motivation for scheduling dependencies
-/// in a multithreaded environment is to parse and index the dependencies concurrently.
-/// However, that doesn't make sense in a single threaded environment, because the dependencies then compute
-/// with checking the open files. Checking dependencies in a single threaded environment is more likely
-/// to hurt performance because we end up analyzing files in their entirety, even if we only need to type check parts of them.
-#[derive(Debug, Default)]
-struct SingleThreadedExecutor;
-
-impl CheckExecutor for SingleThreadedExecutor {
-    fn run(self, context: &mut CheckContext) -> QueryResult<()> {
-        let mut queue = context.check_open_files();
-
-        let noop_schedule_dependency = |_| {};
-
-        while let Some(file) = queue.pop() {
-            context.program().cancelled()?;
-
-            let task_context = context.task_context(&noop_schedule_dependency);
-            context.push_diagnostics(&file.run(&task_context)?);
-        }
-
-        Ok(())
-    }
-}
-
-/// Executor that runs the check operations on a thread pool.
-///
-/// The executor runs each check operation as its own task using a thread pool.
-///
-/// Other than [`SingleThreadedExecutor`], this executor schedules dependencies for checking. It
-/// even schedules dependencies for checking when the thread pool size is 1 for a better debugging experience.
-#[derive(Debug, Default)]
-struct ThreadPoolExecutor;
-
-impl CheckExecutor for ThreadPoolExecutor {
-    fn run(self, context: &mut CheckContext) -> QueryResult<()> {
-        let num_threads = current_num_threads();
-        let single_threaded = num_threads == 1;
-        let span = tracing::trace_span!("ThreadPoolExecutor::run", num_threads);
-        let _ = span.enter();
-
-        let mut queue: Vec<_> = context
-            .check_open_files()
-            .into_iter()
-            .map(CheckFileTask::OpenFile)
-            .collect();
-
-        let (sender, receiver) = if single_threaded {
-            // Use an unbounded queue for single threaded execution to prevent deadlocks
-            // when a single file schedules multiple dependencies.
-            crossbeam::channel::unbounded()
-        } else {
-            // Use a bounded queue to apply backpressure when the orchestration thread isn't able to keep
-            // up processing messages from the worker threads.
-            crossbeam::channel::bounded(num_threads)
-        };
-
-        let schedule_sender = sender.clone();
-        let schedule_dependency = move |file_id| {
-            schedule_sender
-                .send(ThreadPoolMessage::ScheduleDependency(file_id))
-                .unwrap();
-        };
-
-        let result = rayon::in_place_scope(|scope| {
-            let mut pending = 0usize;
-
-            loop {
-                context.program().cancelled()?;
-
-                // 1. Try to get a queued message to ensure that we have always remaining space in the channel to prevent blocking the worker threads.
-                // 2. Try to process a queued file
-                // 3. If there's no queued file wait for the next incoming message.
-                // 4. Exit if there are no more messages and no senders.
-                let message = if let Ok(message) = receiver.try_recv() {
-                    message
-                } else if let Some(task) = queue.pop() {
-                    pending += 1;
-
-                    let task_context = context.task_context(&schedule_dependency);
-                    let sender = sender.clone();
-                    let task_span = tracing::trace_span!(
-                        parent: &span,
-                        "CheckFileTask::run",
-                        file_id = task.file_id().as_u32(),
-                    );
-
-                    scope.spawn(move |_| {
-                        task_span.in_scope(|| match task.run(&task_context) {
-                            Ok(result) => {
-                                sender.send(ThreadPoolMessage::Completed(result)).unwrap();
-                            }
-                            Err(err) => sender.send(ThreadPoolMessage::Errored(err)).unwrap(),
-                        });
-                    });
-
-                    // If this is a single threaded rayon thread pool, yield the current thread
-                    // or we never start processing the work items.
-                    if single_threaded {
-                        yield_local();
-                    }
-
-                    continue;
-                } else if let Ok(message) = receiver.recv() {
-                    message
-                } else {
-                    break;
-                };
-
-                match message {
-                    ThreadPoolMessage::ScheduleDependency(dependency) => {
-                        if let Some(task) = context.check_dependency(dependency) {
-                            queue.push(CheckFileTask::Dependency(task));
-                        }
-                    }
-                    ThreadPoolMessage::Completed(diagnostics) => {
-                        context.push_diagnostics(&diagnostics);
-                        pending -= 1;
-
-                        if pending == 0 && queue.is_empty() {
-                            break;
-                        }
-                    }
-                    ThreadPoolMessage::Errored(err) => {
-                        return Err(err);
-                    }
-                }
-            }
-
-            Ok(())
-        });
-
-        result
-    }
-}
-
-#[derive(Debug)]
-enum ThreadPoolMessage {
-    ScheduleDependency(FileId),
-    Completed(Diagnostics),
-    Errored(QueryError),
-}

crates/red_knot/src/program/format.rs

@@ -1,44 +0,0 @@
-use crate::db::{QueryResult, SourceDb};
-use crate::format::{FormatDb, FormatError, FormattedFile};
-use crate::program::Program;
-
-impl Program {
-    #[tracing::instrument(level = "trace", skip(self))]
-    pub fn format(&mut self) -> QueryResult<()> {
-        // Formats all open files
-
-        // TODO make `Executor` from `check` reusable.
-        for file in self.workspace.open_files() {
-            match self.format_file(file) {
-                Ok(FormattedFile::Formatted(content)) => {
-                    let path = self.file_path(file);
-
-                    // TODO: This is problematic because it immediately re-triggers the file watcher.
-                    //  A possible solution is to track the self "inflicted" changes inside of programs
-                    //  by tracking the file revision right after the write. It could then use the revision
-                    //  to determine which changes are safe to ignore (and in which context).
-                    //  An other alternative is to not write as part of the `format` command and instead
-                    //  return a Vec with the format results and leave the writing to the caller.
-                    //  I think that's undesired because a) we still need a way to tell the formatter
-                    //  that it won't be necessary to format the content again and
-                    //  b) it would reduce concurrency because the writing would need to wait for the file
-                    //  formatting to be complete, unless we use some form of communication channel.
-                    std::fs::write(path, content).expect("Unable to write file");
-                }
-                Ok(FormattedFile::Unchanged) => {
-                    // No op
-                }
-                Err(FormatError::Query(error)) => {
-                    return Err(error);
-                }
-                Err(FormatError::Format(error)) => {
-                    // TODO proper error handling. We should either propagate this error or
-                    //  emit a diagnostic (probably this).
-                    tracing::warn!("Failed to format file: {}", error);
-                }
-            }
-        }
-
-        Ok(())
-    }
-}

crates/red_knot/src/program/mod.rs

@@ -1,252 +0,0 @@
-use ruff_formatter::PrintedRange;
-use ruff_text_size::TextRange;
-use std::path::Path;
-use std::sync::Arc;
-
-use crate::db::{
-    Database, Db, DbRuntime, HasJar, HasJars, JarsStorage, LintDb, LintJar, ParallelDatabase,
-    QueryResult, SemanticDb, SemanticJar, Snapshot, SourceDb, SourceJar,
-};
-use crate::files::{FileId, Files};
-use crate::format::{
-    check_formatted, format_file, format_file_range, FormatDb, FormatError, FormatJar,
-    FormattedFile,
-};
-use crate::lint::{lint_semantic, lint_syntax, Diagnostics};
-use crate::module::{
-    add_module, file_to_module, path_to_module, resolve_module, set_module_search_paths, Module,
-    ModuleData, ModuleName, ModuleSearchPath,
-};
-use crate::parse::{parse, Parsed};
-use crate::source::{source_text, Source};
-use crate::symbols::{symbol_table, SymbolId, SymbolTable};
-use crate::types::{infer_symbol_type, Type};
-use crate::Workspace;
-
-pub mod check;
-mod format;
-
-#[derive(Debug)]
-pub struct Program {
-    jars: JarsStorage<Program>,
-    files: Files,
-    workspace: Workspace,
-}
-
-impl Program {
-    pub fn new(workspace: Workspace) -> Self {
-        Self {
-            jars: JarsStorage::default(),
-            files: Files::default(),
-            workspace,
-        }
-    }
-
-    pub fn apply_changes<I>(&mut self, changes: I)
-    where
-        I: IntoIterator<Item = FileChange>,
-    {
-        let (source, semantic, lint, format) = self.jars_mut();
-        for change in changes {
-            semantic.module_resolver.remove_module(change.id);
-            semantic.symbol_tables.remove(&change.id);
-            source.sources.remove(&change.id);
-            source.parsed.remove(&change.id);
-            // TODO: remove all dependent modules as well
-            semantic.type_store.remove_module(change.id);
-            lint.lint_syntax.remove(&change.id);
-            lint.lint_semantic.remove(&change.id);
-            format.formatted.remove(&change.id);
-        }
-    }
-
-    pub fn files(&self) -> &Files {
-        &self.files
-    }
-
-    pub fn workspace(&self) -> &Workspace {
-        &self.workspace
-    }
-
-    pub fn workspace_mut(&mut self) -> &mut Workspace {
-        &mut self.workspace
-    }
-}
-
-impl SourceDb for Program {
-    fn file_id(&self, path: &Path) -> FileId {
-        self.files.intern(path)
-    }
-
-    fn file_path(&self, file_id: FileId) -> Arc<Path> {
-        self.files.path(file_id)
-    }
-
-    fn source(&self, file_id: FileId) -> QueryResult<Source> {
-        source_text(self, file_id)
-    }
-
-    fn parse(&self, file_id: FileId) -> QueryResult<Parsed> {
-        parse(self, file_id)
-    }
-}
-
-impl SemanticDb for Program {
-    fn resolve_module(&self, name: ModuleName) -> QueryResult<Option<Module>> {
-        resolve_module(self, name)
-    }
-
-    fn file_to_module(&self, file_id: FileId) -> QueryResult<Option<Module>> {
-        file_to_module(self, file_id)
-    }
-
-    fn path_to_module(&self, path: &Path) -> QueryResult<Option<Module>> {
-        path_to_module(self, path)
-    }
-
-    fn symbol_table(&self, file_id: FileId) -> QueryResult<Arc<SymbolTable>> {
-        symbol_table(self, file_id)
-    }
-
-    fn infer_symbol_type(&self, file_id: FileId, symbol_id: SymbolId) -> QueryResult<Type> {
-        infer_symbol_type(self, file_id, symbol_id)
-    }
-
-    // Mutations
-    fn add_module(&mut self, path: &Path) -> Option<(Module, Vec<Arc<ModuleData>>)> {
-        add_module(self, path)
-    }
-
-    fn set_module_search_paths(&mut self, paths: Vec<ModuleSearchPath>) {
-        set_module_search_paths(self, paths);
-    }
-}
-
-impl LintDb for Program {
-    fn lint_syntax(&self, file_id: FileId) -> QueryResult<Diagnostics> {
-        lint_syntax(self, file_id)
-    }
-
-    fn lint_semantic(&self, file_id: FileId) -> QueryResult<Diagnostics> {
-        lint_semantic(self, file_id)
-    }
-}
-
-impl FormatDb for Program {
-    fn format_file(&self, file_id: FileId) -> Result<FormattedFile, FormatError> {
-        format_file(self, file_id)
-    }
-
-    fn format_file_range(
-        &self,
-        file_id: FileId,
-        range: TextRange,
-    ) -> Result<PrintedRange, FormatError> {
-        format_file_range(self, file_id, range)
-    }
-
-    fn check_file_formatted(&self, file_id: FileId) -> Result<Diagnostics, FormatError> {
-        check_formatted(self, file_id)
-    }
-}
-
-impl Db for Program {}
-
-impl Database for Program {
-    fn runtime(&self) -> &DbRuntime {
-        self.jars.runtime()
-    }
-
-    fn runtime_mut(&mut self) -> &mut DbRuntime {
-        self.jars.runtime_mut()
-    }
-}
-
-impl ParallelDatabase for Program {
-    fn snapshot(&self) -> Snapshot<Self> {
-        Snapshot::new(Self {
-            jars: self.jars.snapshot(),
-            files: self.files.clone(),
-            workspace: self.workspace.clone(),
-        })
-    }
-}
-
-impl HasJars for Program {
-    type Jars = (SourceJar, SemanticJar, LintJar, FormatJar);
-
-    fn jars(&self) -> QueryResult<&Self::Jars> {
-        self.jars.jars()
-    }
-
-    fn jars_mut(&mut self) -> &mut Self::Jars {
-        self.jars.jars_mut()
-    }
-}
-
-impl HasJar<SourceJar> for Program {
-    fn jar(&self) -> QueryResult<&SourceJar> {
-        Ok(&self.jars()?.0)
-    }
-
-    fn jar_mut(&mut self) -> &mut SourceJar {
-        &mut self.jars_mut().0
-    }
-}
-
-impl HasJar<SemanticJar> for Program {
-    fn jar(&self) -> QueryResult<&SemanticJar> {
-        Ok(&self.jars()?.1)
-    }
-
-    fn jar_mut(&mut self) -> &mut SemanticJar {
-        &mut self.jars_mut().1
-    }
-}
-
-impl HasJar<LintJar> for Program {
-    fn jar(&self) -> QueryResult<&LintJar> {
-        Ok(&self.jars()?.2)
-    }
-
-    fn jar_mut(&mut self) -> &mut LintJar {
-        &mut self.jars_mut().2
-    }
-}
-
-impl HasJar<FormatJar> for Program {
-    fn jar(&self) -> QueryResult<&FormatJar> {
-        Ok(&self.jars()?.3)
-    }
-
-    fn jar_mut(&mut self) -> &mut FormatJar {
-        &mut self.jars_mut().3
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-pub struct FileChange {
-    id: FileId,
-    kind: FileChangeKind,
-}
-
-impl FileChange {
-    pub fn new(file_id: FileId, kind: FileChangeKind) -> Self {
-        Self { id: file_id, kind }
-    }
-
-    pub fn file_id(&self) -> FileId {
-        self.id
-    }
-
-    pub fn kind(&self) -> FileChangeKind {
-        self.kind
-    }
-}
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
-pub enum FileChangeKind {
-    Created,
-    Modified,
-    Deleted,
-}

crates/red_knot/src/source.rs

@@ -1,96 +0,0 @@
-use crate::cache::KeyValueCache;
-use crate::db::{HasJar, QueryResult, SourceDb, SourceJar};
-use ruff_notebook::Notebook;
-use ruff_python_ast::PySourceType;
-use std::ops::{Deref, DerefMut};
-use std::sync::Arc;
-
-use crate::files::FileId;
-
-#[tracing::instrument(level = "debug", skip(db))]
-pub(crate) fn source_text<Db>(db: &Db, file_id: FileId) -> QueryResult<Source>
-where
-    Db: SourceDb + HasJar<SourceJar>,
-{
-    let sources = &db.jar()?.sources;
-
-    sources.get(&file_id, |file_id| {
-        let path = db.file_path(*file_id);
-
-        let source_text = std::fs::read_to_string(&path).unwrap_or_else(|err| {
-            tracing::error!("Failed to read file '{path:?}: {err}'. Falling back to empty text");
-            String::new()
-        });
-
-        let python_ty = PySourceType::from(&path);
-
-        let kind = match python_ty {
-            PySourceType::Python => {
-                SourceKind::Python(Arc::from(source_text))
-            }
-            PySourceType::Stub => SourceKind::Stub(Arc::from(source_text)),
-            PySourceType::Ipynb => {
-                let notebook = Notebook::from_source_code(&source_text).unwrap_or_else(|err| {
-                    // TODO should this be changed to never fail?
-                    // or should we instead add a diagnostic somewhere? But what would we return in this case?
-                    tracing::error!(
-                        "Failed to parse notebook '{path:?}: {err}'. Falling back to an empty notebook"
-                    );
-                    Notebook::from_source_code("").unwrap()
-                });
-
-                SourceKind::IpyNotebook(Arc::new(notebook))
-            }
-        };
-
-        Ok(Source { kind })
-    })
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum SourceKind {
-    Python(Arc<str>),
-    Stub(Arc<str>),
-    IpyNotebook(Arc<Notebook>),
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct Source {
-    kind: SourceKind,
-}
-
-impl Source {
-    pub fn python<T: Into<Arc<str>>>(source: T) -> Self {
-        Self {
-            kind: SourceKind::Python(source.into()),
-        }
-    }
-    pub fn kind(&self) -> &SourceKind {
-        &self.kind
-    }
-
-    pub fn text(&self) -> &str {
-        match &self.kind {
-            SourceKind::Python(text) => text,
-            SourceKind::Stub(text) => text,
-            SourceKind::IpyNotebook(notebook) => notebook.source_code(),
-        }
-    }
-}
-
-#[derive(Debug, Default)]
-pub struct SourceStorage(pub(crate) KeyValueCache<FileId, Source>);
-
-impl Deref for SourceStorage {
-    type Target = KeyValueCache<FileId, Source>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for SourceStorage {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}

crates/red_knot/src/symbols.rs

@@ -1,939 +0,0 @@
-#![allow(dead_code)]
-
-use std::hash::{Hash, Hasher};
-use std::iter::{Copied, DoubleEndedIterator, FusedIterator};
-use std::num::NonZeroU32;
-use std::ops::{Deref, DerefMut};
-use std::sync::Arc;
-
-use bitflags::bitflags;
-use hashbrown::hash_map::{Keys, RawEntryMut};
-use rustc_hash::{FxHashMap, FxHasher};
-
-use ruff_index::{newtype_index, IndexVec};
-use ruff_python_ast as ast;
-use ruff_python_ast::visitor::preorder::PreorderVisitor;
-
-use crate::ast_ids::TypedNodeKey;
-use crate::cache::KeyValueCache;
-use crate::db::{HasJar, QueryResult, SemanticDb, SemanticJar};
-use crate::files::FileId;
-use crate::module::ModuleName;
-use crate::Name;
-
-#[allow(unreachable_pub)]
-#[tracing::instrument(level = "debug", skip(db))]
-pub fn symbol_table<Db>(db: &Db, file_id: FileId) -> QueryResult<Arc<SymbolTable>>
-where
-    Db: SemanticDb + HasJar<SemanticJar>,
-{
-    let jar = db.jar()?;
-
-    jar.symbol_tables.get(&file_id, |_| {
-        let parsed = db.parse(file_id)?;
-        Ok(Arc::from(SymbolTable::from_ast(parsed.ast())))
-    })
-}
-
-type Map<K, V> = hashbrown::HashMap<K, V, ()>;
-
-#[newtype_index]
-pub(crate) struct ScopeId;
-
-impl ScopeId {
-    pub(crate) fn scope(self, table: &SymbolTable) -> &Scope {
-        &table.scopes_by_id[self]
-    }
-}
-
-#[newtype_index]
-pub struct SymbolId;
-
-impl SymbolId {
-    pub(crate) fn symbol(self, table: &SymbolTable) -> &Symbol {
-        &table.symbols_by_id[self]
-    }
-}
-
-#[derive(Copy, Clone, Debug, PartialEq)]
-pub(crate) enum ScopeKind {
-    Module,
-    Annotation,
-    Class,
-    Function,
-}
-
-#[derive(Debug)]
-pub(crate) struct Scope {
-    name: Name,
-    kind: ScopeKind,
-    child_scopes: Vec<ScopeId>,
-    // symbol IDs, hashed by symbol name
-    symbols_by_name: Map<SymbolId, ()>,
-}
-
-impl Scope {
-    pub(crate) fn name(&self) -> &str {
-        self.name.as_str()
-    }
-
-    pub(crate) fn kind(&self) -> ScopeKind {
-        self.kind
-    }
-}
-
-#[derive(Debug)]
-pub(crate) enum Kind {
-    FreeVar,
-    CellVar,
-    CellVarAssigned,
-    ExplicitGlobal,
-    ImplicitGlobal,
-}
-
-bitflags! {
-    #[derive(Copy,Clone,Debug)]
-    pub(crate) struct SymbolFlags: u8 {
-        const IS_USED         = 1 << 0;
-        const IS_DEFINED      = 1 << 1;
-        /// TODO: This flag is not yet set by anything
-        const MARKED_GLOBAL   = 1 << 2;
-        /// TODO: This flag is not yet set by anything
-        const MARKED_NONLOCAL = 1 << 3;
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct Symbol {
-    name: Name,
-    flags: SymbolFlags,
-    // kind: Kind,
-}
-
-impl Symbol {
-    pub(crate) fn name(&self) -> &str {
-        self.name.as_str()
-    }
-
-    /// Is the symbol used in its containing scope?
-    pub(crate) fn is_used(&self) -> bool {
-        self.flags.contains(SymbolFlags::IS_USED)
-    }
-
-    /// Is the symbol defined in its containing scope?
-    pub(crate) fn is_defined(&self) -> bool {
-        self.flags.contains(SymbolFlags::IS_DEFINED)
-    }
-
-    // TODO: implement Symbol.kind 2-pass analysis to categorize as: free-var, cell-var,
-    // explicit-global, implicit-global and implement Symbol.kind by modifying the preorder
-    // traversal code
-}
-
-// TODO storing TypedNodeKey for definitions means we have to search to find them again in the AST;
-// this is at best O(log n). If looking up definitions is a bottleneck we should look for
-// alternatives here.
-#[derive(Clone, Debug)]
-pub(crate) enum Definition {
-    // For the import cases, we don't need reference to any arbitrary AST subtrees (annotations,
-    // RHS), and referencing just the import statement node is imprecise (a single import statement
-    // can assign many symbols, we'd have to re-search for the one we care about), so we just copy
-    // the small amount of information we need from the AST.
-    Import(ImportDefinition),
-    ImportFrom(ImportFromDefinition),
-    ClassDef(TypedNodeKey<ast::StmtClassDef>),
-    FunctionDef(TypedNodeKey<ast::StmtFunctionDef>),
-    Assignment(TypedNodeKey<ast::StmtAssign>),
-    AnnotatedAssignment(TypedNodeKey<ast::StmtAnnAssign>),
-    // TODO with statements, except handlers, function args...
-}
-
-#[derive(Clone, Debug)]
-pub(crate) struct ImportDefinition {
-    pub(crate) module: ModuleName,
-}
-
-#[derive(Clone, Debug)]
-pub(crate) struct ImportFromDefinition {
-    pub(crate) module: Option<ModuleName>,
-    pub(crate) name: Name,
-    pub(crate) level: u32,
-}
-
-impl ImportFromDefinition {
-    pub(crate) fn module(&self) -> Option<&ModuleName> {
-        self.module.as_ref()
-    }
-
-    pub(crate) fn name(&self) -> &Name {
-        &self.name
-    }
-
-    pub(crate) fn level(&self) -> u32 {
-        self.level
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum Dependency {
-    Module(ModuleName),
-    Relative {
-        level: NonZeroU32,
-        module: Option<ModuleName>,
-    },
-}
-
-/// Table of all symbols in all scopes for a module.
-#[derive(Debug)]
-pub struct SymbolTable {
-    scopes_by_id: IndexVec<ScopeId, Scope>,
-    symbols_by_id: IndexVec<SymbolId, Symbol>,
-    defs: FxHashMap<SymbolId, Vec<Definition>>,
-    dependencies: Vec<Dependency>,
-}
-
-impl SymbolTable {
-    pub(crate) fn from_ast(module: &ast::ModModule) -> Self {
-        let root_scope_id = SymbolTable::root_scope_id();
-        let mut builder = SymbolTableBuilder {
-            table: SymbolTable::new(),
-            scopes: vec![root_scope_id],
-            current_definition: None,
-        };
-        builder.visit_body(&module.body);
-        builder.table
-    }
-
-    pub(crate) fn new() -> Self {
-        let mut table = SymbolTable {
-            scopes_by_id: IndexVec::new(),
-            symbols_by_id: IndexVec::new(),
-            defs: FxHashMap::default(),
-            dependencies: Vec::new(),
-        };
-        table.scopes_by_id.push(Scope {
-            name: Name::new("<module>"),
-            kind: ScopeKind::Module,
-            child_scopes: Vec::new(),
-            symbols_by_name: Map::default(),
-        });
-        table
-    }
-
-    pub(crate) fn dependencies(&self) -> &[Dependency] {
-        &self.dependencies
-    }
-
-    pub(crate) const fn root_scope_id() -> ScopeId {
-        ScopeId::from_usize(0)
-    }
-
-    pub(crate) fn root_scope(&self) -> &Scope {
-        &self.scopes_by_id[SymbolTable::root_scope_id()]
-    }
-
-    pub(crate) fn symbol_ids_for_scope(&self, scope_id: ScopeId) -> Copied<Keys<SymbolId, ()>> {
-        self.scopes_by_id[scope_id].symbols_by_name.keys().copied()
-    }
-
-    pub(crate) fn symbols_for_scope(
-        &self,
-        scope_id: ScopeId,
-    ) -> SymbolIterator<Copied<Keys<SymbolId, ()>>> {
-        SymbolIterator {
-            table: self,
-            ids: self.symbol_ids_for_scope(scope_id),
-        }
-    }
-
-    pub(crate) fn root_symbol_ids(&self) -> Copied<Keys<SymbolId, ()>> {
-        self.symbol_ids_for_scope(SymbolTable::root_scope_id())
-    }
-
-    pub(crate) fn root_symbols(&self) -> SymbolIterator<Copied<Keys<SymbolId, ()>>> {
-        self.symbols_for_scope(SymbolTable::root_scope_id())
-    }
-
-    pub(crate) fn child_scope_ids_of(&self, scope_id: ScopeId) -> &[ScopeId] {
-        &self.scopes_by_id[scope_id].child_scopes
-    }
-
-    pub(crate) fn child_scopes_of(&self, scope_id: ScopeId) -> ScopeIterator<&[ScopeId]> {
-        ScopeIterator {
-            table: self,
-            ids: self.child_scope_ids_of(scope_id),
-        }
-    }
-
-    pub(crate) fn root_child_scope_ids(&self) -> &[ScopeId] {
-        self.child_scope_ids_of(SymbolTable::root_scope_id())
-    }
-
-    pub(crate) fn root_child_scopes(&self) -> ScopeIterator<&[ScopeId]> {
-        self.child_scopes_of(SymbolTable::root_scope_id())
-    }
-
-    pub(crate) fn symbol_id_by_name(&self, scope_id: ScopeId, name: &str) -> Option<SymbolId> {
-        let scope = &self.scopes_by_id[scope_id];
-        let hash = SymbolTable::hash_name(name);
-        let name = Name::new(name);
-        scope
-            .symbols_by_name
-            .raw_entry()
-            .from_hash(hash, |symid| self.symbols_by_id[*symid].name == name)
-            .map(|(symbol_id, ())| *symbol_id)
-    }
-
-    pub(crate) fn symbol_by_name(&self, scope_id: ScopeId, name: &str) -> Option<&Symbol> {
-        Some(&self.symbols_by_id[self.symbol_id_by_name(scope_id, name)?])
-    }
-
-    pub(crate) fn root_symbol_id_by_name(&self, name: &str) -> Option<SymbolId> {
-        self.symbol_id_by_name(SymbolTable::root_scope_id(), name)
-    }
-
-    pub(crate) fn root_symbol_by_name(&self, name: &str) -> Option<&Symbol> {
-        self.symbol_by_name(SymbolTable::root_scope_id(), name)
-    }
-
-    pub(crate) fn definitions(&self, symbol_id: SymbolId) -> &[Definition] {
-        self.defs
-            .get(&symbol_id)
-            .map(std::vec::Vec::as_slice)
-            .unwrap_or_default()
-    }
-
-    pub(crate) fn all_definitions(&self) -> impl Iterator<Item = (SymbolId, &Definition)> + '_ {
-        self.defs
-            .iter()
-            .flat_map(|(sym_id, defs)| defs.iter().map(move |def| (*sym_id, def)))
-    }
-
-    fn add_or_update_symbol(
-        &mut self,
-        scope_id: ScopeId,
-        name: &str,
-        flags: SymbolFlags,
-    ) -> SymbolId {
-        let hash = SymbolTable::hash_name(name);
-        let scope = &mut self.scopes_by_id[scope_id];
-        let name = Name::new(name);
-
-        let entry = scope
-            .symbols_by_name
-            .raw_entry_mut()
-            .from_hash(hash, |existing| self.symbols_by_id[*existing].name == name);
-
-        match entry {
-            RawEntryMut::Occupied(entry) => {
-                if let Some(symbol) = self.symbols_by_id.get_mut(*entry.key()) {
-                    symbol.flags.insert(flags);
-                };
-                *entry.key()
-            }
-            RawEntryMut::Vacant(entry) => {
-                let id = self.symbols_by_id.push(Symbol { name, flags });
-                entry.insert_with_hasher(hash, id, (), |_| hash);
-                id
-            }
-        }
-    }
-
-    fn add_child_scope(
-        &mut self,
-        parent_scope_id: ScopeId,
-        name: &str,
-        kind: ScopeKind,
-    ) -> ScopeId {
-        let new_scope_id = self.scopes_by_id.push(Scope {
-            name: Name::new(name),
-            kind,
-            child_scopes: Vec::new(),
-            symbols_by_name: Map::default(),
-        });
-        let parent_scope = &mut self.scopes_by_id[parent_scope_id];
-        parent_scope.child_scopes.push(new_scope_id);
-        new_scope_id
-    }
-
-    fn hash_name(name: &str) -> u64 {
-        let mut hasher = FxHasher::default();
-        name.hash(&mut hasher);
-        hasher.finish()
-    }
-}
-
-pub(crate) struct SymbolIterator<'a, I> {
-    table: &'a SymbolTable,
-    ids: I,
-}
-
-impl<'a, I> Iterator for SymbolIterator<'a, I>
-where
-    I: Iterator<Item = SymbolId>,
-{
-    type Item = &'a Symbol;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let id = self.ids.next()?;
-        Some(&self.table.symbols_by_id[id])
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.ids.size_hint()
-    }
-}
-
-impl<'a, I> FusedIterator for SymbolIterator<'a, I> where
-    I: Iterator<Item = SymbolId> + FusedIterator
-{
-}
-
-impl<'a, I> DoubleEndedIterator for SymbolIterator<'a, I>
-where
-    I: Iterator<Item = SymbolId> + DoubleEndedIterator,
-{
-    fn next_back(&mut self) -> Option<Self::Item> {
-        let id = self.ids.next_back()?;
-        Some(&self.table.symbols_by_id[id])
-    }
-}
-
-pub(crate) struct ScopeIterator<'a, I> {
-    table: &'a SymbolTable,
-    ids: I,
-}
-
-impl<'a, I> Iterator for ScopeIterator<'a, I>
-where
-    I: Iterator<Item = ScopeId>,
-{
-    type Item = &'a Scope;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let id = self.ids.next()?;
-        Some(&self.table.scopes_by_id[id])
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.ids.size_hint()
-    }
-}
-
-impl<'a, I> FusedIterator for ScopeIterator<'a, I> where I: Iterator<Item = ScopeId> + FusedIterator {}
-
-impl<'a, I> DoubleEndedIterator for ScopeIterator<'a, I>
-where
-    I: Iterator<Item = ScopeId> + DoubleEndedIterator,
-{
-    fn next_back(&mut self) -> Option<Self::Item> {
-        let id = self.ids.next_back()?;
-        Some(&self.table.scopes_by_id[id])
-    }
-}
-
-struct SymbolTableBuilder {
-    table: SymbolTable,
-    scopes: Vec<ScopeId>,
-    /// the definition whose target(s) we are currently walking
-    current_definition: Option<Definition>,
-}
-
-impl SymbolTableBuilder {
-    fn add_or_update_symbol(&mut self, identifier: &str, flags: SymbolFlags) -> SymbolId {
-        self.table
-            .add_or_update_symbol(self.cur_scope(), identifier, flags)
-    }
-
-    fn add_or_update_symbol_with_def(
-        &mut self,
-        identifier: &str,
-        definition: Definition,
-    ) -> SymbolId {
-        let symbol_id = self.add_or_update_symbol(identifier, SymbolFlags::IS_DEFINED);
-        self.table
-            .defs
-            .entry(symbol_id)
-            .or_default()
-            .push(definition);
-        symbol_id
-    }
-
-    fn push_scope(&mut self, child_of: ScopeId, name: &str, kind: ScopeKind) -> ScopeId {
-        let scope_id = self.table.add_child_scope(child_of, name, kind);
-        self.scopes.push(scope_id);
-        scope_id
-    }
-
-    fn pop_scope(&mut self) -> ScopeId {
-        self.scopes
-            .pop()
-            .expect("Scope stack should never be empty")
-    }
-
-    fn cur_scope(&self) -> ScopeId {
-        *self
-            .scopes
-            .last()
-            .expect("Scope stack should never be empty")
-    }
-
-    fn with_type_params(
-        &mut self,
-        name: &str,
-        params: &Option<Box<ast::TypeParams>>,
-        nested: impl FnOnce(&mut Self),
-    ) {
-        if let Some(type_params) = params {
-            self.push_scope(self.cur_scope(), name, ScopeKind::Annotation);
-            for type_param in &type_params.type_params {
-                let name = match type_param {
-                    ast::TypeParam::TypeVar(ast::TypeParamTypeVar { name, .. }) => name,
-                    ast::TypeParam::ParamSpec(ast::TypeParamParamSpec { name, .. }) => name,
-                    ast::TypeParam::TypeVarTuple(ast::TypeParamTypeVarTuple { name, .. }) => name,
-                };
-                self.add_or_update_symbol(name, SymbolFlags::IS_DEFINED);
-            }
-        }
-        nested(self);
-        if params.is_some() {
-            self.pop_scope();
-        }
-    }
-}
-
-impl PreorderVisitor<'_> for SymbolTableBuilder {
-    fn visit_expr(&mut self, expr: &ast::Expr) {
-        if let ast::Expr::Name(ast::ExprName { id, ctx, .. }) = expr {
-            let flags = match ctx {
-                ast::ExprContext::Load => SymbolFlags::IS_USED,
-                ast::ExprContext::Store => SymbolFlags::IS_DEFINED,
-                ast::ExprContext::Del => SymbolFlags::IS_DEFINED,
-                ast::ExprContext::Invalid => SymbolFlags::empty(),
-            };
-            self.add_or_update_symbol(id, flags);
-            if flags.contains(SymbolFlags::IS_DEFINED) {
-                if let Some(curdef) = self.current_definition.clone() {
-                    self.add_or_update_symbol_with_def(id, curdef);
-                }
-            }
-        }
-        ast::visitor::preorder::walk_expr(self, expr);
-    }
-
-    fn visit_stmt(&mut self, stmt: &ast::Stmt) {
-        // TODO need to capture more definition statements here
-        match stmt {
-            ast::Stmt::ClassDef(node) => {
-                let def = Definition::ClassDef(TypedNodeKey::from_node(node));
-                self.add_or_update_symbol_with_def(&node.name, def);
-                self.with_type_params(&node.name, &node.type_params, |builder| {
-                    builder.push_scope(builder.cur_scope(), &node.name, ScopeKind::Class);
-                    ast::visitor::preorder::walk_stmt(builder, stmt);
-                    builder.pop_scope();
-                });
-            }
-            ast::Stmt::FunctionDef(node) => {
-                let def = Definition::FunctionDef(TypedNodeKey::from_node(node));
-                self.add_or_update_symbol_with_def(&node.name, def);
-                self.with_type_params(&node.name, &node.type_params, |builder| {
-                    builder.push_scope(builder.cur_scope(), &node.name, ScopeKind::Function);
-                    ast::visitor::preorder::walk_stmt(builder, stmt);
-                    builder.pop_scope();
-                });
-            }
-            ast::Stmt::Import(ast::StmtImport { names, .. }) => {
-                for alias in names {
-                    let symbol_name = if let Some(asname) = &alias.asname {
-                        asname.id.as_str()
-                    } else {
-                        alias.name.id.split('.').next().unwrap()
-                    };
-
-                    let module = ModuleName::new(&alias.name.id);
-
-                    let def = Definition::Import(ImportDefinition {
-                        module: module.clone(),
-                    });
-                    self.add_or_update_symbol_with_def(symbol_name, def);
-                    self.table.dependencies.push(Dependency::Module(module));
-                }
-            }
-            ast::Stmt::ImportFrom(ast::StmtImportFrom {
-                module,
-                names,
-                level,
-                ..
-            }) => {
-                let module = module.as_ref().map(|m| ModuleName::new(&m.id));
-
-                for alias in names {
-                    let symbol_name = if let Some(asname) = &alias.asname {
-                        asname.id.as_str()
-                    } else {
-                        alias.name.id.as_str()
-                    };
-                    let def = Definition::ImportFrom(ImportFromDefinition {
-                        module: module.clone(),
-                        name: Name::new(&alias.name.id),
-                        level: *level,
-                    });
-                    self.add_or_update_symbol_with_def(symbol_name, def);
-                }
-
-                let dependency = if let Some(module) = module {
-                    match NonZeroU32::new(*level) {
-                        Some(level) => Dependency::Relative {
-                            level,
-                            module: Some(module),
-                        },
-                        None => Dependency::Module(module),
-                    }
-                } else {
-                    Dependency::Relative {
-                        level: NonZeroU32::new(*level)
-                            .expect("Import without a module to have a level > 0"),
-                        module,
-                    }
-                };
-
-                self.table.dependencies.push(dependency);
-            }
-            ast::Stmt::Assign(node) => {
-                debug_assert!(self.current_definition.is_none());
-                self.current_definition =
-                    Some(Definition::Assignment(TypedNodeKey::from_node(node)));
-                ast::visitor::preorder::walk_stmt(self, stmt);
-                self.current_definition = None;
-            }
-            _ => {
-                ast::visitor::preorder::walk_stmt(self, stmt);
-            }
-        }
-    }
-}
-
-#[derive(Debug, Default)]
-pub struct SymbolTablesStorage(KeyValueCache<FileId, Arc<SymbolTable>>);
-
-impl Deref for SymbolTablesStorage {
-    type Target = KeyValueCache<FileId, Arc<SymbolTable>>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for SymbolTablesStorage {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use textwrap::dedent;
-
-    use crate::parse::Parsed;
-    use crate::symbols::ScopeKind;
-
-    use super::{SymbolFlags, SymbolId, SymbolIterator, SymbolTable};
-
-    mod from_ast {
-        use super::*;
-
-        fn parse(code: &str) -> Parsed {
-            Parsed::from_text(&dedent(code))
-        }
-
-        fn names<I>(it: SymbolIterator<I>) -> Vec<&str>
-        where
-            I: Iterator<Item = SymbolId>,
-        {
-            let mut symbols: Vec<_> = it.map(|sym| sym.name.as_str()).collect();
-            symbols.sort_unstable();
-            symbols
-        }
-
-        #[test]
-        fn empty() {
-            let parsed = parse("");
-            let table = SymbolTable::from_ast(parsed.ast());
-            assert_eq!(names(table.root_symbols()).len(), 0);
-        }
-
-        #[test]
-        fn simple() {
-            let parsed = parse("x");
-            let table = SymbolTable::from_ast(parsed.ast());
-            assert_eq!(names(table.root_symbols()), vec!["x"]);
-            assert_eq!(
-                table
-                    .definitions(table.root_symbol_id_by_name("x").unwrap())
-                    .len(),
-                0
-            );
-        }
-
-        #[test]
-        fn annotation_only() {
-            let parsed = parse("x: int");
-            let table = SymbolTable::from_ast(parsed.ast());
-            assert_eq!(names(table.root_symbols()), vec!["int", "x"]);
-            // TODO record definition
-        }
-
-        #[test]
-        fn import() {
-            let parsed = parse("import foo");
-            let table = SymbolTable::from_ast(parsed.ast());
-            assert_eq!(names(table.root_symbols()), vec!["foo"]);
-            assert_eq!(
-                table
-                    .definitions(table.root_symbol_id_by_name("foo").unwrap())
-                    .len(),
-                1
-            );
-        }
-
-        #[test]
-        fn import_sub() {
-            let parsed = parse("import foo.bar");
-            let table = SymbolTable::from_ast(parsed.ast());
-            assert_eq!(names(table.root_symbols()), vec!["foo"]);
-        }
-
-        #[test]
-        fn import_as() {
-            let parsed = parse("import foo.bar as baz");
-            let table = SymbolTable::from_ast(parsed.ast());
-            assert_eq!(names(table.root_symbols()), vec!["baz"]);
-        }
-
-        #[test]
-        fn import_from() {
-            let parsed = parse("from bar import foo");
-            let table = SymbolTable::from_ast(parsed.ast());
-            assert_eq!(names(table.root_symbols()), vec!["foo"]);
-            assert_eq!(
-                table
-                    .definitions(table.root_symbol_id_by_name("foo").unwrap())
-                    .len(),
-                1
-            );
-            assert!(
-                table.root_symbol_id_by_name("foo").is_some_and(|sid| {
-                    let s = sid.symbol(&table);
-                    s.is_defined() || !s.is_used()
-                }),
-                "symbols that are defined get the defined flag"
-            );
-        }
-
-        #[test]
-        fn assign() {
-            let parsed = parse("x = foo");
-            let table = SymbolTable::from_ast(parsed.ast());
-            assert_eq!(names(table.root_symbols()), vec!["foo", "x"]);
-            assert_eq!(
-                table
-                    .definitions(table.root_symbol_id_by_name("x").unwrap())
-                    .len(),
-                1
-            );
-            assert!(
-                table.root_symbol_id_by_name("foo").is_some_and(|sid| {
-                    let s = sid.symbol(&table);
-                    !s.is_defined() && s.is_used()
-                }),
-                "a symbol used but not defined in a scope should have only the used flag"
-            );
-        }
-
-        #[test]
-        fn class_scope() {
-            let parsed = parse(
-                "
-                class C:
-                    x = 1
-                y = 2
-                ",
-            );
-            let table = SymbolTable::from_ast(parsed.ast());
-            assert_eq!(names(table.root_symbols()), vec!["C", "y"]);
-            let scopes = table.root_child_scope_ids();
-            assert_eq!(scopes.len(), 1);
-            let c_scope = scopes[0].scope(&table);
-            assert_eq!(c_scope.kind(), ScopeKind::Class);
-            assert_eq!(c_scope.name(), "C");
-            assert_eq!(names(table.symbols_for_scope(scopes[0])), vec!["x"]);
-            assert_eq!(
-                table
-                    .definitions(table.root_symbol_id_by_name("C").unwrap())
-                    .len(),
-                1
-            );
-        }
-
-        #[test]
-        fn func_scope() {
-            let parsed = parse(
-                "
-                def func():
-                    x = 1
-                y = 2
-                ",
-            );
-            let table = SymbolTable::from_ast(parsed.ast());
-            assert_eq!(names(table.root_symbols()), vec!["func", "y"]);
-            let scopes = table.root_child_scope_ids();
-            assert_eq!(scopes.len(), 1);
-            let func_scope = scopes[0].scope(&table);
-            assert_eq!(func_scope.kind(), ScopeKind::Function);
-            assert_eq!(func_scope.name(), "func");
-            assert_eq!(names(table.symbols_for_scope(scopes[0])), vec!["x"]);
-            assert_eq!(
-                table
-                    .definitions(table.root_symbol_id_by_name("func").unwrap())
-                    .len(),
-                1
-            );
-        }
-
-        #[test]
-        fn dupes() {
-            let parsed = parse(
-                "
-                def func():
-                    x = 1
-                def func():
-                    y = 2
-                ",
-            );
-            let table = SymbolTable::from_ast(parsed.ast());
-            assert_eq!(names(table.root_symbols()), vec!["func"]);
-            let scopes = table.root_child_scope_ids();
-            assert_eq!(scopes.len(), 2);
-            let func_scope_1 = scopes[0].scope(&table);
-            let func_scope_2 = scopes[1].scope(&table);
-            assert_eq!(func_scope_1.kind(), ScopeKind::Function);
-            assert_eq!(func_scope_1.name(), "func");
-            assert_eq!(func_scope_2.kind(), ScopeKind::Function);
-            assert_eq!(func_scope_2.name(), "func");
-            assert_eq!(names(table.symbols_for_scope(scopes[0])), vec!["x"]);
-            assert_eq!(names(table.symbols_for_scope(scopes[1])), vec!["y"]);
-            assert_eq!(
-                table
-                    .definitions(table.root_symbol_id_by_name("func").unwrap())
-                    .len(),
-                2
-            );
-        }
-
-        #[test]
-        fn generic_func() {
-            let parsed = parse(
-                "
-                def func[T]():
-                    x = 1
-                ",
-            );
-            let table = SymbolTable::from_ast(parsed.ast());
-            assert_eq!(names(table.root_symbols()), vec!["func"]);
-            let scopes = table.root_child_scope_ids();
-            assert_eq!(scopes.len(), 1);
-            let ann_scope_id = scopes[0];
-            let ann_scope = ann_scope_id.scope(&table);
-            assert_eq!(ann_scope.kind(), ScopeKind::Annotation);
-            assert_eq!(ann_scope.name(), "func");
-            assert_eq!(names(table.symbols_for_scope(ann_scope_id)), vec!["T"]);
-            let scopes = table.child_scope_ids_of(ann_scope_id);
-            assert_eq!(scopes.len(), 1);
-            let func_scope_id = scopes[0];
-            let func_scope = func_scope_id.scope(&table);
-            assert_eq!(func_scope.kind(), ScopeKind::Function);
-            assert_eq!(func_scope.name(), "func");
-            assert_eq!(names(table.symbols_for_scope(func_scope_id)), vec!["x"]);
-        }
-
-        #[test]
-        fn generic_class() {
-            let parsed = parse(
-                "
-                class C[T]:
-                    x = 1
-                ",
-            );
-            let table = SymbolTable::from_ast(parsed.ast());
-            assert_eq!(names(table.root_symbols()), vec!["C"]);
-            let scopes = table.root_child_scope_ids();
-            assert_eq!(scopes.len(), 1);
-            let ann_scope_id = scopes[0];
-            let ann_scope = ann_scope_id.scope(&table);
-            assert_eq!(ann_scope.kind(), ScopeKind::Annotation);
-            assert_eq!(ann_scope.name(), "C");
-            assert_eq!(names(table.symbols_for_scope(ann_scope_id)), vec!["T"]);
-            assert!(
-                table
-                    .symbol_by_name(ann_scope_id, "T")
-                    .is_some_and(|s| s.is_defined() && !s.is_used()),
-                "type parameters are defined by the scope that introduces them"
-            );
-            let scopes = table.child_scope_ids_of(ann_scope_id);
-            assert_eq!(scopes.len(), 1);
-            let func_scope_id = scopes[0];
-            let func_scope = func_scope_id.scope(&table);
-            assert_eq!(func_scope.kind(), ScopeKind::Class);
-            assert_eq!(func_scope.name(), "C");
-            assert_eq!(names(table.symbols_for_scope(func_scope_id)), vec!["x"]);
-        }
-    }
-
-    #[test]
-    fn insert_same_name_symbol_twice() {
-        let mut table = SymbolTable::new();
-        let root_scope_id = SymbolTable::root_scope_id();
-        let symbol_id_1 = table.add_or_update_symbol(root_scope_id, "foo", SymbolFlags::IS_DEFINED);
-        let symbol_id_2 = table.add_or_update_symbol(root_scope_id, "foo", SymbolFlags::IS_USED);
-        assert_eq!(symbol_id_1, symbol_id_2);
-        assert!(symbol_id_1.symbol(&table).is_used(), "flags must merge");
-        assert!(symbol_id_1.symbol(&table).is_defined(), "flags must merge");
-    }
-
-    #[test]
-    fn insert_different_named_symbols() {
-        let mut table = SymbolTable::new();
-        let root_scope_id = SymbolTable::root_scope_id();
-        let symbol_id_1 = table.add_or_update_symbol(root_scope_id, "foo", SymbolFlags::empty());
-        let symbol_id_2 = table.add_or_update_symbol(root_scope_id, "bar", SymbolFlags::empty());
-        assert_ne!(symbol_id_1, symbol_id_2);
-    }
-
-    #[test]
-    fn add_child_scope_with_symbol() {
-        let mut table = SymbolTable::new();
-        let root_scope_id = SymbolTable::root_scope_id();
-        let foo_symbol_top = table.add_or_update_symbol(root_scope_id, "foo", SymbolFlags::empty());
-        let c_scope = table.add_child_scope(root_scope_id, "C", ScopeKind::Class);
-        let foo_symbol_inner = table.add_or_update_symbol(c_scope, "foo", SymbolFlags::empty());
-        assert_ne!(foo_symbol_top, foo_symbol_inner);
-    }
-
-    #[test]
-    fn scope_from_id() {
-        let table = SymbolTable::new();
-        let root_scope_id = SymbolTable::root_scope_id();
-        let scope = root_scope_id.scope(&table);
-        assert_eq!(scope.name.as_str(), "<module>");
-        assert_eq!(scope.kind, ScopeKind::Module);
-    }
-
-    #[test]
-    fn symbol_from_id() {
-        let mut table = SymbolTable::new();
-        let root_scope_id = SymbolTable::root_scope_id();
-        let foo_symbol_id = table.add_or_update_symbol(root_scope_id, "foo", SymbolFlags::empty());
-        let symbol = foo_symbol_id.symbol(&table);
-        assert_eq!(symbol.name.as_str(), "foo");
-    }
-}

crates/red_knot/src/types.rs

@@ -1,560 +0,0 @@
-#![allow(dead_code)]
-use crate::ast_ids::NodeKey;
-use crate::files::FileId;
-use crate::symbols::SymbolId;
-use crate::{FxDashMap, FxIndexSet, Name};
-use ruff_index::{newtype_index, IndexVec};
-use rustc_hash::FxHashMap;
-
-pub(crate) mod infer;
-
-pub(crate) use infer::infer_symbol_type;
-
-/// unique ID for a type
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum Type {
-    /// the dynamic or gradual type: a statically-unknown set of values
-    Any,
-    /// the empty set of values
-    Never,
-    /// unknown type (no annotation)
-    /// equivalent to Any, or to object in strict mode
-    Unknown,
-    /// name is not bound to any value
-    Unbound,
-    /// a specific function object
-    Function(FunctionTypeId),
-    /// a specific class object
-    Class(ClassTypeId),
-    /// the set of Python objects with the given class in their __class__'s method resolution order
-    Instance(ClassTypeId),
-    Union(UnionTypeId),
-    Intersection(IntersectionTypeId),
-    // TODO protocols, callable types, overloads, generics, type vars
-}
-
-impl Type {
-    fn display<'a>(&'a self, store: &'a TypeStore) -> DisplayType<'a> {
-        DisplayType { ty: self, store }
-    }
-
-    pub const fn is_unbound(&self) -> bool {
-        matches!(self, Type::Unbound)
-    }
-
-    pub const fn is_unknown(&self) -> bool {
-        matches!(self, Type::Unknown)
-    }
-}
-
-impl From<FunctionTypeId> for Type {
-    fn from(id: FunctionTypeId) -> Self {
-        Type::Function(id)
-    }
-}
-
-impl From<UnionTypeId> for Type {
-    fn from(id: UnionTypeId) -> Self {
-        Type::Union(id)
-    }
-}
-
-impl From<IntersectionTypeId> for Type {
-    fn from(id: IntersectionTypeId) -> Self {
-        Type::Intersection(id)
-    }
-}
-
-// TODO: currently calling `get_function` et al and holding on to the `FunctionTypeRef` will lock a
-// shard of this dashmap, for as long as you hold the reference. This may be a problem. We could
-// switch to having all the arenas hold Arc, or we could see if we can split up ModuleTypeStore,
-// and/or give it inner mutability and finer-grained internal locking.
-#[derive(Debug, Default)]
-pub struct TypeStore {
-    modules: FxDashMap<FileId, ModuleTypeStore>,
-}
-
-impl TypeStore {
-    pub fn remove_module(&mut self, file_id: FileId) {
-        self.modules.remove(&file_id);
-    }
-
-    pub fn cache_symbol_type(&self, file_id: FileId, symbol_id: SymbolId, ty: Type) {
-        self.add_or_get_module(file_id)
-            .symbol_types
-            .insert(symbol_id, ty);
-    }
-
-    pub fn cache_node_type(&self, file_id: FileId, node_key: NodeKey, ty: Type) {
-        self.add_or_get_module(file_id)
-            .node_types
-            .insert(node_key, ty);
-    }
-
-    pub fn get_cached_symbol_type(&self, file_id: FileId, symbol_id: SymbolId) -> Option<Type> {
-        self.try_get_module(file_id)?
-            .symbol_types
-            .get(&symbol_id)
-            .copied()
-    }
-
-    pub fn get_cached_node_type(&self, file_id: FileId, node_key: &NodeKey) -> Option<Type> {
-        self.try_get_module(file_id)?
-            .node_types
-            .get(node_key)
-            .copied()
-    }
-
-    fn add_or_get_module(&self, file_id: FileId) -> ModuleStoreRefMut {
-        self.modules
-            .entry(file_id)
-            .or_insert_with(|| ModuleTypeStore::new(file_id))
-    }
-
-    fn get_module(&self, file_id: FileId) -> ModuleStoreRef {
-        self.try_get_module(file_id).expect("module should exist")
-    }
-
-    fn try_get_module(&self, file_id: FileId) -> Option<ModuleStoreRef> {
-        self.modules.get(&file_id)
-    }
-
-    fn add_function(&self, file_id: FileId, name: &str) -> FunctionTypeId {
-        self.add_or_get_module(file_id).add_function(name)
-    }
-
-    fn add_class(&self, file_id: FileId, name: &str, bases: Vec<Type>) -> ClassTypeId {
-        self.add_or_get_module(file_id).add_class(name, bases)
-    }
-
-    fn add_union(&mut self, file_id: FileId, elems: &[Type]) -> UnionTypeId {
-        self.add_or_get_module(file_id).add_union(elems)
-    }
-
-    fn add_intersection(
-        &mut self,
-        file_id: FileId,
-        positive: &[Type],
-        negative: &[Type],
-    ) -> IntersectionTypeId {
-        self.add_or_get_module(file_id)
-            .add_intersection(positive, negative)
-    }
-
-    fn get_function(&self, id: FunctionTypeId) -> FunctionTypeRef {
-        FunctionTypeRef {
-            module_store: self.get_module(id.file_id),
-            function_id: id.func_id,
-        }
-    }
-
-    fn get_class(&self, id: ClassTypeId) -> ClassTypeRef {
-        ClassTypeRef {
-            module_store: self.get_module(id.file_id),
-            class_id: id.class_id,
-        }
-    }
-
-    fn get_union(&self, id: UnionTypeId) -> UnionTypeRef {
-        UnionTypeRef {
-            module_store: self.get_module(id.file_id),
-            union_id: id.union_id,
-        }
-    }
-
-    fn get_intersection(&self, id: IntersectionTypeId) -> IntersectionTypeRef {
-        IntersectionTypeRef {
-            module_store: self.get_module(id.file_id),
-            intersection_id: id.intersection_id,
-        }
-    }
-}
-
-type ModuleStoreRef<'a> = dashmap::mapref::one::Ref<
-    'a,
-    FileId,
-    ModuleTypeStore,
-    std::hash::BuildHasherDefault<rustc_hash::FxHasher>,
->;
-
-type ModuleStoreRefMut<'a> = dashmap::mapref::one::RefMut<
-    'a,
-    FileId,
-    ModuleTypeStore,
-    std::hash::BuildHasherDefault<rustc_hash::FxHasher>,
->;
-
-#[derive(Debug)]
-pub(crate) struct FunctionTypeRef<'a> {
-    module_store: ModuleStoreRef<'a>,
-    function_id: ModuleFunctionTypeId,
-}
-
-impl<'a> std::ops::Deref for FunctionTypeRef<'a> {
-    type Target = FunctionType;
-
-    fn deref(&self) -> &Self::Target {
-        self.module_store.get_function(self.function_id)
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct ClassTypeRef<'a> {
-    module_store: ModuleStoreRef<'a>,
-    class_id: ModuleClassTypeId,
-}
-
-impl<'a> std::ops::Deref for ClassTypeRef<'a> {
-    type Target = ClassType;
-
-    fn deref(&self) -> &Self::Target {
-        self.module_store.get_class(self.class_id)
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct UnionTypeRef<'a> {
-    module_store: ModuleStoreRef<'a>,
-    union_id: ModuleUnionTypeId,
-}
-
-impl<'a> std::ops::Deref for UnionTypeRef<'a> {
-    type Target = UnionType;
-
-    fn deref(&self) -> &Self::Target {
-        self.module_store.get_union(self.union_id)
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct IntersectionTypeRef<'a> {
-    module_store: ModuleStoreRef<'a>,
-    intersection_id: ModuleIntersectionTypeId,
-}
-
-impl<'a> std::ops::Deref for IntersectionTypeRef<'a> {
-    type Target = IntersectionType;
-
-    fn deref(&self) -> &Self::Target {
-        self.module_store.get_intersection(self.intersection_id)
-    }
-}
-
-#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
-pub struct FunctionTypeId {
-    file_id: FileId,
-    func_id: ModuleFunctionTypeId,
-}
-
-#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
-pub struct ClassTypeId {
-    file_id: FileId,
-    class_id: ModuleClassTypeId,
-}
-
-#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
-pub struct UnionTypeId {
-    file_id: FileId,
-    union_id: ModuleUnionTypeId,
-}
-
-#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
-pub struct IntersectionTypeId {
-    file_id: FileId,
-    intersection_id: ModuleIntersectionTypeId,
-}
-
-#[newtype_index]
-struct ModuleFunctionTypeId;
-
-#[newtype_index]
-struct ModuleClassTypeId;
-
-#[newtype_index]
-struct ModuleUnionTypeId;
-
-#[newtype_index]
-struct ModuleIntersectionTypeId;
-
-#[derive(Debug)]
-struct ModuleTypeStore {
-    file_id: FileId,
-    /// arena of all function types defined in this module
-    functions: IndexVec<ModuleFunctionTypeId, FunctionType>,
-    /// arena of all class types defined in this module
-    classes: IndexVec<ModuleClassTypeId, ClassType>,
-    /// arenda of all union types created in this module
-    unions: IndexVec<ModuleUnionTypeId, UnionType>,
-    /// arena of all intersection types created in this module
-    intersections: IndexVec<ModuleIntersectionTypeId, IntersectionType>,
-    /// cached types of symbols in this module
-    symbol_types: FxHashMap<SymbolId, Type>,
-    /// cached types of AST nodes in this module
-    node_types: FxHashMap<NodeKey, Type>,
-}
-
-impl ModuleTypeStore {
-    fn new(file_id: FileId) -> Self {
-        Self {
-            file_id,
-            functions: IndexVec::default(),
-            classes: IndexVec::default(),
-            unions: IndexVec::default(),
-            intersections: IndexVec::default(),
-            symbol_types: FxHashMap::default(),
-            node_types: FxHashMap::default(),
-        }
-    }
-
-    fn add_function(&mut self, name: &str) -> FunctionTypeId {
-        let func_id = self.functions.push(FunctionType {
-            name: Name::new(name),
-        });
-        FunctionTypeId {
-            file_id: self.file_id,
-            func_id,
-        }
-    }
-
-    fn add_class(&mut self, name: &str, bases: Vec<Type>) -> ClassTypeId {
-        let class_id = self.classes.push(ClassType {
-            name: Name::new(name),
-            // TODO: if no bases are given, that should imply [object]
-            bases,
-        });
-        ClassTypeId {
-            file_id: self.file_id,
-            class_id,
-        }
-    }
-
-    fn add_union(&mut self, elems: &[Type]) -> UnionTypeId {
-        let union_id = self.unions.push(UnionType {
-            elements: elems.iter().copied().collect(),
-        });
-        UnionTypeId {
-            file_id: self.file_id,
-            union_id,
-        }
-    }
-
-    fn add_intersection(&mut self, positive: &[Type], negative: &[Type]) -> IntersectionTypeId {
-        let intersection_id = self.intersections.push(IntersectionType {
-            positive: positive.iter().copied().collect(),
-            negative: negative.iter().copied().collect(),
-        });
-        IntersectionTypeId {
-            file_id: self.file_id,
-            intersection_id,
-        }
-    }
-
-    fn get_function(&self, func_id: ModuleFunctionTypeId) -> &FunctionType {
-        &self.functions[func_id]
-    }
-
-    fn get_class(&self, class_id: ModuleClassTypeId) -> &ClassType {
-        &self.classes[class_id]
-    }
-
-    fn get_union(&self, union_id: ModuleUnionTypeId) -> &UnionType {
-        &self.unions[union_id]
-    }
-
-    fn get_intersection(&self, intersection_id: ModuleIntersectionTypeId) -> &IntersectionType {
-        &self.intersections[intersection_id]
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-struct DisplayType<'a> {
-    ty: &'a Type,
-    store: &'a TypeStore,
-}
-
-impl std::fmt::Display for DisplayType<'_> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self.ty {
-            Type::Any => f.write_str("Any"),
-            Type::Never => f.write_str("Never"),
-            Type::Unknown => f.write_str("Unknown"),
-            Type::Unbound => f.write_str("Unbound"),
-            // TODO functions and classes should display using a fully qualified name
-            Type::Class(class_id) => {
-                f.write_str("Literal[")?;
-                f.write_str(self.store.get_class(*class_id).name())?;
-                f.write_str("]")
-            }
-            Type::Instance(class_id) => f.write_str(self.store.get_class(*class_id).name()),
-            Type::Function(func_id) => f.write_str(self.store.get_function(*func_id).name()),
-            Type::Union(union_id) => self
-                .store
-                .get_module(union_id.file_id)
-                .get_union(union_id.union_id)
-                .display(f, self.store),
-            Type::Intersection(int_id) => self
-                .store
-                .get_module(int_id.file_id)
-                .get_intersection(int_id.intersection_id)
-                .display(f, self.store),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct ClassType {
-    name: Name,
-    bases: Vec<Type>,
-}
-
-impl ClassType {
-    fn name(&self) -> &str {
-        self.name.as_str()
-    }
-
-    fn bases(&self) -> &[Type] {
-        self.bases.as_slice()
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct FunctionType {
-    name: Name,
-}
-
-impl FunctionType {
-    fn name(&self) -> &str {
-        self.name.as_str()
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct UnionType {
-    // the union type includes values in any of these types
-    elements: FxIndexSet<Type>,
-}
-
-impl UnionType {
-    fn display(&self, f: &mut std::fmt::Formatter<'_>, store: &TypeStore) -> std::fmt::Result {
-        f.write_str("(")?;
-        let mut first = true;
-        for ty in &self.elements {
-            if !first {
-                f.write_str(" | ")?;
-            };
-            first = false;
-            write!(f, "{}", ty.display(store))?;
-        }
-        f.write_str(")")
-    }
-}
-
-// Negation types aren't expressible in annotations, and are most likely to arise from type
-// narrowing along with intersections (e.g. `if not isinstance(...)`), so we represent them
-// directly in intersections rather than as a separate type. This sacrifices some efficiency in the
-// case where a Not appears outside an intersection (unclear when that could even happen, but we'd
-// have to represent it as a single-element intersection if it did) in exchange for better
-// efficiency in the not-within-intersection case.
-#[derive(Debug)]
-pub(crate) struct IntersectionType {
-    // the intersection type includes only values in all of these types
-    positive: FxIndexSet<Type>,
-    // negated elements of the intersection, e.g.
-    negative: FxIndexSet<Type>,
-}
-
-impl IntersectionType {
-    fn display(&self, f: &mut std::fmt::Formatter<'_>, store: &TypeStore) -> std::fmt::Result {
-        f.write_str("(")?;
-        let mut first = true;
-        for (neg, ty) in self
-            .positive
-            .iter()
-            .map(|ty| (false, ty))
-            .chain(self.negative.iter().map(|ty| (true, ty)))
-        {
-            if !first {
-                f.write_str(" & ")?;
-            };
-            first = false;
-            if neg {
-                f.write_str("~")?;
-            };
-            write!(f, "{}", ty.display(store))?;
-        }
-        f.write_str(")")
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::files::Files;
-    use crate::types::{Type, TypeStore};
-    use crate::FxIndexSet;
-    use std::path::Path;
-
-    #[test]
-    fn add_class() {
-        let store = TypeStore::default();
-        let files = Files::default();
-        let file_id = files.intern(Path::new("/foo"));
-        let id = store.add_class(file_id, "C", Vec::new());
-        assert_eq!(store.get_class(id).name(), "C");
-        let inst = Type::Instance(id);
-        assert_eq!(format!("{}", inst.display(&store)), "C");
-    }
-
-    #[test]
-    fn add_function() {
-        let store = TypeStore::default();
-        let files = Files::default();
-        let file_id = files.intern(Path::new("/foo"));
-        let id = store.add_function(file_id, "func");
-        assert_eq!(store.get_function(id).name(), "func");
-        let func = Type::Function(id);
-        assert_eq!(format!("{}", func.display(&store)), "func");
-    }
-
-    #[test]
-    fn add_union() {
-        let mut store = TypeStore::default();
-        let files = Files::default();
-        let file_id = files.intern(Path::new("/foo"));
-        let c1 = store.add_class(file_id, "C1", Vec::new());
-        let c2 = store.add_class(file_id, "C2", Vec::new());
-        let elems = vec![Type::Instance(c1), Type::Instance(c2)];
-        let id = store.add_union(file_id, &elems);
-        assert_eq!(
-            store.get_union(id).elements,
-            elems.into_iter().collect::<FxIndexSet<_>>()
-        );
-        let union = Type::Union(id);
-        assert_eq!(format!("{}", union.display(&store)), "(C1 | C2)");
-    }
-
-    #[test]
-    fn add_intersection() {
-        let mut store = TypeStore::default();
-        let files = Files::default();
-        let file_id = files.intern(Path::new("/foo"));
-        let c1 = store.add_class(file_id, "C1", Vec::new());
-        let c2 = store.add_class(file_id, "C2", Vec::new());
-        let c3 = store.add_class(file_id, "C3", Vec::new());
-        let pos = vec![Type::Instance(c1), Type::Instance(c2)];
-        let neg = vec![Type::Instance(c3)];
-        let id = store.add_intersection(file_id, &pos, &neg);
-        assert_eq!(
-            store.get_intersection(id).positive,
-            pos.into_iter().collect::<FxIndexSet<_>>()
-        );
-        assert_eq!(
-            store.get_intersection(id).negative,
-            neg.into_iter().collect::<FxIndexSet<_>>()
-        );
-        let intersection = Type::Intersection(id);
-        assert_eq!(
-            format!("{}", intersection.display(&store)),
-            "(C1 & C2 & ~C3)"
-        );
-    }
-}

crates/red_knot/src/types/infer.rs

@@ -1,217 +0,0 @@
-#![allow(dead_code)]
-
-use ruff_python_ast::AstNode;
-
-use crate::db::{HasJar, QueryResult, SemanticDb, SemanticJar};
-use crate::module::ModuleName;
-use crate::symbols::{Definition, ImportFromDefinition, SymbolId};
-use crate::types::Type;
-use crate::FileId;
-use ruff_python_ast as ast;
-
-// FIXME: Figure out proper dead-lock free synchronisation now that this takes `&db` instead of `&mut db`.
-#[tracing::instrument(level = "trace", skip(db))]
-pub fn infer_symbol_type<Db>(db: &Db, file_id: FileId, symbol_id: SymbolId) -> QueryResult<Type>
-where
-    Db: SemanticDb + HasJar<SemanticJar>,
-{
-    let symbols = db.symbol_table(file_id)?;
-    let defs = symbols.definitions(symbol_id);
-
-    if let Some(ty) = db
-        .jar()?
-        .type_store
-        .get_cached_symbol_type(file_id, symbol_id)
-    {
-        return Ok(ty);
-    }
-
-    // TODO handle multiple defs, conditional defs...
-    assert_eq!(defs.len(), 1);
-    let type_store = &db.jar()?.type_store;
-
-    let ty = match &defs[0] {
-        Definition::ImportFrom(ImportFromDefinition {
-            module,
-            name,
-            level,
-        }) => {
-            // TODO relative imports
-            assert!(matches!(level, 0));
-            let module_name = ModuleName::new(module.as_ref().expect("TODO relative imports"));
-            if let Some(module) = db.resolve_module(module_name)? {
-                let remote_file_id = module.path(db)?.file();
-                let remote_symbols = db.symbol_table(remote_file_id)?;
-                if let Some(remote_symbol_id) = remote_symbols.root_symbol_id_by_name(name) {
-                    db.infer_symbol_type(remote_file_id, remote_symbol_id)?
-                } else {
-                    Type::Unknown
-                }
-            } else {
-                Type::Unknown
-            }
-        }
-        Definition::ClassDef(node_key) => {
-            if let Some(ty) = type_store.get_cached_node_type(file_id, node_key.erased()) {
-                ty
-            } else {
-                let parsed = db.parse(file_id)?;
-                let ast = parsed.ast();
-                let node = node_key.resolve_unwrap(ast.as_any_node_ref());
-
-                let mut bases = Vec::with_capacity(node.bases().len());
-
-                for base in node.bases() {
-                    bases.push(infer_expr_type(db, file_id, base)?);
-                }
-
-                let ty = Type::Class(type_store.add_class(file_id, &node.name.id, bases));
-                type_store.cache_node_type(file_id, *node_key.erased(), ty);
-                ty
-            }
-        }
-        Definition::FunctionDef(node_key) => {
-            if let Some(ty) = type_store.get_cached_node_type(file_id, node_key.erased()) {
-                ty
-            } else {
-                let parsed = db.parse(file_id)?;
-                let ast = parsed.ast();
-                let node = node_key
-                    .resolve(ast.as_any_node_ref())
-                    .expect("node key should resolve");
-
-                let ty = type_store.add_function(file_id, &node.name.id).into();
-                type_store.cache_node_type(file_id, *node_key.erased(), ty);
-                ty
-            }
-        }
-        Definition::Assignment(node_key) => {
-            let parsed = db.parse(file_id)?;
-            let ast = parsed.ast();
-            let node = node_key.resolve_unwrap(ast.as_any_node_ref());
-            // TODO handle unpacking assignment correctly
-            infer_expr_type(db, file_id, &node.value)?
-        }
-        _ => todo!("other kinds of definitions"),
-    };
-
-    type_store.cache_symbol_type(file_id, symbol_id, ty);
-
-    // TODO record dependencies
-    Ok(ty)
-}
-
-fn infer_expr_type<Db>(db: &Db, file_id: FileId, expr: &ast::Expr) -> QueryResult<Type>
-where
-    Db: SemanticDb + HasJar<SemanticJar>,
-{
-    // TODO cache the resolution of the type on the node
-    let symbols = db.symbol_table(file_id)?;
-    match expr {
-        ast::Expr::Name(name) => {
-            if let Some(symbol_id) = symbols.root_symbol_id_by_name(&name.id) {
-                db.infer_symbol_type(file_id, symbol_id)
-            } else {
-                Ok(Type::Unknown)
-            }
-        }
-        _ => todo!("full expression type resolution"),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::db::tests::TestDb;
-    use crate::db::{HasJar, SemanticDb, SemanticJar};
-    use crate::module::{ModuleName, ModuleSearchPath, ModuleSearchPathKind};
-    use crate::types::Type;
-
-    // TODO with virtual filesystem we shouldn't have to write files to disk for these
-    // tests
-
-    struct TestCase {
-        temp_dir: tempfile::TempDir,
-        db: TestDb,
-
-        src: ModuleSearchPath,
-    }
-
-    fn create_test() -> std::io::Result<TestCase> {
-        let temp_dir = tempfile::tempdir()?;
-
-        let src = temp_dir.path().join("src");
-        std::fs::create_dir(&src)?;
-        let src = ModuleSearchPath::new(src.canonicalize()?, ModuleSearchPathKind::FirstParty);
-
-        let roots = vec![src.clone()];
-
-        let mut db = TestDb::default();
-        db.set_module_search_paths(roots);
-
-        Ok(TestCase { temp_dir, db, src })
-    }
-
-    #[test]
-    fn follow_import_to_class() -> anyhow::Result<()> {
-        let case = create_test()?;
-        let db = &case.db;
-
-        let a_path = case.src.path().join("a.py");
-        let b_path = case.src.path().join("b.py");
-        std::fs::write(a_path, "from b import C as D; E = D")?;
-        std::fs::write(b_path, "class C: pass")?;
-        let a_file = db
-            .resolve_module(ModuleName::new("a"))?
-            .expect("module should be found")
-            .path(db)?
-            .file();
-        let a_syms = db.symbol_table(a_file)?;
-        let e_sym = a_syms
-            .root_symbol_id_by_name("E")
-            .expect("E symbol should be found");
-
-        let ty = db.infer_symbol_type(a_file, e_sym)?;
-
-        let jar = HasJar::<SemanticJar>::jar(db)?;
-        assert!(matches!(ty, Type::Class(_)));
-        assert_eq!(format!("{}", ty.display(&jar.type_store)), "Literal[C]");
-
-        Ok(())
-    }
-
-    #[test]
-    fn resolve_base_class_by_name() -> anyhow::Result<()> {
-        let case = create_test()?;
-        let db = &case.db;
-
-        let path = case.src.path().join("mod.py");
-        std::fs::write(path, "class Base: pass\nclass Sub(Base): pass")?;
-        let file = db
-            .resolve_module(ModuleName::new("mod"))?
-            .expect("module should be found")
-            .path(db)?
-            .file();
-        let syms = db.symbol_table(file)?;
-        let sym = syms
-            .root_symbol_id_by_name("Sub")
-            .expect("Sub symbol should be found");
-
-        let ty = db.infer_symbol_type(file, sym)?;
-
-        let Type::Class(class_id) = ty else {
-            panic!("Sub is not a Class")
-        };
-        let jar = HasJar::<SemanticJar>::jar(db)?;
-        let base_names: Vec<_> = jar
-            .type_store
-            .get_class(class_id)
-            .bases()
-            .iter()
-            .map(|base_ty| format!("{}", base_ty.display(&jar.type_store)))
-            .collect();
-
-        assert_eq!(base_names, vec!["Literal[Base]"]);
-
-        Ok(())
-    }
-}

crates/red_knot/src/watch.rs

@@ -1,78 +0,0 @@
-use anyhow::Context;
-use std::path::Path;
-
-use crate::files::Files;
-use crate::program::{FileChange, FileChangeKind};
-use notify::event::{CreateKind, RemoveKind};
-use notify::{recommended_watcher, Event, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
-
-pub struct FileWatcher {
-    watcher: RecommendedWatcher,
-}
-
-pub trait EventHandler: Send + 'static {
-    fn handle(&self, changes: Vec<FileChange>);
-}
-
-impl<F> EventHandler for F
-where
-    F: Fn(Vec<FileChange>) + Send + 'static,
-{
-    fn handle(&self, changes: Vec<FileChange>) {
-        let f = self;
-        f(changes);
-    }
-}
-
-impl FileWatcher {
-    pub fn new<E>(handler: E, files: Files) -> anyhow::Result<Self>
-    where
-        E: EventHandler,
-    {
-        Self::from_handler(Box::new(handler), files)
-    }
-
-    fn from_handler(handler: Box<dyn EventHandler>, files: Files) -> anyhow::Result<Self> {
-        let watcher = recommended_watcher(move |changes: notify::Result<Event>| {
-            match changes {
-                Ok(event) => {
-                    // TODO verify that this handles all events correctly
-                    let change_kind = match event.kind {
-                        EventKind::Create(CreateKind::File) => FileChangeKind::Created,
-                        EventKind::Modify(_) => FileChangeKind::Modified,
-                        EventKind::Remove(RemoveKind::File) => FileChangeKind::Deleted,
-                        _ => {
-                            return;
-                        }
-                    };
-
-                    let mut changes = Vec::new();
-
-                    for path in event.paths {
-                        if path.is_file() {
-                            let id = files.intern(&path);
-                            changes.push(FileChange::new(id, change_kind));
-                        }
-                    }
-
-                    if !changes.is_empty() {
-                        handler.handle(changes);
-                    }
-                }
-                // TODO proper error handling
-                Err(err) => {
-                    panic!("Error: {err}");
-                }
-            }
-        })
-        .context("Failed to create file watcher.")?;
-
-        Ok(Self { watcher })
-    }
-
-    pub fn watch_folder(&mut self, path: &Path) -> anyhow::Result<()> {
-        self.watcher.watch(path, RecursiveMode::Recursive)?;
-
-        Ok(())
-    }
-}

crates/ruff/Cargo.toml

@@ -1,79 +0,0 @@
-[package]
-name = "ruff"
-version = "0.4.2"
-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"
-default-run = "ruff"
-
-[dependencies]
-ruff_cache = { path = "../ruff_cache" }
-ruff_diagnostics = { path = "../ruff_diagnostics" }
-ruff_linter = { path = "../ruff_linter", features = ["clap"] }
-ruff_macros = { path = "../ruff_macros" }
-ruff_notebook = { path = "../ruff_notebook" }
-ruff_python_ast = { path = "../ruff_python_ast" }
-ruff_python_formatter = { path = "../ruff_python_formatter" }
-ruff_server = { path = "../ruff_server" }
-ruff_source_file = { path = "../ruff_source_file" }
-ruff_text_size = { path = "../ruff_text_size" }
-ruff_workspace = { path = "../ruff_workspace" }
-
-anyhow = { workspace = true }
-argfile = { workspace = true }
-bincode = { workspace = true }
-bitflags = { workspace = true }
-cachedir = { workspace = true }
-chrono = { workspace = true }
-clap = { workspace = true, features = ["derive", "env", "wrap_help"] }
-clap_complete_command = { workspace = true }
-clearscreen = { workspace = true }
-colored = { workspace = true }
-filetime = { workspace = true }
-ignore = { workspace = true }
-is-macro = { workspace = true }
-itertools = { workspace = true }
-log = { workspace = true }
-notify = { workspace = true }
-num_cpus = { workspace = true }
-path-absolutize = { workspace = true, features = ["once_cell_cache"] }
-rayon = { workspace = true }
-regex = { workspace = true }
-rustc-hash = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-shellexpand = { workspace = true }
-strum = { workspace = true, features = [] }
-tempfile = { workspace = true }
-thiserror = { workspace = true }
-toml = { workspace = true }
-tracing = { workspace = true, features = ["log"] }
-tracing-subscriber = { workspace = true, features = ["registry"] }
-tracing-tree = { workspace = true }
-walkdir = { workspace = true }
-wild = { workspace = true }
-
-[dev-dependencies]
-# Enable test rules during development
-ruff_linter = { path = "../ruff_linter", features = ["clap", "test-rules"] }
-# Avoid writing colored snapshots when running tests from the terminal
-colored = { workspace = true, features = ["no-color"] }
-insta = { workspace = true, features = ["filters", "json"] }
-insta-cmd = { workspace = true }
-tempfile = { workspace = true }
-test-case = { workspace = true }
-
-[target.'cfg(target_os = "windows")'.dependencies]
-mimalloc = { workspace = true }
-
-[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64")))'.dependencies]
-tikv-jemallocator = { workspace = true }
-
-[lints]
-workspace = true

crates/ruff/build.rs

@@ -1,80 +0,0 @@
-use std::{fs, path::Path, process::Command};
-
-fn main() {
-    // The workspace root directory is not available without walking up the tree
-    // https://github.com/rust-lang/cargo/issues/3946
-    let workspace_root = Path::new(&std::env::var("CARGO_MANIFEST_DIR").unwrap())
-        .join("..")
-        .join("..");
-
-    commit_info(&workspace_root);
-
-    #[allow(clippy::disallowed_methods)]
-    let target = std::env::var("TARGET").unwrap();
-    println!("cargo:rustc-env=RUST_HOST_TARGET={target}");
-}
-
-fn commit_info(workspace_root: &Path) {
-    // If not in a git repository, do not attempt to retrieve commit information
-    let git_dir = workspace_root.join(".git");
-    if !git_dir.exists() {
-        return;
-    }
-
-    let git_head_path = git_dir.join("HEAD");
-    println!(
-        "cargo:rerun-if-changed={}",
-        git_head_path.as_path().display()
-    );
-
-    let git_head_contents = fs::read_to_string(git_head_path);
-    if let Ok(git_head_contents) = git_head_contents {
-        // The contents are either a commit or a reference in the following formats
-        // - "<commit>" when the head is detached
-        // - "ref <ref>" when working on a branch
-        // If a commit, checking if the HEAD file has changed is sufficient
-        // If a ref, we need to add the head file for that ref to rebuild on commit
-        let mut git_ref_parts = git_head_contents.split_whitespace();
-        git_ref_parts.next();
-        if let Some(git_ref) = git_ref_parts.next() {
-            let git_ref_path = git_dir.join(git_ref);
-            println!(
-                "cargo:rerun-if-changed={}",
-                git_ref_path.as_path().display()
-            );
-        }
-    }
-
-    let output = match Command::new("git")
-        .arg("log")
-        .arg("-1")
-        .arg("--date=short")
-        .arg("--abbrev=9")
-        .arg("--format=%H %h %cd %(describe)")
-        .output()
-    {
-        Ok(output) if output.status.success() => output,
-        _ => return,
-    };
-    let stdout = String::from_utf8(output.stdout).unwrap();
-    let mut parts = stdout.split_whitespace();
-    let mut next = || parts.next().unwrap();
-    println!("cargo:rustc-env=RUFF_COMMIT_HASH={}", next());
-    println!("cargo:rustc-env=RUFF_COMMIT_SHORT_HASH={}", next());
-    println!("cargo:rustc-env=RUFF_COMMIT_DATE={}", next());
-
-    // Describe can fail for some commits
-    // https://git-scm.com/docs/pretty-formats#Documentation/pretty-formats.txt-emdescribeoptionsem
-    if let Some(describe) = parts.next() {
-        let mut describe_parts = describe.split('-');
-        println!(
-            "cargo:rustc-env=RUFF_LAST_TAG={}",
-            describe_parts.next().unwrap()
-        );
-        // If this is the tagged commit, this component will be missing
-        println!(
-            "cargo:rustc-env=RUFF_LAST_TAG_DISTANCE={}",
-            describe_parts.next().unwrap_or("0")
-        );
-    }
-}

crates/ruff/resources/test/fixtures/cache_mutable/.gitignore

@@ -1,2 +0,0 @@
-# Modified by the cache tests.
-source.py

crates/ruff/resources/test/fixtures/cache_remove_old_files/source.py

@@ -1,4 +0,0 @@
-# NOTE: sync with cache::invalidation test
-a = 1
-
-__all__ = list(["a", "b"])

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

@@ -1 +0,0 @@
-print("All formatted!")

crates/ruff/resources/test/fixtures/include-test/nested-project/pyproject.toml

@@ -1,2 +0,0 @@
-[tool.ruff]
-select = []

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

@@ -1,2 +0,0 @@
-[tool.ruff]
-include = ["a.py", "subdirectory/c.py"]

crates/ruff/resources/test/fixtures/trailing_semicolon.ipynb

@@ -1,413 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "id": "4f8ce941-1492-4d4e-8ab5-70d733fe891a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "%config ZMQInteractiveShell.ast_node_interactivity=\"last_expr_or_assign\""
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 2,
-   "id": "721ec705-0c65-4bfb-9809-7ed8bc534186",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "1"
-      ]
-     },
-     "execution_count": 2,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# Assignment statement without a semicolon\n",
-    "x = 1"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 3,
-   "id": "de50e495-17e5-41cc-94bd-565757555d7e",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Assignment statement with a semicolon\n",
-    "x = 1;\n",
-    "x = 1;"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 4,
-   "id": "39e31201-23da-44eb-8684-41bba3663991",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "2"
-      ]
-     },
-     "execution_count": 4,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# Augmented assignment without a semicolon\n",
-    "x += 1"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 5,
-   "id": "6b73d3dd-c73a-4697-9e97-e109a6c1fbab",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Augmented assignment without a semicolon\n",
-    "x += 1;\n",
-    "x += 1;  # comment\n",
-    "# comment"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 6,
-   "id": "2a3e5b86-aa5b-46ba-b9c6-0386d876f58c",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Multiple assignment without a semicolon\n",
-    "x = y = 1"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 7,
-   "id": "07f89e51-9357-4cfb-8fc5-76fb75e35949",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Multiple assignment with a semicolon\n",
-    "x = y = 1;\n",
-    "x = y = 1;"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 8,
-   "id": "c22b539d-473e-48f8-a236-625e58c47a00",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Tuple unpacking without a semicolon\n",
-    "x, y = 1, 2"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 9,
-   "id": "12c87940-a0d5-403b-a81c-7507eb06dc7e",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Tuple unpacking with a semicolon (irrelevant)\n",
-    "x, y = 1, 2;\n",
-    "x, y = 1, 2;  # comment\n",
-    "# comment"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 10,
-   "id": "5a768c76-6bc4-470c-b37e-8cc14bc6caf4",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "1"
-      ]
-     },
-     "execution_count": 10,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# Annotated assignment statement without a semicolon\n",
-    "x: int = 1"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 11,
-   "id": "21bfda82-1a9a-4ba1-9078-74ac480804b5",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Annotated assignment statement without a semicolon\n",
-    "x: int = 1;\n",
-    "x: int = 1;  # comment\n",
-    "# comment"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 12,
-   "id": "09929999-ff29-4d10-ad2b-e665af15812d",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "1"
-      ]
-     },
-     "execution_count": 12,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# Assignment expression without a semicolon\n",
-    "(x := 1)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 13,
-   "id": "32a83217-1bad-4f61-855e-ffcdb119c763",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Assignment expression with a semicolon\n",
-    "(x := 1);\n",
-    "(x := 1);  # comment\n",
-    "# comment"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 14,
-   "id": "61b81865-277e-4964-b03e-eb78f1f318eb",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "1"
-      ]
-     },
-     "execution_count": 14,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "x = 1\n",
-    "# Expression without a semicolon\n",
-    "x"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 15,
-   "id": "974c29be-67e1-4000-95fa-6ca118a63bad",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "x = 1\n",
-    "# Expression with a semicolon\n",
-    "x;"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 16,
-   "id": "cfeb1757-46d6-4f13-969f-a283b6d0304f",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "class Point:\n",
-    "    def __init__(self, x, y):\n",
-    "        self.x = x\n",
-    "        self.y = y\n",
-    "\n",
-    "\n",
-    "p = Point(0, 0);"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 17,
-   "id": "2ee7f1a5-ccfe-4004-bfa4-ef834a58da97",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Assignment statement where the left is an attribute access doesn't\n",
-    "# print the value.\n",
-    "p.x = 1;"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 18,
-   "id": "3e49370a-048b-474d-aa0a-3d1d4a73ad37",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "data = {}\n",
-    "\n",
-    "# Neither does the subscript node\n",
-    "data[\"foo\"] = 1;"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 19,
-   "id": "d594bdd3-eaa9-41ef-8cda-cf01bc273b2d",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "if (x := 1):\n",
-    "    # It should be the top level statement\n",
-    "    x"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 20,
-   "id": "e532f0cf-80c7-42b7-8226-6002fcf74fb6",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "1"
-      ]
-     },
-     "execution_count": 20,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# Parentheses with comments\n",
-    "(\n",
-    "    x := 1  # comment\n",
-    ")  # comment"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 21,
-   "id": "473c5d62-871b-46ed-8a34-27095243f462",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Parentheses with comments\n",
-    "(\n",
-    "    x := 1  # comment\n",
-    ");  # comment"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 22,
-   "id": "8c3c2361-f49f-45fe-bbe3-7e27410a8a86",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "'Hello world!'"
-      ]
-     },
-     "execution_count": 22,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "\"\"\"Hello world!\"\"\""
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 23,
-   "id": "23dbe9b5-3f68-4890-ab2d-ab0dbfd0712a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "\"\"\"Hello world!\"\"\";  # comment\n",
-    "# comment"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 24,
-   "id": "3ce33108-d95d-4c70-83d1-0d4fd36a2951",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "'x = 1'"
-      ]
-     },
-     "execution_count": 24,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "x = 1\n",
-    "f\"x = {x}\""
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 25,
-   "id": "654a4a67-de43-4684-824a-9451c67db48f",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "x = 1\n",
-    "f\"x = {x}\";\n",
-    "f\"x = {x}\";  # comment\n",
-    "# comment"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python (ruff-playground)",
-   "language": "python",
-   "name": "ruff-playground"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.11.3"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}

crates/ruff/resources/test/fixtures/unformatted.ipynb

@@ -1,72 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "98e1dd71-14a2-454d-9be0-061dde560b07",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import numpy\n",
-    "maths = (numpy.arange(100)**2).sum()\n",
-    "stats= numpy.asarray([1,2,3,4]).median()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "83a0b1b8",
-   "metadata": {},
-   "source": [
-    "A markdown cell"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "ae12f012",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# A cell with IPython escape command\n",
-    "def some_function(foo, bar):\n",
-    "    pass\n",
-    "%matplotlib inline"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "10f3bbf9",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "foo = %pwd\n",
-    "def some_function(foo,bar,):\n",
-    "    # Another cell with IPython escape command\n",
-    "    foo = %pwd\n",
-    "    print(foo)"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.10.12"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}

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

@@ -1,3 +0,0 @@
-x = 1
-y=2
-z = 3

crates/ruff/src/commands/add_noqa.rs

@@ -1,82 +0,0 @@
-use std::path::PathBuf;
-use std::time::Instant;
-
-use anyhow::Result;
-use log::{debug, error};
-#[cfg(not(target_family = "wasm"))]
-use rayon::prelude::*;
-
-use ruff_linter::linter::add_noqa_to_path;
-use ruff_linter::source_kind::SourceKind;
-use ruff_linter::warn_user_once;
-use ruff_python_ast::{PySourceType, SourceType};
-use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig, ResolvedFile};
-
-use crate::args::ConfigArguments;
-
-/// Add `noqa` directives to a collection of files.
-pub(crate) fn add_noqa(
-    files: &[PathBuf],
-    pyproject_config: &PyprojectConfig,
-    config_arguments: &ConfigArguments,
-) -> Result<usize> {
-    // Collect all the files to check.
-    let start = Instant::now();
-    let (paths, resolver) = python_files_in_path(files, pyproject_config, config_arguments)?;
-    let duration = start.elapsed();
-    debug!("Identified files to lint in: {:?}", duration);
-
-    if paths.is_empty() {
-        warn_user_once!("No Python files found under the given path(s)");
-        return Ok(0);
-    }
-
-    // Discover the package root for each Python file.
-    let package_roots = resolver.package_roots(
-        &paths
-            .iter()
-            .flatten()
-            .map(ResolvedFile::path)
-            .collect::<Vec<_>>(),
-    );
-
-    let start = Instant::now();
-    let modifications: usize = paths
-        .par_iter()
-        .flatten()
-        .filter_map(|resolved_file| {
-            let SourceType::Python(source_type @ (PySourceType::Python | PySourceType::Stub)) =
-                SourceType::from(resolved_file.path())
-            else {
-                return None;
-            };
-            let path = resolved_file.path();
-            let package = resolved_file
-                .path()
-                .parent()
-                .and_then(|parent| package_roots.get(parent))
-                .and_then(|package| *package);
-            let settings = resolver.resolve(path);
-            let source_kind = match SourceKind::from_path(path, source_type) {
-                Ok(Some(source_kind)) => source_kind,
-                Ok(None) => return None,
-                Err(e) => {
-                    error!("Failed to extract source from {}: {e}", path.display());
-                    return None;
-                }
-            };
-            match add_noqa_to_path(path, package, &source_kind, source_type, &settings.linter) {
-                Ok(count) => Some(count),
-                Err(e) => {
-                    error!("Failed to add noqa to {}: {e}", path.display());
-                    None
-                }
-            }
-        })
-        .sum();
-
-    let duration = start.elapsed();
-    debug!("Added noqa to files in: {:?}", duration);
-
-    Ok(modifications)
-}

crates/ruff/src/commands/check.rs

@@ -1,307 +0,0 @@
-use std::fmt::Write;
-use std::io;
-use std::path::{Path, PathBuf};
-use std::time::Instant;
-
-use anyhow::Result;
-use colored::Colorize;
-use ignore::Error;
-use log::{debug, error, warn};
-#[cfg(not(target_family = "wasm"))]
-use rayon::prelude::*;
-use rustc_hash::FxHashMap;
-
-use ruff_diagnostics::Diagnostic;
-use ruff_linter::message::Message;
-use ruff_linter::registry::Rule;
-use ruff_linter::settings::types::UnsafeFixes;
-use ruff_linter::settings::{flags, LinterSettings};
-use ruff_linter::{fs, warn_user_once, IOError};
-use ruff_python_ast::imports::ImportMap;
-use ruff_source_file::SourceFileBuilder;
-use ruff_text_size::{TextRange, TextSize};
-use ruff_workspace::resolver::{
-    match_exclusion, python_files_in_path, PyprojectConfig, ResolvedFile,
-};
-
-use crate::args::ConfigArguments;
-use crate::cache::{Cache, PackageCacheMap, PackageCaches};
-use crate::diagnostics::Diagnostics;
-use crate::panic::catch_unwind;
-
-/// Run the linter over a collection of files.
-#[allow(clippy::too_many_arguments)]
-pub(crate) fn check(
-    files: &[PathBuf],
-    pyproject_config: &PyprojectConfig,
-    config_arguments: &ConfigArguments,
-    cache: flags::Cache,
-    noqa: flags::Noqa,
-    fix_mode: flags::FixMode,
-    unsafe_fixes: UnsafeFixes,
-) -> Result<Diagnostics> {
-    // Collect all the Python files to check.
-    let start = Instant::now();
-    let (paths, resolver) = python_files_in_path(files, pyproject_config, config_arguments)?;
-    debug!("Identified files to lint in: {:?}", start.elapsed());
-
-    if paths.is_empty() {
-        warn_user_once!("No Python files found under the given path(s)");
-        return Ok(Diagnostics::default());
-    }
-
-    // Discover the package root for each Python file.
-    let package_roots = resolver.package_roots(
-        &paths
-            .iter()
-            .flatten()
-            .map(ResolvedFile::path)
-            .collect::<Vec<_>>(),
-    );
-
-    // Load the caches.
-    let caches = if bool::from(cache) {
-        Some(PackageCacheMap::init(&package_roots, &resolver))
-    } else {
-        None
-    };
-
-    let start = Instant::now();
-    let diagnostics_per_file = paths.par_iter().filter_map(|resolved_file| {
-        let result = match resolved_file {
-            Ok(resolved_file) => {
-                let path = resolved_file.path();
-                let package = path
-                    .parent()
-                    .and_then(|parent| package_roots.get(parent))
-                    .and_then(|package| *package);
-
-                let settings = resolver.resolve(path);
-
-                if (settings.file_resolver.force_exclude || !resolved_file.is_root())
-                    && match_exclusion(
-                        resolved_file.path(),
-                        resolved_file.file_name(),
-                        &settings.linter.exclude,
-                    )
-                {
-                    return None;
-                }
-
-                let cache_root = package.unwrap_or_else(|| path.parent().unwrap_or(path));
-                let cache = caches.get(cache_root);
-
-                lint_path(
-                    path,
-                    package,
-                    &settings.linter,
-                    cache,
-                    noqa,
-                    fix_mode,
-                    unsafe_fixes,
-                )
-                .map_err(|e| {
-                    (Some(path.to_path_buf()), {
-                        let mut error = e.to_string();
-                        for cause in e.chain() {
-                            write!(&mut error, "\n  Cause: {cause}").unwrap();
-                        }
-                        error
-                    })
-                })
-            }
-            Err(e) => Err((
-                if let Error::WithPath { path, .. } = e {
-                    Some(path.clone())
-                } else {
-                    None
-                },
-                e.io_error()
-                    .map_or_else(|| e.to_string(), io::Error::to_string),
-            )),
-        };
-
-        Some(result.unwrap_or_else(|(path, message)| {
-            if let Some(path) = &path {
-                let settings = resolver.resolve(path);
-                if settings.linter.rules.enabled(Rule::IOError) {
-                    let dummy =
-                        SourceFileBuilder::new(path.to_string_lossy().as_ref(), "").finish();
-
-                    Diagnostics::new(
-                        vec![Message::from_diagnostic(
-                            Diagnostic::new(IOError { message }, TextRange::default()),
-                            dummy,
-                            TextSize::default(),
-                        )],
-                        ImportMap::default(),
-                        FxHashMap::default(),
-                    )
-                } else {
-                    warn!(
-                        "{}{}{} {message}",
-                        "Failed to lint ".bold(),
-                        fs::relativize_path(path).bold(),
-                        ":".bold()
-                    );
-                    Diagnostics::default()
-                }
-            } else {
-                warn!("{} {message}", "Encountered error:".bold());
-                Diagnostics::default()
-            }
-        }))
-    });
-
-    // Aggregate the diagnostics of all checked files and count the checked files.
-    // This can't be a regular for loop because we use `par_iter`.
-    let (mut all_diagnostics, checked_files) = diagnostics_per_file
-        .fold(
-            || (Diagnostics::default(), 0u64),
-            |(all_diagnostics, checked_files), file_diagnostics| {
-                (all_diagnostics + file_diagnostics, checked_files + 1)
-            },
-        )
-        .reduce(
-            || (Diagnostics::default(), 0u64),
-            |a, b| (a.0 + b.0, a.1 + b.1),
-        );
-
-    all_diagnostics.messages.sort();
-
-    // Store the caches.
-    caches.persist()?;
-
-    let duration = start.elapsed();
-    debug!("Checked {:?} files in: {:?}", checked_files, duration);
-
-    Ok(all_diagnostics)
-}
-
-/// Wraps [`lint_path`](crate::diagnostics::lint_path) in a [`catch_unwind`](std::panic::catch_unwind) and emits
-/// a diagnostic if the linting the file panics.
-#[allow(clippy::too_many_arguments)]
-fn lint_path(
-    path: &Path,
-    package: Option<&Path>,
-    settings: &LinterSettings,
-    cache: Option<&Cache>,
-    noqa: flags::Noqa,
-    fix_mode: flags::FixMode,
-    unsafe_fixes: UnsafeFixes,
-) -> Result<Diagnostics> {
-    let result = catch_unwind(|| {
-        crate::diagnostics::lint_path(path, package, settings, cache, noqa, fix_mode, unsafe_fixes)
-    });
-
-    match result {
-        Ok(inner) => inner,
-        Err(error) => {
-            let message = r"This indicates a bug in Ruff. If you could open an issue at:
-
-    https://github.com/astral-sh/ruff/issues/new?title=%5BLinter%20panic%5D
-
-...with the relevant file contents, the `pyproject.toml` settings, and the following stack trace, we'd be very appreciative!
-";
-
-            error!(
-                "{}{}{} {message}\n{error}",
-                "Panicked while linting ".bold(),
-                fs::relativize_path(path).bold(),
-                ":".bold()
-            );
-
-            Ok(Diagnostics::default())
-        }
-    }
-}
-
-#[cfg(test)]
-#[cfg(unix)]
-mod test {
-    use std::fs;
-    use std::os::unix::fs::OpenOptionsExt;
-
-    use anyhow::Result;
-    use rustc_hash::FxHashMap;
-    use tempfile::TempDir;
-
-    use ruff_linter::message::{Emitter, EmitterContext, TextEmitter};
-    use ruff_linter::registry::Rule;
-    use ruff_linter::settings::types::UnsafeFixes;
-    use ruff_linter::settings::{flags, LinterSettings};
-    use ruff_workspace::resolver::{PyprojectConfig, PyprojectDiscoveryStrategy};
-    use ruff_workspace::Settings;
-
-    use crate::args::ConfigArguments;
-
-    use super::check;
-
-    /// We check that regular python files, pyproject.toml and jupyter notebooks all handle io
-    /// errors gracefully
-    #[test]
-    fn unreadable_files() -> Result<()> {
-        let path = "E902.py";
-        let rule_code = Rule::IOError;
-
-        // Create inaccessible files
-        let tempdir = TempDir::new()?;
-        let pyproject_toml = tempdir.path().join("pyproject.toml");
-        let python_file = tempdir.path().join("code.py");
-        let notebook = tempdir.path().join("notebook.ipynb");
-        for file in [&pyproject_toml, &python_file, &notebook] {
-            fs::OpenOptions::new()
-                .create(true)
-                .truncate(true)
-                .write(true)
-                .mode(0o000)
-                .open(file)?;
-        }
-
-        // Configure
-        let snapshot = format!("{}_{}", rule_code.noqa_code(), path);
-        // invalid pyproject.toml is not active by default
-        let settings = Settings {
-            linter: LinterSettings::for_rules(vec![rule_code, Rule::InvalidPyprojectToml]),
-            ..Settings::default()
-        };
-        let pyproject_config =
-            PyprojectConfig::new(PyprojectDiscoveryStrategy::Fixed, settings, None);
-
-        // Run
-        let diagnostics = check(
-            // Notebooks are not included by default
-            &[tempdir.path().to_path_buf(), notebook],
-            &pyproject_config,
-            &ConfigArguments::default(),
-            flags::Cache::Disabled,
-            flags::Noqa::Disabled,
-            flags::FixMode::Generate,
-            UnsafeFixes::Enabled,
-        )
-        .unwrap();
-        let mut output = Vec::new();
-
-        TextEmitter::default()
-            .with_show_fix_status(true)
-            .emit(
-                &mut output,
-                &diagnostics.messages,
-                &EmitterContext::new(&FxHashMap::default()),
-            )
-            .unwrap();
-
-        let messages = String::from_utf8(output).unwrap();
-
-        insta::with_settings!({
-            omit_expression => true,
-            filters => vec![
-                // The tempdir is always different (and platform dependent)
-                (tempdir.path().to_str().unwrap(), "/home/ferris/project"),
-            ]
-        }, {
-            insta::assert_snapshot!(snapshot, messages);
-        });
-        Ok(())
-    }
-}

crates/ruff/src/commands/check_stdin.rs

@@ -1,56 +0,0 @@
-use std::path::Path;
-
-use anyhow::Result;
-
-use ruff_linter::packaging;
-use ruff_linter::settings::flags;
-use ruff_workspace::resolver::{match_exclusion, python_file_at_path, PyprojectConfig, Resolver};
-
-use crate::args::ConfigArguments;
-use crate::diagnostics::{lint_stdin, Diagnostics};
-use crate::stdin::{parrot_stdin, read_from_stdin};
-
-/// Run the linter over a single file, read from `stdin`.
-pub(crate) fn check_stdin(
-    filename: Option<&Path>,
-    pyproject_config: &PyprojectConfig,
-    overrides: &ConfigArguments,
-    noqa: flags::Noqa,
-    fix_mode: flags::FixMode,
-) -> Result<Diagnostics> {
-    let mut resolver = Resolver::new(pyproject_config);
-
-    if resolver.force_exclude() {
-        if let Some(filename) = filename {
-            if !python_file_at_path(filename, &mut resolver, overrides)? {
-                if fix_mode.is_apply() {
-                    parrot_stdin()?;
-                }
-                return Ok(Diagnostics::default());
-            }
-
-            if filename.file_name().is_some_and(|name| {
-                match_exclusion(filename, name, &resolver.base_settings().linter.exclude)
-            }) {
-                if fix_mode.is_apply() {
-                    parrot_stdin()?;
-                }
-                return Ok(Diagnostics::default());
-            }
-        }
-    }
-    let stdin = read_from_stdin()?;
-    let package_root = filename.and_then(Path::parent).and_then(|path| {
-        packaging::detect_package_root(path, &resolver.base_settings().linter.namespace_packages)
-    });
-    let mut diagnostics = lint_stdin(
-        filename,
-        package_root,
-        stdin,
-        resolver.base_settings(),
-        noqa,
-        fix_mode,
-    )?;
-    diagnostics.messages.sort_unstable();
-    Ok(diagnostics)
-}

crates/ruff/src/commands/clean.rs

@@ -1,34 +0,0 @@
-use std::fs::remove_dir_all;
-use std::io::{self, BufWriter, Write};
-
-use anyhow::Result;
-use colored::Colorize;
-use path_absolutize::path_dedot;
-use walkdir::WalkDir;
-
-use ruff_cache::CACHE_DIR_NAME;
-use ruff_linter::fs;
-use ruff_linter::logging::LogLevel;
-
-/// Clear any caches in the current directory or any subdirectories.
-pub(crate) fn clean(level: LogLevel) -> Result<()> {
-    let mut stderr = BufWriter::new(io::stderr().lock());
-    for entry in WalkDir::new(&*path_dedot::CWD)
-        .into_iter()
-        .filter_map(Result::ok)
-        .filter(|entry| entry.file_type().is_dir())
-    {
-        let cache = entry.path().join(CACHE_DIR_NAME);
-        if cache.is_dir() {
-            if level >= LogLevel::Default {
-                writeln!(
-                    stderr,
-                    "Removing cache at: {}",
-                    fs::relativize_path(&cache).bold()
-                )?;
-            }
-            remove_dir_all(&cache)?;
-        }
-    }
-    Ok(())
-}

crates/ruff/src/commands/config.rs

@@ -1,20 +0,0 @@
-use anyhow::{anyhow, Result};
-
-use ruff_workspace::options::Options;
-use ruff_workspace::options_base::OptionsMetadata;
-
-#[allow(clippy::print_stdout)]
-pub(crate) fn config(key: Option<&str>) -> Result<()> {
-    match key {
-        None => print!("{}", Options::metadata()),
-        Some(key) => match Options::metadata().find(key) {
-            None => {
-                return Err(anyhow!("Unknown option: {key}"));
-            }
-            Some(entry) => {
-                print!("{entry}");
-            }
-        },
-    }
-    Ok(())
-}

crates/ruff/src/commands/format.rs

@@ -1,898 +0,0 @@
-use std::fmt::{Display, Formatter};
-use std::fs::File;
-use std::io;
-use std::io::{stderr, stdout, Write};
-use std::path::{Path, PathBuf};
-use std::time::Instant;
-
-use anyhow::Result;
-use colored::Colorize;
-use itertools::Itertools;
-use log::{error, warn};
-use rayon::iter::Either::{Left, Right};
-use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
-use rustc_hash::FxHashSet;
-use thiserror::Error;
-use tracing::debug;
-
-use ruff_diagnostics::SourceMap;
-use ruff_linter::fs;
-use ruff_linter::logging::{DisplayParseError, LogLevel};
-use ruff_linter::registry::Rule;
-use ruff_linter::rules::flake8_quotes::settings::Quote;
-use ruff_linter::source_kind::{SourceError, SourceKind};
-use ruff_linter::warn_user_once;
-use ruff_python_ast::{PySourceType, SourceType};
-use ruff_python_formatter::{format_module_source, format_range, FormatModuleError, QuoteStyle};
-use ruff_source_file::LineIndex;
-use ruff_text_size::{TextLen, TextRange, TextSize};
-use ruff_workspace::resolver::{match_exclusion, python_files_in_path, ResolvedFile, Resolver};
-use ruff_workspace::FormatterSettings;
-
-use crate::args::{ConfigArguments, FormatArguments, FormatRange};
-use crate::cache::{Cache, FileCacheKey, PackageCacheMap, PackageCaches};
-use crate::panic::{catch_unwind, PanicError};
-use crate::resolve::resolve;
-use crate::{resolve_default_files, ExitStatus};
-
-#[derive(Debug, Copy, Clone, is_macro::Is)]
-pub(crate) enum FormatMode {
-    /// Write the formatted contents back to the file.
-    Write,
-    /// Check if the file is formatted, but do not write the formatted contents back.
-    Check,
-    /// Check if the file is formatted, show a diff if not.
-    Diff,
-}
-
-impl FormatMode {
-    pub(crate) fn from_cli(cli: &FormatArguments) -> Self {
-        if cli.diff {
-            FormatMode::Diff
-        } else if cli.check {
-            FormatMode::Check
-        } else {
-            FormatMode::Write
-        }
-    }
-}
-
-/// Format a set of files, and return the exit status.
-pub(crate) fn format(
-    cli: FormatArguments,
-    config_arguments: &ConfigArguments,
-) -> Result<ExitStatus> {
-    let pyproject_config = resolve(config_arguments, cli.stdin_filename.as_deref())?;
-    let mode = FormatMode::from_cli(&cli);
-    let files = resolve_default_files(cli.files, false);
-    let (paths, resolver) = python_files_in_path(&files, &pyproject_config, config_arguments)?;
-
-    if paths.is_empty() {
-        warn_user_once!("No Python files found under the given path(s)");
-        return Ok(ExitStatus::Success);
-    }
-
-    if cli.range.is_some() && paths.len() > 1 {
-        return Err(anyhow::anyhow!(
-            "The `--range` option is only supported when formatting a single file but the specified paths resolve to {} files.",
-            paths.len()
-        ));
-    }
-
-    warn_incompatible_formatter_settings(&resolver);
-
-    // Discover the package root for each Python file.
-    let package_roots = resolver.package_roots(
-        &paths
-            .iter()
-            .flatten()
-            .map(ResolvedFile::path)
-            .collect::<Vec<_>>(),
-    );
-
-    let caches = if cli.no_cache {
-        None
-    } else {
-        // `--no-cache` doesn't respect code changes, and so is often confusing during
-        // development.
-        #[cfg(debug_assertions)]
-        crate::warn_user!("Detected debug build without --no-cache.");
-
-        Some(PackageCacheMap::init(&package_roots, &resolver))
-    };
-
-    let start = Instant::now();
-    let (results, mut errors): (Vec<_>, Vec<_>) = paths
-        .par_iter()
-        .filter_map(|entry| {
-            match entry {
-                Ok(resolved_file) => {
-                    let path = resolved_file.path();
-                    let settings = resolver.resolve(path);
-
-                    let source_type = match settings.formatter.extension.get(path) {
-                        None => match SourceType::from(path) {
-                            SourceType::Python(source_type) => source_type,
-                            SourceType::Toml(_) => {
-                                // Ignore any non-Python files.
-                                return None;
-                            }
-                        },
-                        Some(language) => PySourceType::from(language),
-                    };
-
-                    // Ignore files that are excluded from formatting
-                    if (settings.file_resolver.force_exclude || !resolved_file.is_root())
-                        && match_exclusion(
-                            path,
-                            resolved_file.file_name(),
-                            &settings.formatter.exclude,
-                        )
-                    {
-                        return None;
-                    }
-
-                    let package = path
-                        .parent()
-                        .and_then(|parent| package_roots.get(parent).copied())
-                        .flatten();
-                    let cache_root = package.unwrap_or_else(|| path.parent().unwrap_or(path));
-                    let cache = caches.get(cache_root);
-
-                    Some(
-                        match catch_unwind(|| {
-                            format_path(
-                                path,
-                                &settings.formatter,
-                                source_type,
-                                mode,
-                                cli.range,
-                                cache,
-                            )
-                        }) {
-                            Ok(inner) => inner.map(|result| FormatPathResult {
-                                path: resolved_file.path().to_path_buf(),
-                                result,
-                            }),
-                            Err(error) => Err(FormatCommandError::Panic(
-                                Some(resolved_file.path().to_path_buf()),
-                                error,
-                            )),
-                        },
-                    )
-                }
-                Err(err) => Some(Err(FormatCommandError::Ignore(err.clone()))),
-            }
-        })
-        .partition_map(|result| match result {
-            Ok(diagnostic) => Left(diagnostic),
-            Err(err) => Right(err),
-        });
-    let duration = start.elapsed();
-
-    debug!(
-        "Formatted {} files in {:.2?}",
-        results.len() + errors.len(),
-        duration
-    );
-
-    caches.persist()?;
-
-    // Report on any errors.
-    errors.sort_unstable_by(|a, b| a.path().cmp(&b.path()));
-
-    for error in &errors {
-        error!("{error}");
-    }
-
-    let results = FormatResults::new(results.as_slice(), mode);
-    match mode {
-        FormatMode::Write => {}
-        FormatMode::Check => {
-            results.write_changed(&mut stdout().lock())?;
-        }
-        FormatMode::Diff => {
-            results.write_diff(&mut stdout().lock())?;
-        }
-    }
-
-    // Report on the formatting changes.
-    if config_arguments.log_level >= LogLevel::Default {
-        if mode.is_diff() {
-            // Allow piping the diff to e.g. a file by writing the summary to stderr
-            results.write_summary(&mut stderr().lock())?;
-        } else {
-            results.write_summary(&mut stdout().lock())?;
-        }
-    }
-
-    match mode {
-        FormatMode::Write => {
-            if errors.is_empty() {
-                Ok(ExitStatus::Success)
-            } else {
-                Ok(ExitStatus::Error)
-            }
-        }
-        FormatMode::Check | FormatMode::Diff => {
-            if errors.is_empty() {
-                if results.any_formatted() {
-                    Ok(ExitStatus::Failure)
-                } else {
-                    Ok(ExitStatus::Success)
-                }
-            } else {
-                Ok(ExitStatus::Error)
-            }
-        }
-    }
-}
-
-/// Format the file at the given [`Path`].
-#[tracing::instrument(level="debug", skip_all, fields(path = %path.display()))]
-pub(crate) fn format_path(
-    path: &Path,
-    settings: &FormatterSettings,
-    source_type: PySourceType,
-    mode: FormatMode,
-    range: Option<FormatRange>,
-    cache: Option<&Cache>,
-) -> Result<FormatResult, FormatCommandError> {
-    if let Some(cache) = cache {
-        let relative_path = cache
-            .relative_path(path)
-            .expect("wrong package cache for file");
-
-        if let Ok(cache_key) = FileCacheKey::from_path(path) {
-            if cache.is_formatted(relative_path, &cache_key) {
-                return Ok(FormatResult::Unchanged);
-            }
-        }
-    }
-
-    // Extract the sources from the file.
-    let unformatted = match SourceKind::from_path(path, source_type) {
-        Ok(Some(source_kind)) => source_kind,
-        // Non-Python Jupyter notebook.
-        Ok(None) => return Ok(FormatResult::Skipped),
-        Err(err) => {
-            return Err(FormatCommandError::Read(Some(path.to_path_buf()), err));
-        }
-    };
-
-    // Don't write back to the cache if formatting a range.
-    let cache = cache.filter(|_| range.is_none());
-
-    // Format the source.
-    let format_result = match format_source(&unformatted, source_type, Some(path), settings, range)?
-    {
-        FormattedSource::Formatted(formatted) => match mode {
-            FormatMode::Write => {
-                let mut writer = File::create(path).map_err(|err| {
-                    FormatCommandError::Write(Some(path.to_path_buf()), err.into())
-                })?;
-                formatted
-                    .write(&mut writer)
-                    .map_err(|err| FormatCommandError::Write(Some(path.to_path_buf()), err))?;
-
-                if let Some(cache) = cache {
-                    if let Ok(cache_key) = FileCacheKey::from_path(path) {
-                        let relative_path = cache
-                            .relative_path(path)
-                            .expect("wrong package cache for file");
-                        cache.set_formatted(relative_path.to_path_buf(), &cache_key);
-                    }
-                }
-
-                FormatResult::Formatted
-            }
-            FormatMode::Check => FormatResult::Formatted,
-            FormatMode::Diff => FormatResult::Diff {
-                unformatted,
-                formatted,
-            },
-        },
-        FormattedSource::Unchanged => {
-            if let Some(cache) = cache {
-                if let Ok(cache_key) = FileCacheKey::from_path(path) {
-                    let relative_path = cache
-                        .relative_path(path)
-                        .expect("wrong package cache for file");
-                    cache.set_formatted(relative_path.to_path_buf(), &cache_key);
-                }
-            }
-
-            FormatResult::Unchanged
-        }
-    };
-
-    Ok(format_result)
-}
-
-#[derive(Debug)]
-pub(crate) enum FormattedSource {
-    /// The source was formatted, and the [`SourceKind`] contains the transformed source code.
-    Formatted(SourceKind),
-    /// The source was unchanged.
-    Unchanged,
-}
-
-impl From<FormattedSource> for FormatResult {
-    fn from(value: FormattedSource) -> Self {
-        match value {
-            FormattedSource::Formatted(_) => FormatResult::Formatted,
-            FormattedSource::Unchanged => FormatResult::Unchanged,
-        }
-    }
-}
-
-/// Format a [`SourceKind`], returning the transformed [`SourceKind`], or `None` if the source was
-/// unchanged.
-pub(crate) fn format_source(
-    source_kind: &SourceKind,
-    source_type: PySourceType,
-    path: Option<&Path>,
-    settings: &FormatterSettings,
-    range: Option<FormatRange>,
-) -> Result<FormattedSource, FormatCommandError> {
-    match &source_kind {
-        SourceKind::Python(unformatted) => {
-            let options = settings.to_format_options(source_type, unformatted);
-
-            let formatted = if let Some(range) = range {
-                let line_index = LineIndex::from_source_text(unformatted);
-                let byte_range = range.to_text_range(unformatted, &line_index);
-                format_range(unformatted, byte_range, options).map(|formatted_range| {
-                    let mut formatted = unformatted.to_string();
-                    formatted.replace_range(
-                        std::ops::Range::<usize>::from(formatted_range.source_range()),
-                        formatted_range.as_code(),
-                    );
-
-                    formatted
-                })
-            } else {
-                // Using `Printed::into_code` requires adding `ruff_formatter` as a direct dependency, and I suspect that Rust can optimize the closure away regardless.
-                #[allow(clippy::redundant_closure_for_method_calls)]
-                format_module_source(unformatted, options).map(|formatted| formatted.into_code())
-            };
-
-            let formatted = formatted.map_err(|err| {
-                if let FormatModuleError::ParseError(err) = err {
-                    DisplayParseError::from_source_kind(
-                        err,
-                        path.map(Path::to_path_buf),
-                        source_kind,
-                    )
-                    .into()
-                } else {
-                    FormatCommandError::Format(path.map(Path::to_path_buf), err)
-                }
-            })?;
-
-            if formatted.len() == unformatted.len() && formatted == *unformatted {
-                Ok(FormattedSource::Unchanged)
-            } else {
-                Ok(FormattedSource::Formatted(SourceKind::Python(formatted)))
-            }
-        }
-        SourceKind::IpyNotebook(notebook) => {
-            if !notebook.is_python_notebook() {
-                return Ok(FormattedSource::Unchanged);
-            }
-
-            if range.is_some() {
-                return Err(FormatCommandError::RangeFormatNotebook(
-                    path.map(Path::to_path_buf),
-                ));
-            }
-
-            let options = settings.to_format_options(source_type, notebook.source_code());
-
-            let mut output: Option<String> = None;
-            let mut last: Option<TextSize> = None;
-            let mut source_map = SourceMap::default();
-
-            // Format each cell individually.
-            for (start, end) in notebook.cell_offsets().iter().tuple_windows::<(_, _)>() {
-                let range = TextRange::new(*start, *end);
-                let unformatted = &notebook.source_code()[range];
-
-                // Format the cell.
-                let formatted =
-                    format_module_source(unformatted, options.clone()).map_err(|err| {
-                        if let FormatModuleError::ParseError(err) = err {
-                            DisplayParseError::from_source_kind(
-                                err,
-                                path.map(Path::to_path_buf),
-                                source_kind,
-                            )
-                            .into()
-                        } else {
-                            FormatCommandError::Format(path.map(Path::to_path_buf), err)
-                        }
-                    })?;
-
-                // If the cell is unchanged, skip it.
-                let formatted = formatted.as_code();
-                if formatted.len() == unformatted.len() && formatted == unformatted {
-                    continue;
-                }
-
-                // If this is the first newly-formatted cell, initialize the output.
-                let output = output
-                    .get_or_insert_with(|| String::with_capacity(notebook.source_code().len()));
-
-                // Add all contents from `last` to the current cell.
-                let slice = &notebook.source_code()
-                    [TextRange::new(last.unwrap_or_default(), range.start())];
-                output.push_str(slice);
-
-                // Add the start source marker for the cell.
-                source_map.push_marker(*start, output.text_len());
-
-                // Add the cell itself.
-                output.push_str(formatted);
-
-                // Add the end source marker for the added cell.
-                source_map.push_marker(*end, output.text_len());
-
-                // Track that the cell was formatted.
-                last = Some(*end);
-            }
-
-            // If the file was unchanged, return `None`.
-            let (Some(mut output), Some(last)) = (output, last) else {
-                return Ok(FormattedSource::Unchanged);
-            };
-
-            // Add the remaining content.
-            let slice = &notebook.source_code()[usize::from(last)..];
-            output.push_str(slice);
-
-            // Update the notebook.
-            let mut formatted = notebook.clone();
-            formatted.update(&source_map, output);
-
-            Ok(FormattedSource::Formatted(SourceKind::IpyNotebook(
-                formatted,
-            )))
-        }
-    }
-}
-
-/// The result of an individual formatting operation.
-#[derive(Debug, Clone, is_macro::Is)]
-pub(crate) enum FormatResult {
-    /// The file was formatted.
-    Formatted,
-
-    /// The file was formatted, [`SourceKind`] contains the formatted code
-    Diff {
-        unformatted: SourceKind,
-        formatted: SourceKind,
-    },
-
-    /// The file was unchanged, as the formatted contents matched the existing contents.
-    Unchanged,
-
-    /// Skipped formatting because its an unsupported file format
-    Skipped,
-}
-
-/// The coupling of a [`FormatResult`] with the path of the file that was analyzed.
-#[derive(Debug)]
-struct FormatPathResult {
-    path: PathBuf,
-    result: FormatResult,
-}
-
-/// The results of formatting a set of files
-#[derive(Debug)]
-struct FormatResults<'a> {
-    /// The individual formatting results.
-    results: &'a [FormatPathResult],
-    /// The format mode that was used.
-    mode: FormatMode,
-}
-
-impl<'a> FormatResults<'a> {
-    fn new(results: &'a [FormatPathResult], mode: FormatMode) -> Self {
-        Self { results, mode }
-    }
-
-    /// Returns `true` if any of the files require formatting.
-    fn any_formatted(&self) -> bool {
-        self.results.iter().any(|result| match result.result {
-            FormatResult::Formatted | FormatResult::Diff { .. } => true,
-            FormatResult::Unchanged | FormatResult::Skipped => false,
-        })
-    }
-
-    /// Write a diff of the formatting changes to the given writer.
-    fn write_diff(&self, f: &mut impl Write) -> io::Result<()> {
-        for (path, unformatted, formatted) in self
-            .results
-            .iter()
-            .filter_map(|result| {
-                if let FormatResult::Diff {
-                    unformatted,
-                    formatted,
-                } = &result.result
-                {
-                    Some((result.path.as_path(), unformatted, formatted))
-                } else {
-                    None
-                }
-            })
-            .sorted_unstable_by_key(|(path, _, _)| *path)
-        {
-            write!(f, "{}", unformatted.diff(formatted, Some(path)).unwrap())?;
-        }
-
-        Ok(())
-    }
-
-    /// Write a list of the files that would be changed to the given writer.
-    fn write_changed(&self, f: &mut impl Write) -> io::Result<()> {
-        for path in self
-            .results
-            .iter()
-            .filter_map(|result| {
-                if result.result.is_formatted() {
-                    Some(result.path.as_path())
-                } else {
-                    None
-                }
-            })
-            .sorted_unstable()
-        {
-            writeln!(f, "Would reformat: {}", fs::relativize_path(path).bold())?;
-        }
-
-        Ok(())
-    }
-
-    /// Write a summary of the formatting results to the given writer.
-    fn write_summary(&self, f: &mut impl Write) -> io::Result<()> {
-        // Compute the number of changed and unchanged files.
-        let mut changed = 0u32;
-        let mut unchanged = 0u32;
-        for result in self.results {
-            match &result.result {
-                FormatResult::Formatted => {
-                    changed += 1;
-                }
-                FormatResult::Unchanged => unchanged += 1,
-                FormatResult::Diff { .. } => {
-                    changed += 1;
-                }
-                FormatResult::Skipped => {}
-            }
-        }
-
-        // Write out a summary of the formatting results.
-        if changed > 0 && unchanged > 0 {
-            writeln!(
-                f,
-                "{} file{} {}, {} file{} {}",
-                changed,
-                if changed == 1 { "" } else { "s" },
-                match self.mode {
-                    FormatMode::Write => "reformatted",
-                    FormatMode::Check | FormatMode::Diff => "would be reformatted",
-                },
-                unchanged,
-                if unchanged == 1 { "" } else { "s" },
-                match self.mode {
-                    FormatMode::Write => "left unchanged",
-                    FormatMode::Check | FormatMode::Diff => "already formatted",
-                },
-            )
-        } else if changed > 0 {
-            writeln!(
-                f,
-                "{} file{} {}",
-                changed,
-                if changed == 1 { "" } else { "s" },
-                match self.mode {
-                    FormatMode::Write => "reformatted",
-                    FormatMode::Check | FormatMode::Diff => "would be reformatted",
-                }
-            )
-        } else if unchanged > 0 {
-            writeln!(
-                f,
-                "{} file{} {}",
-                unchanged,
-                if unchanged == 1 { "" } else { "s" },
-                match self.mode {
-                    FormatMode::Write => "left unchanged",
-                    FormatMode::Check | FormatMode::Diff => "already formatted",
-                },
-            )
-        } else {
-            Ok(())
-        }
-    }
-}
-
-/// An error that can occur while formatting a set of files.
-#[derive(Error, Debug)]
-pub(crate) enum FormatCommandError {
-    Ignore(#[from] ignore::Error),
-    Parse(#[from] DisplayParseError),
-    Panic(Option<PathBuf>, PanicError),
-    Read(Option<PathBuf>, SourceError),
-    Format(Option<PathBuf>, FormatModuleError),
-    Write(Option<PathBuf>, SourceError),
-    Diff(Option<PathBuf>, io::Error),
-    RangeFormatNotebook(Option<PathBuf>),
-}
-
-impl FormatCommandError {
-    fn path(&self) -> Option<&Path> {
-        match self {
-            Self::Ignore(err) => {
-                if let ignore::Error::WithPath { path, .. } = err {
-                    Some(path.as_path())
-                } else {
-                    None
-                }
-            }
-            Self::Parse(err) => err.path(),
-            Self::Panic(path, _)
-            | Self::Read(path, _)
-            | Self::Format(path, _)
-            | Self::Write(path, _)
-            | Self::Diff(path, _)
-            | Self::RangeFormatNotebook(path) => path.as_deref(),
-        }
-    }
-}
-
-impl Display for FormatCommandError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Ignore(err) => {
-                if let ignore::Error::WithPath { path, .. } = err {
-                    write!(
-                        f,
-                        "{}{}{} {}",
-                        "Failed to format ".bold(),
-                        fs::relativize_path(path).bold(),
-                        ":".bold(),
-                        err.io_error()
-                            .map_or_else(|| err.to_string(), std::string::ToString::to_string)
-                    )
-                } else {
-                    write!(
-                        f,
-                        "{header} {error}",
-                        header = "Encountered error:".bold(),
-                        error = err
-                            .io_error()
-                            .map_or_else(|| err.to_string(), std::string::ToString::to_string)
-                    )
-                }
-            }
-            Self::Parse(err) => {
-                write!(f, "{err}")
-            }
-            Self::Read(path, err) => {
-                if let Some(path) = path {
-                    write!(
-                        f,
-                        "{}{}{} {err}",
-                        "Failed to read ".bold(),
-                        fs::relativize_path(path).bold(),
-                        ":".bold()
-                    )
-                } else {
-                    write!(f, "{header} {err}", header = "Failed to read:".bold())
-                }
-            }
-            Self::Write(path, err) => {
-                if let Some(path) = path {
-                    write!(
-                        f,
-                        "{}{}{} {err}",
-                        "Failed to write ".bold(),
-                        fs::relativize_path(path).bold(),
-                        ":".bold()
-                    )
-                } else {
-                    write!(f, "{header} {err}", header = "Failed to write:".bold())
-                }
-            }
-            Self::Format(path, err) => {
-                if let Some(path) = path {
-                    write!(
-                        f,
-                        "{}{}{} {err}",
-                        "Failed to format ".bold(),
-                        fs::relativize_path(path).bold(),
-                        ":".bold()
-                    )
-                } else {
-                    write!(f, "{header} {err}", header = "Failed to format:".bold())
-                }
-            }
-            Self::Diff(path, err) => {
-                if let Some(path) = path {
-                    write!(
-                        f,
-                        "{}{}{} {err}",
-                        "Failed to generate diff for ".bold(),
-                        fs::relativize_path(path).bold(),
-                        ":".bold()
-                    )
-                } else {
-                    write!(
-                        f,
-                        "{header} {err}",
-                        header = "Failed to generate diff:".bold(),
-                    )
-                }
-            }
-            Self::RangeFormatNotebook(path) => {
-                if let Some(path) = path {
-                    write!(
-                        f,
-                        "{header}{path}{colon} Range formatting isn't supported for notebooks.",
-                        header = "Failed to format ".bold(),
-                        path = fs::relativize_path(path).bold(),
-                        colon = ":".bold()
-                    )
-                } else {
-                    write!(
-                        f,
-                        "{header} Range formatting isn't supported for notebooks",
-                        header = "Failed to format:".bold()
-                    )
-                }
-            }
-            Self::Panic(path, err) => {
-                let message = r"This indicates a bug in Ruff. If you could open an issue at:
-
-    https://github.com/astral-sh/ruff/issues/new?title=%5BFormatter%20panic%5D
-
-...with the relevant file contents, the `pyproject.toml` settings, and the following stack trace, we'd be very appreciative!
-";
-                if let Some(path) = path {
-                    write!(
-                        f,
-                        "{}{}{} {message}\n{err}",
-                        "Panicked while formatting ".bold(),
-                        fs::relativize_path(path).bold(),
-                        ":".bold()
-                    )
-                } else {
-                    write!(
-                        f,
-                        "{} {message}\n{err}",
-                        "Panicked while formatting.".bold()
-                    )
-                }
-            }
-        }
-    }
-}
-
-pub(super) fn warn_incompatible_formatter_settings(resolver: &Resolver) {
-    // First, collect all rules that are incompatible regardless of the linter-specific settings.
-    let mut incompatible_rules = FxHashSet::default();
-    for setting in resolver.settings() {
-        for rule in [
-            // The formatter might collapse implicit string concatenation on a single line.
-            Rule::SingleLineImplicitStringConcatenation,
-            // Flags missing trailing commas when all arguments are on its own line:
-            // ```python
-            // def args(
-            //     aaaaaaaa, bbbbbbbbb, cccccccccc, ddddddddd, eeeeeeee, ffffff, gggggggggggg, hhhh
-            // ):
-            //     pass
-            // ```
-            Rule::MissingTrailingComma,
-        ] {
-            if setting.linter.rules.enabled(rule) {
-                incompatible_rules.insert(rule);
-            }
-        }
-    }
-
-    if !incompatible_rules.is_empty() {
-        let mut rule_names: Vec<_> = incompatible_rules
-            .into_iter()
-            .map(|rule| format!("`{}`", rule.noqa_code()))
-            .collect();
-        rule_names.sort();
-        warn_user_once!("The following rules may cause conflicts when used with the formatter: {}. To avoid unexpected behavior, we recommend disabling these rules, either by removing them from the `select` or `extend-select` configuration, or adding them to the `ignore` configuration.", rule_names.join(", "));
-    }
-
-    // Next, validate settings-specific incompatibilities.
-    for setting in resolver.settings() {
-        // Validate all rules that rely on tab styles.
-        if setting.linter.rules.enabled(Rule::TabIndentation)
-            && setting.formatter.indent_style.is_tab()
-        {
-            warn_user_once!("The `format.indent-style=\"tab\"` option is incompatible with `W191`, which lints against all uses of tabs. We recommend disabling these rules when using the formatter, which enforces a consistent indentation style. Alternatively, set the `format.indent-style` option to `\"space\"`.");
-        }
-
-        // Validate all rules that rely on tab styles.
-        if setting.linter.rules.enabled(Rule::IndentWithSpaces)
-            && setting.formatter.indent_style.is_tab()
-        {
-            warn_user_once!("The `format.indent-style=\"tab\"` option is incompatible with `D206`, with requires space-based indentation. We recommend disabling these rules when using the formatter, which enforces a consistent indentation style. Alternatively, set the `format.indent-style` option to `\"space\"`.");
-        }
-
-        // Validate all rules that rely on custom indent widths.
-        if setting.linter.rules.any_enabled(&[
-            Rule::IndentationWithInvalidMultiple,
-            Rule::IndentationWithInvalidMultipleComment,
-        ]) && setting.formatter.indent_width.value() != 4
-        {
-            warn_user_once!("The `format.indent-width` option with a value other than 4 is incompatible with `E111` and `E114`. We recommend disabling these rules when using the formatter, which enforces a consistent indentation width. Alternatively, set the `format.indent-width` option to `4`.");
-        }
-
-        // Validate all rules that rely on quote styles.
-        if setting
-            .linter
-            .rules
-            .any_enabled(&[Rule::BadQuotesInlineString, Rule::AvoidableEscapedQuote])
-        {
-            match (
-                setting.linter.flake8_quotes.inline_quotes,
-                setting.formatter.quote_style,
-            ) {
-                (Quote::Double, QuoteStyle::Single) => {
-                    warn_user_once!("The `flake8-quotes.inline-quotes=\"double\"` option is incompatible with the formatter's `format.quote-style=\"single\"`. We recommend disabling `Q000` and `Q003` when using the formatter, which enforces a consistent quote style. Alternatively, set both options to either `\"single\"` or `\"double\"`.");
-                }
-                (Quote::Single, QuoteStyle::Double) => {
-                    warn_user_once!("The `flake8-quotes.inline-quotes=\"single\"` option is incompatible with the formatter's `format.quote-style=\"double\"`. We recommend disabling `Q000` and `Q003` when using the formatter, which enforces a consistent quote style. Alternatively, set both options to either `\"single\"` or `\"double\"`.");
-                }
-                _ => {}
-            }
-        }
-
-        if setting.linter.rules.enabled(Rule::BadQuotesMultilineString)
-            && setting.linter.flake8_quotes.multiline_quotes == Quote::Single
-        {
-            warn_user_once!("The `flake8-quotes.multiline-quotes=\"single\"` option is incompatible with the formatter. We recommend disabling `Q001` when using the formatter, which enforces double quotes for multiline strings. Alternatively, set the `flake8-quotes.multiline-quotes` option to `\"double\"`.`");
-        }
-
-        if setting.linter.rules.enabled(Rule::BadQuotesDocstring)
-            && setting.linter.flake8_quotes.docstring_quotes == Quote::Single
-        {
-            warn_user_once!("The `flake8-quotes.multiline-quotes=\"single\"` option is incompatible with the formatter. We recommend disabling `Q002` when using the formatter, which enforces double quotes for docstrings. Alternatively, set the `flake8-quotes.docstring-quotes` option to `\"double\"`.`");
-        }
-
-        // Validate all isort settings.
-        if setting.linter.rules.enabled(Rule::UnsortedImports) {
-            // The formatter removes empty lines if the value is larger than 2 but always inserts a empty line after imports.
-            // Two empty lines are okay because `isort` only uses this setting for top-level imports (not in nested blocks).
-            if !matches!(setting.linter.isort.lines_after_imports, 1 | 2 | -1) {
-                warn_user_once!("The isort option `isort.lines-after-imports` with a value other than `-1`, `1` or `2` is incompatible with the formatter. To avoid unexpected behavior, we recommend setting the option to one of: `2`, `1`, or `-1` (default).");
-            }
-
-            // Values larger than two get reduced to one line by the formatter if the import is in a nested block.
-            if setting.linter.isort.lines_between_types > 1 {
-                warn_user_once!("The isort option `isort.lines-between-types` with a value greater than 1 is incompatible with the formatter. To avoid unexpected behavior, we recommend setting the option to one of: `1` or `0` (default).");
-            }
-
-            // isort inserts a trailing comma which the formatter preserves, but only if `skip-magic-trailing-comma` isn't false.
-            // This isn't relevant when using `force-single-line`, since isort will never include a trailing comma in that case.
-            if setting.formatter.magic_trailing_comma.is_ignore()
-                && !setting.linter.isort.force_single_line
-            {
-                if setting.linter.isort.force_wrap_aliases {
-                    warn_user_once!("The isort option `isort.force-wrap-aliases` is incompatible with the formatter `format.skip-magic-trailing-comma=true` option. To avoid unexpected behavior, we recommend either setting `isort.force-wrap-aliases=false` or `format.skip-magic-trailing-comma=false`.");
-                }
-
-                if setting.linter.isort.split_on_trailing_comma {
-                    warn_user_once!("The isort option `isort.split-on-trailing-comma` is incompatible with the formatter `format.skip-magic-trailing-comma=true` option. To avoid unexpected behavior, we recommend either setting `isort.split-on-trailing-comma=false` or `format.skip-magic-trailing-comma=false`.");
-                }
-            }
-        }
-    }
-}

crates/ruff/src/commands/format_stdin.rs

@@ -1,142 +0,0 @@
-use std::io::stdout;
-use std::path::Path;
-
-use anyhow::Result;
-use log::error;
-
-use ruff_linter::source_kind::SourceKind;
-use ruff_python_ast::{PySourceType, SourceType};
-use ruff_workspace::resolver::{match_exclusion, python_file_at_path, Resolver};
-use ruff_workspace::FormatterSettings;
-
-use crate::args::{ConfigArguments, FormatArguments, FormatRange};
-use crate::commands::format::{
-    format_source, warn_incompatible_formatter_settings, FormatCommandError, FormatMode,
-    FormatResult, FormattedSource,
-};
-use crate::resolve::resolve;
-use crate::stdin::{parrot_stdin, read_from_stdin};
-use crate::ExitStatus;
-
-/// Run the formatter over a single file, read from `stdin`.
-pub(crate) fn format_stdin(
-    cli: &FormatArguments,
-    config_arguments: &ConfigArguments,
-) -> Result<ExitStatus> {
-    let pyproject_config = resolve(config_arguments, cli.stdin_filename.as_deref())?;
-
-    let mut resolver = Resolver::new(&pyproject_config);
-    warn_incompatible_formatter_settings(&resolver);
-
-    let mode = FormatMode::from_cli(cli);
-
-    if resolver.force_exclude() {
-        if let Some(filename) = cli.stdin_filename.as_deref() {
-            if !python_file_at_path(filename, &mut resolver, config_arguments)? {
-                if mode.is_write() {
-                    parrot_stdin()?;
-                }
-                return Ok(ExitStatus::Success);
-            }
-
-            if filename.file_name().is_some_and(|name| {
-                match_exclusion(filename, name, &resolver.base_settings().formatter.exclude)
-            }) {
-                if mode.is_write() {
-                    parrot_stdin()?;
-                }
-                return Ok(ExitStatus::Success);
-            }
-        }
-    }
-
-    let path = cli.stdin_filename.as_deref();
-    let settings = &resolver.base_settings().formatter;
-
-    let source_type = match path.and_then(|path| settings.extension.get(path)) {
-        None => match path.map(SourceType::from).unwrap_or_default() {
-            SourceType::Python(source_type) => source_type,
-            SourceType::Toml(_) => {
-                if mode.is_write() {
-                    parrot_stdin()?;
-                }
-                return Ok(ExitStatus::Success);
-            }
-        },
-        Some(language) => PySourceType::from(language),
-    };
-
-    // Format the file.
-    match format_source_code(path, cli.range, settings, source_type, mode) {
-        Ok(result) => match mode {
-            FormatMode::Write => Ok(ExitStatus::Success),
-            FormatMode::Check | FormatMode::Diff => {
-                if result.is_formatted() {
-                    Ok(ExitStatus::Failure)
-                } else {
-                    Ok(ExitStatus::Success)
-                }
-            }
-        },
-        Err(err) => {
-            error!("{err}");
-            Ok(ExitStatus::Error)
-        }
-    }
-}
-
-/// Format source code read from `stdin`.
-fn format_source_code(
-    path: Option<&Path>,
-    range: Option<FormatRange>,
-    settings: &FormatterSettings,
-    source_type: PySourceType,
-    mode: FormatMode,
-) -> Result<FormatResult, FormatCommandError> {
-    // Read the source from stdin.
-    let source_code = read_from_stdin()
-        .map_err(|err| FormatCommandError::Read(path.map(Path::to_path_buf), err.into()))?;
-
-    let source_kind = match SourceKind::from_source_code(source_code, source_type) {
-        Ok(Some(source_kind)) => source_kind,
-        Ok(None) => return Ok(FormatResult::Unchanged),
-        Err(err) => {
-            return Err(FormatCommandError::Read(path.map(Path::to_path_buf), err));
-        }
-    };
-
-    // Format the source.
-    let formatted = format_source(&source_kind, source_type, path, settings, range)?;
-
-    match &formatted {
-        FormattedSource::Formatted(formatted) => match mode {
-            FormatMode::Write => {
-                let mut writer = stdout().lock();
-                formatted
-                    .write(&mut writer)
-                    .map_err(|err| FormatCommandError::Write(path.map(Path::to_path_buf), err))?;
-            }
-            FormatMode::Check => {}
-            FormatMode::Diff => {
-                use std::io::Write;
-                write!(
-                    &mut stdout().lock(),
-                    "{}",
-                    source_kind.diff(formatted, path).unwrap()
-                )
-                .map_err(|err| FormatCommandError::Diff(path.map(Path::to_path_buf), err))?;
-            }
-        },
-        FormattedSource::Unchanged => {
-            // Write to stdout regardless of whether the source was formatted
-            if mode.is_write() {
-                let mut writer = stdout().lock();
-                source_kind
-                    .write(&mut writer)
-                    .map_err(|err| FormatCommandError::Write(path.map(Path::to_path_buf), err))?;
-            }
-        }
-    }
-
-    Ok(FormatResult::from(formatted))
-}

crates/ruff/src/commands/linter.rs

@@ -1,71 +0,0 @@
-use std::fmt::Write;
-use std::io;
-use std::io::BufWriter;
-
-use anyhow::Result;
-use itertools::Itertools;
-use serde::Serialize;
-use strum::IntoEnumIterator;
-
-use ruff_linter::registry::{Linter, RuleNamespace};
-
-use crate::args::HelpFormat;
-
-#[derive(Serialize)]
-struct LinterInfo {
-    prefix: &'static str,
-    name: &'static str,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    categories: Option<Vec<LinterCategoryInfo>>,
-}
-
-#[derive(Serialize)]
-struct LinterCategoryInfo {
-    prefix: &'static str,
-    name: &'static str,
-}
-
-pub(crate) fn linter(format: HelpFormat) -> Result<()> {
-    let mut stdout = BufWriter::new(io::stdout().lock());
-    let mut output = String::new();
-
-    match format {
-        HelpFormat::Text => {
-            for linter in Linter::iter() {
-                let prefix = match linter.common_prefix() {
-                    "" => linter
-                        .upstream_categories()
-                        .unwrap()
-                        .iter()
-                        .map(|c| c.prefix)
-                        .join("/"),
-                    prefix => prefix.to_string(),
-                };
-                writeln!(output, "{:>4} {}", prefix, linter.name()).unwrap();
-            }
-        }
-
-        HelpFormat::Json => {
-            let linters: Vec<_> = Linter::iter()
-                .map(|linter_info| LinterInfo {
-                    prefix: linter_info.common_prefix(),
-                    name: linter_info.name(),
-                    categories: linter_info.upstream_categories().map(|cats| {
-                        cats.iter()
-                            .map(|c| LinterCategoryInfo {
-                                prefix: c.prefix,
-                                name: c.category,
-                            })
-                            .collect()
-                    }),
-                })
-                .collect();
-            output.push_str(&serde_json::to_string_pretty(&linters)?);
-            output.push('\n');
-        }
-    }
-
-    io::Write::write_fmt(&mut stdout, format_args!("{output}"))?;
-
-    Ok(())
-}

crates/ruff/src/commands/mod.rs

@@ -1,13 +0,0 @@
-pub(crate) mod add_noqa;
-pub(crate) mod check;
-pub(crate) mod check_stdin;
-pub(crate) mod clean;
-pub(crate) mod config;
-pub(crate) mod format;
-pub(crate) mod format_stdin;
-pub(crate) mod linter;
-pub(crate) mod rule;
-pub(crate) mod server;
-pub(crate) mod show_files;
-pub(crate) mod show_settings;
-pub(crate) mod version;

crates/ruff/src/commands/rule.rs

@@ -1,119 +0,0 @@
-use std::io::{self, BufWriter, Write};
-
-use anyhow::Result;
-use serde::ser::SerializeSeq;
-use serde::{Serialize, Serializer};
-use strum::IntoEnumIterator;
-
-use ruff_diagnostics::FixAvailability;
-use ruff_linter::registry::{Linter, Rule, RuleNamespace};
-
-use crate::args::HelpFormat;
-
-#[derive(Serialize)]
-struct Explanation<'a> {
-    name: &'a str,
-    code: String,
-    linter: &'a str,
-    summary: &'a str,
-    message_formats: &'a [&'a str],
-    fix: String,
-    #[allow(clippy::struct_field_names)]
-    explanation: Option<&'a str>,
-    preview: bool,
-}
-
-impl<'a> Explanation<'a> {
-    fn from_rule(rule: &'a Rule) -> Self {
-        let code = rule.noqa_code().to_string();
-        let (linter, _) = Linter::parse_code(&code).unwrap();
-        let fix = rule.fixable().to_string();
-        Self {
-            name: rule.as_ref(),
-            code,
-            linter: linter.name(),
-            summary: rule.message_formats()[0],
-            message_formats: rule.message_formats(),
-            fix,
-            explanation: rule.explanation(),
-            preview: rule.is_preview() || rule.is_nursery(),
-        }
-    }
-}
-
-fn format_rule_text(rule: Rule) -> String {
-    let mut output = String::new();
-    output.push_str(&format!("# {} ({})", rule.as_ref(), rule.noqa_code()));
-    output.push('\n');
-    output.push('\n');
-
-    let (linter, _) = Linter::parse_code(&rule.noqa_code().to_string()).unwrap();
-    output.push_str(&format!("Derived from the **{}** linter.", linter.name()));
-    output.push('\n');
-    output.push('\n');
-
-    let fix_availability = rule.fixable();
-    if matches!(
-        fix_availability,
-        FixAvailability::Always | FixAvailability::Sometimes
-    ) {
-        output.push_str(&fix_availability.to_string());
-        output.push('\n');
-        output.push('\n');
-    }
-
-    if rule.is_preview() || rule.is_nursery() {
-        output.push_str(
-            r"This rule is in preview and is not stable. The `--preview` flag is required for use.",
-        );
-        output.push('\n');
-        output.push('\n');
-    }
-
-    if let Some(explanation) = rule.explanation() {
-        output.push_str(explanation.trim());
-    } else {
-        output.push_str("Message formats:");
-        for format in rule.message_formats() {
-            output.push('\n');
-            output.push_str(&format!("* {format}"));
-        }
-    }
-    output
-}
-
-/// Explain a `Rule` to the user.
-pub(crate) fn rule(rule: Rule, format: HelpFormat) -> Result<()> {
-    let mut stdout = BufWriter::new(io::stdout().lock());
-    match format {
-        HelpFormat::Text => {
-            writeln!(stdout, "{}", format_rule_text(rule))?;
-        }
-        HelpFormat::Json => {
-            serde_json::to_writer_pretty(stdout, &Explanation::from_rule(&rule))?;
-        }
-    };
-    Ok(())
-}
-
-/// Explain all rules to the user.
-pub(crate) fn rules(format: HelpFormat) -> Result<()> {
-    let mut stdout = BufWriter::new(io::stdout().lock());
-    match format {
-        HelpFormat::Text => {
-            for rule in Rule::iter() {
-                writeln!(stdout, "{}", format_rule_text(rule))?;
-                writeln!(stdout)?;
-            }
-        }
-        HelpFormat::Json => {
-            let mut serializer = serde_json::Serializer::pretty(stdout);
-            let mut seq = serializer.serialize_seq(None)?;
-            for rule in Rule::iter() {
-                seq.serialize_element(&Explanation::from_rule(&rule))?;
-            }
-            seq.end()?;
-        }
-    }
-    Ok(())
-}

crates/ruff/src/commands/server.rs

@@ -1,79 +0,0 @@
-use std::num::NonZeroUsize;
-
-use crate::ExitStatus;
-use anyhow::Result;
-use ruff_linter::logging::LogLevel;
-use ruff_server::Server;
-use tracing::{level_filters::LevelFilter, metadata::Level, subscriber::Interest, Metadata};
-use tracing_subscriber::{
-    layer::{Context, Filter, SubscriberExt},
-    Layer, Registry,
-};
-use tracing_tree::time::Uptime;
-
-pub(crate) fn run_server(
-    preview: bool,
-    worker_threads: NonZeroUsize,
-    log_level: LogLevel,
-) -> Result<ExitStatus> {
-    if !preview {
-        tracing::error!("--preview needs to be provided as a command line argument while the server is still unstable.\nFor example: `ruff server --preview`");
-        return Ok(ExitStatus::Error);
-    }
-    let trace_level = if log_level == LogLevel::Verbose {
-        Level::TRACE
-    } else {
-        Level::DEBUG
-    };
-
-    let subscriber = Registry::default().with(
-        tracing_tree::HierarchicalLayer::default()
-            .with_indent_lines(true)
-            .with_indent_amount(2)
-            .with_bracketed_fields(true)
-            .with_targets(true)
-            .with_writer(|| Box::new(std::io::stderr()))
-            .with_timer(Uptime::default())
-            .with_filter(LoggingFilter { trace_level }),
-    );
-
-    tracing::subscriber::set_global_default(subscriber)?;
-
-    let server = Server::new(worker_threads)?;
-
-    server.run().map(|()| ExitStatus::Success)
-}
-
-struct LoggingFilter {
-    trace_level: Level,
-}
-
-impl LoggingFilter {
-    fn is_enabled(&self, meta: &Metadata<'_>) -> bool {
-        let filter = if meta.target().starts_with("ruff") {
-            self.trace_level
-        } else {
-            Level::INFO
-        };
-
-        meta.level() <= &filter
-    }
-}
-
-impl<S> Filter<S> for LoggingFilter {
-    fn enabled(&self, meta: &Metadata<'_>, _cx: &Context<'_, S>) -> bool {
-        self.is_enabled(meta)
-    }
-
-    fn callsite_enabled(&self, meta: &'static Metadata<'static>) -> Interest {
-        if self.is_enabled(meta) {
-            Interest::always()
-        } else {
-            Interest::never()
-        }
-    }
-
-    fn max_level_hint(&self) -> Option<LevelFilter> {
-        Some(LevelFilter::from_level(self.trace_level))
-    }
-}

crates/ruff/src/commands/show_files.rs

@@ -1,38 +0,0 @@
-use std::io::Write;
-use std::path::PathBuf;
-
-use anyhow::Result;
-use itertools::Itertools;
-
-use ruff_linter::warn_user_once;
-use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig, ResolvedFile};
-
-use crate::args::ConfigArguments;
-
-/// Show the list of files to be checked based on current settings.
-pub(crate) fn show_files(
-    files: &[PathBuf],
-    pyproject_config: &PyprojectConfig,
-    config_arguments: &ConfigArguments,
-    writer: &mut impl Write,
-) -> Result<()> {
-    // Collect all files in the hierarchy.
-    let (paths, _resolver) = python_files_in_path(files, pyproject_config, config_arguments)?;
-
-    if paths.is_empty() {
-        warn_user_once!("No Python files found under the given path(s)");
-        return Ok(());
-    }
-
-    // Print the list of files.
-    for path in paths
-        .into_iter()
-        .flatten()
-        .map(ResolvedFile::into_path)
-        .sorted_unstable()
-    {
-        writeln!(writer, "{}", path.to_string_lossy())?;
-    }
-
-    Ok(())
-}

crates/ruff/src/commands/show_settings.rs

@@ -1,41 +0,0 @@
-use std::io::Write;
-use std::path::PathBuf;
-
-use anyhow::{bail, Result};
-use itertools::Itertools;
-
-use ruff_workspace::resolver::{python_files_in_path, PyprojectConfig, ResolvedFile};
-
-use crate::args::ConfigArguments;
-
-/// Print the user-facing configuration settings.
-pub(crate) fn show_settings(
-    files: &[PathBuf],
-    pyproject_config: &PyprojectConfig,
-    config_arguments: &ConfigArguments,
-    writer: &mut impl Write,
-) -> Result<()> {
-    // Collect all files in the hierarchy.
-    let (paths, resolver) = python_files_in_path(files, pyproject_config, config_arguments)?;
-
-    // Print the list of files.
-    let Some(path) = paths
-        .into_iter()
-        .flatten()
-        .map(ResolvedFile::into_path)
-        .sorted_unstable()
-        .next()
-    else {
-        bail!("No files found under the given path");
-    };
-
-    let settings = resolver.resolve(&path);
-
-    writeln!(writer, "Resolved settings for: \"{}\"", path.display())?;
-    if let Some(settings_path) = pyproject_config.path.as_ref() {
-        writeln!(writer, "Settings path: \"{}\"", settings_path.display())?;
-    }
-    write!(writer, "{settings}")?;
-
-    Ok(())
-}

crates/ruff/src/commands/snapshots/ruff__commands__check__test__E902_E902.py.snap

@@ -1,7 +0,0 @@
----
-source: crates/ruff/src/commands/check.rs
----
-/home/ferris/project/code.py:1:1: E902 Permission denied (os error 13)
-/home/ferris/project/notebook.ipynb:1:1: E902 Permission denied (os error 13)
-/home/ferris/project/pyproject.toml:1:1: E902 Permission denied (os error 13)
-

crates/ruff/src/commands/version.rs

@@ -1,21 +0,0 @@
-use std::io::{self, BufWriter, Write};
-
-use anyhow::Result;
-
-use crate::args::HelpFormat;
-
-/// Display version information
-pub(crate) fn version(output_format: HelpFormat) -> Result<()> {
-    let mut stdout = BufWriter::new(io::stdout().lock());
-    let version_info = crate::version::version();
-
-    match output_format {
-        HelpFormat::Text => {
-            writeln!(stdout, "ruff {}", &version_info)?;
-        }
-        HelpFormat::Json => {
-            serde_json::to_writer_pretty(stdout, &version_info)?;
-        }
-    };
-    Ok(())
-}

crates/ruff/src/diagnostics.rs

@@ -1,524 +0,0 @@
-#![cfg_attr(target_family = "wasm", allow(dead_code))]
-
-use std::borrow::Cow;
-use std::fs::File;
-use std::io;
-use std::io::Write;
-use std::ops::{Add, AddAssign};
-use std::path::Path;
-
-use anyhow::{Context, Result};
-use colored::Colorize;
-use log::{debug, error, warn};
-use rustc_hash::FxHashMap;
-
-use ruff_diagnostics::Diagnostic;
-use ruff_linter::linter::{lint_fix, lint_only, FixTable, FixerResult, LinterResult, ParseSource};
-use ruff_linter::logging::DisplayParseError;
-use ruff_linter::message::Message;
-use ruff_linter::pyproject_toml::lint_pyproject_toml;
-use ruff_linter::registry::AsRule;
-use ruff_linter::settings::types::UnsafeFixes;
-use ruff_linter::settings::{flags, LinterSettings};
-use ruff_linter::source_kind::{SourceError, SourceKind};
-use ruff_linter::{fs, IOError, SyntaxError};
-use ruff_notebook::{Notebook, NotebookError, NotebookIndex};
-use ruff_python_ast::imports::ImportMap;
-use ruff_python_ast::{PySourceType, SourceType, TomlSourceType};
-use ruff_source_file::SourceFileBuilder;
-use ruff_text_size::{TextRange, TextSize};
-use ruff_workspace::Settings;
-
-use crate::cache::{Cache, FileCacheKey, LintCacheData};
-
-#[derive(Debug, Default, PartialEq)]
-pub(crate) struct Diagnostics {
-    pub(crate) messages: Vec<Message>,
-    pub(crate) fixed: FixMap,
-    pub(crate) imports: ImportMap,
-    pub(crate) notebook_indexes: FxHashMap<String, NotebookIndex>,
-}
-
-impl Diagnostics {
-    pub(crate) fn new(
-        messages: Vec<Message>,
-        imports: ImportMap,
-        notebook_indexes: FxHashMap<String, NotebookIndex>,
-    ) -> Self {
-        Self {
-            messages,
-            fixed: FixMap::default(),
-            imports,
-            notebook_indexes,
-        }
-    }
-
-    /// Generate [`Diagnostics`] based on a [`SourceError`].
-    pub(crate) fn from_source_error(
-        err: &SourceError,
-        path: Option<&Path>,
-        settings: &LinterSettings,
-    ) -> Self {
-        let diagnostic = match err {
-            // IO errors.
-            SourceError::Io(_)
-            | SourceError::Notebook(NotebookError::Io(_) | NotebookError::Json(_)) => {
-                Diagnostic::new(
-                    IOError {
-                        message: err.to_string(),
-                    },
-                    TextRange::default(),
-                )
-            }
-            // Syntax errors.
-            SourceError::Notebook(
-                NotebookError::InvalidJson(_)
-                | NotebookError::InvalidSchema(_)
-                | NotebookError::InvalidFormat(_),
-            ) => Diagnostic::new(
-                SyntaxError {
-                    message: err.to_string(),
-                },
-                TextRange::default(),
-            ),
-        };
-
-        if settings.rules.enabled(diagnostic.kind.rule()) {
-            let name = path.map_or_else(|| "-".into(), Path::to_string_lossy);
-            let dummy = SourceFileBuilder::new(name, "").finish();
-            Self::new(
-                vec![Message::from_diagnostic(
-                    diagnostic,
-                    dummy,
-                    TextSize::default(),
-                )],
-                ImportMap::default(),
-                FxHashMap::default(),
-            )
-        } else {
-            match path {
-                Some(path) => {
-                    warn!(
-                        "{}{}{} {err}",
-                        "Failed to lint ".bold(),
-                        fs::relativize_path(path).bold(),
-                        ":".bold()
-                    );
-                }
-                None => {
-                    warn!("{}{} {err}", "Failed to lint".bold(), ":".bold());
-                }
-            }
-
-            Self::default()
-        }
-    }
-}
-
-impl Add for Diagnostics {
-    type Output = Diagnostics;
-
-    fn add(mut self, other: Self) -> Self::Output {
-        self += other;
-        self
-    }
-}
-
-impl AddAssign for Diagnostics {
-    fn add_assign(&mut self, other: Self) {
-        self.messages.extend(other.messages);
-        self.imports.extend(other.imports);
-        self.fixed += other.fixed;
-        self.notebook_indexes.extend(other.notebook_indexes);
-    }
-}
-
-/// A collection of fixes indexed by file path.
-#[derive(Debug, Default, PartialEq)]
-pub(crate) struct FixMap(FxHashMap<String, FixTable>);
-
-impl FixMap {
-    /// Returns `true` if there are no fixes in the map.
-    pub(crate) fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-
-    /// Returns an iterator over the fixes in the map, along with the file path.
-    pub(crate) fn iter(&self) -> impl Iterator<Item = (&String, &FixTable)> {
-        self.0.iter()
-    }
-
-    /// Returns an iterator over the fixes in the map.
-    pub(crate) fn values(&self) -> impl Iterator<Item = &FixTable> {
-        self.0.values()
-    }
-}
-
-impl FromIterator<(String, FixTable)> for FixMap {
-    fn from_iter<T: IntoIterator<Item = (String, FixTable)>>(iter: T) -> Self {
-        Self(
-            iter.into_iter()
-                .filter(|(_, fixes)| !fixes.is_empty())
-                .collect(),
-        )
-    }
-}
-
-impl AddAssign for FixMap {
-    fn add_assign(&mut self, rhs: Self) {
-        for (filename, fixed) in rhs.0 {
-            if fixed.is_empty() {
-                continue;
-            }
-            let fixed_in_file = self.0.entry(filename).or_default();
-            for (rule, count) in fixed {
-                if count > 0 {
-                    *fixed_in_file.entry(rule).or_default() += count;
-                }
-            }
-        }
-    }
-}
-
-/// Lint the source code at the given `Path`.
-pub(crate) fn lint_path(
-    path: &Path,
-    package: Option<&Path>,
-    settings: &LinterSettings,
-    cache: Option<&Cache>,
-    noqa: flags::Noqa,
-    fix_mode: flags::FixMode,
-    unsafe_fixes: UnsafeFixes,
-) -> Result<Diagnostics> {
-    // Check the cache.
-    let caching = match cache {
-        Some(cache) if noqa.into() => {
-            let relative_path = cache
-                .relative_path(path)
-                .expect("wrong package cache for file");
-
-            let cache_key = FileCacheKey::from_path(path).context("Failed to create cache key")?;
-            let cached_diagnostics = cache
-                .get(relative_path, &cache_key)
-                .and_then(|entry| entry.to_diagnostics(path));
-            if let Some(diagnostics) = cached_diagnostics {
-                // `FixMode::Generate` and `FixMode::Diff` rely on side-effects (writing to disk,
-                // and writing the diff to stdout, respectively). If a file has diagnostics, we
-                // need to avoid reading from and writing to the cache in these modes.
-                if match fix_mode {
-                    flags::FixMode::Generate => true,
-                    flags::FixMode::Apply | flags::FixMode::Diff => {
-                        diagnostics.messages.is_empty() && diagnostics.fixed.is_empty()
-                    }
-                } {
-                    return Ok(diagnostics);
-                }
-            }
-
-            // Stash the file metadata for later so when we update the cache it reflects the prerun
-            // information
-            Some((cache, relative_path, cache_key))
-        }
-        _ => None,
-    };
-
-    debug!("Checking: {}", path.display());
-
-    let source_type = match settings.extension.get(path).map(PySourceType::from) {
-        Some(source_type) => source_type,
-        None => match SourceType::from(path) {
-            SourceType::Toml(TomlSourceType::Pyproject) => {
-                let messages = if settings
-                    .rules
-                    .iter_enabled()
-                    .any(|rule_code| rule_code.lint_source().is_pyproject_toml())
-                {
-                    let contents = match std::fs::read_to_string(path).map_err(SourceError::from) {
-                        Ok(contents) => contents,
-                        Err(err) => {
-                            return Ok(Diagnostics::from_source_error(&err, Some(path), settings));
-                        }
-                    };
-                    let source_file =
-                        SourceFileBuilder::new(path.to_string_lossy(), contents).finish();
-                    lint_pyproject_toml(source_file, settings)
-                } else {
-                    vec![]
-                };
-                return Ok(Diagnostics {
-                    messages,
-                    ..Diagnostics::default()
-                });
-            }
-            SourceType::Toml(_) => return Ok(Diagnostics::default()),
-            SourceType::Python(source_type) => source_type,
-        },
-    };
-
-    // Extract the sources from the file.
-    let source_kind = match SourceKind::from_path(path, source_type) {
-        Ok(Some(source_kind)) => source_kind,
-        Ok(None) => return Ok(Diagnostics::default()),
-        Err(err) => {
-            return Ok(Diagnostics::from_source_error(&err, Some(path), settings));
-        }
-    };
-
-    // Lint the file.
-    let (
-        LinterResult {
-            data: (messages, imports),
-            error: parse_error,
-        },
-        transformed,
-        fixed,
-    ) = if matches!(fix_mode, flags::FixMode::Apply | flags::FixMode::Diff) {
-        if let Ok(FixerResult {
-            result,
-            transformed,
-            fixed,
-        }) = lint_fix(
-            path,
-            package,
-            noqa,
-            unsafe_fixes,
-            settings,
-            &source_kind,
-            source_type,
-        ) {
-            if !fixed.is_empty() {
-                match fix_mode {
-                    flags::FixMode::Apply => transformed.write(&mut File::create(path)?)?,
-                    flags::FixMode::Diff => {
-                        write!(
-                            &mut io::stdout().lock(),
-                            "{}",
-                            source_kind.diff(&transformed, Some(path)).unwrap()
-                        )?;
-                    }
-                    flags::FixMode::Generate => {}
-                }
-            }
-            let transformed = if let Cow::Owned(transformed) = transformed {
-                transformed
-            } else {
-                source_kind
-            };
-            (result, transformed, fixed)
-        } else {
-            // If we fail to fix, lint the original source code.
-            let result = lint_only(
-                path,
-                package,
-                settings,
-                noqa,
-                &source_kind,
-                source_type,
-                ParseSource::None,
-            );
-            let transformed = source_kind;
-            let fixed = FxHashMap::default();
-            (result, transformed, fixed)
-        }
-    } else {
-        let result = lint_only(
-            path,
-            package,
-            settings,
-            noqa,
-            &source_kind,
-            source_type,
-            ParseSource::None,
-        );
-        let transformed = source_kind;
-        let fixed = FxHashMap::default();
-        (result, transformed, fixed)
-    };
-
-    let imports = imports.unwrap_or_default();
-
-    if let Some((cache, relative_path, key)) = caching {
-        // We don't cache parsing errors.
-        if parse_error.is_none() {
-            // `FixMode::Apply` and `FixMode::Diff` rely on side-effects (writing to disk,
-            // and writing the diff to stdout, respectively). If a file has diagnostics, we
-            // need to avoid reading from and writing to the cache in these modes.
-            if match fix_mode {
-                flags::FixMode::Generate => true,
-                flags::FixMode::Apply | flags::FixMode::Diff => {
-                    messages.is_empty() && fixed.is_empty()
-                }
-            } {
-                cache.update_lint(
-                    relative_path.to_owned(),
-                    &key,
-                    LintCacheData::from_messages(
-                        &messages,
-                        imports.clone(),
-                        transformed.as_ipy_notebook().map(Notebook::index).cloned(),
-                    ),
-                );
-            }
-        }
-    }
-
-    if let Some(error) = parse_error {
-        error!(
-            "{}",
-            DisplayParseError::from_source_kind(error, Some(path.to_path_buf()), &transformed)
-        );
-    }
-
-    let notebook_indexes = if let SourceKind::IpyNotebook(notebook) = transformed {
-        FxHashMap::from_iter([(path.to_string_lossy().to_string(), notebook.into_index())])
-    } else {
-        FxHashMap::default()
-    };
-
-    Ok(Diagnostics {
-        messages,
-        fixed: FixMap::from_iter([(fs::relativize_path(path), fixed)]),
-        imports,
-        notebook_indexes,
-    })
-}
-
-/// Generate `Diagnostic`s from source code content derived from
-/// stdin.
-pub(crate) fn lint_stdin(
-    path: Option<&Path>,
-    package: Option<&Path>,
-    contents: String,
-    settings: &Settings,
-    noqa: flags::Noqa,
-    fix_mode: flags::FixMode,
-) -> Result<Diagnostics> {
-    // TODO(charlie): Support `pyproject.toml`.
-    let source_type = match path.and_then(|path| settings.linter.extension.get(path)) {
-        None => match path.map(SourceType::from).unwrap_or_default() {
-            SourceType::Python(source_type) => source_type,
-            SourceType::Toml(_) => {
-                return Ok(Diagnostics::default());
-            }
-        },
-        Some(language) => PySourceType::from(language),
-    };
-
-    // Extract the sources from the file.
-    let source_kind = match SourceKind::from_source_code(contents, source_type) {
-        Ok(Some(source_kind)) => source_kind,
-        Ok(None) => return Ok(Diagnostics::default()),
-        Err(err) => {
-            return Ok(Diagnostics::from_source_error(&err, path, &settings.linter));
-        }
-    };
-
-    // Lint the inputs.
-    let (
-        LinterResult {
-            data: (messages, imports),
-            error: parse_error,
-        },
-        transformed,
-        fixed,
-    ) = if matches!(fix_mode, flags::FixMode::Apply | flags::FixMode::Diff) {
-        if let Ok(FixerResult {
-            result,
-            transformed,
-            fixed,
-        }) = lint_fix(
-            path.unwrap_or_else(|| Path::new("-")),
-            package,
-            noqa,
-            settings.unsafe_fixes,
-            &settings.linter,
-            &source_kind,
-            source_type,
-        ) {
-            match fix_mode {
-                flags::FixMode::Apply => {
-                    // Write the contents to stdout, regardless of whether any errors were fixed.
-                    transformed.write(&mut io::stdout().lock())?;
-                }
-                flags::FixMode::Diff => {
-                    // But only write a diff if it's non-empty.
-                    if !fixed.is_empty() {
-                        write!(
-                            &mut io::stdout().lock(),
-                            "{}",
-                            source_kind.diff(&transformed, path).unwrap()
-                        )?;
-                    }
-                }
-                flags::FixMode::Generate => {}
-            }
-            let transformed = if let Cow::Owned(transformed) = transformed {
-                transformed
-            } else {
-                source_kind
-            };
-            (result, transformed, fixed)
-        } else {
-            // If we fail to fix, lint the original source code.
-            let result = lint_only(
-                path.unwrap_or_else(|| Path::new("-")),
-                package,
-                &settings.linter,
-                noqa,
-                &source_kind,
-                source_type,
-                ParseSource::None,
-            );
-
-            // Write the contents to stdout anyway.
-            if fix_mode.is_apply() {
-                source_kind.write(&mut io::stdout().lock())?;
-            }
-
-            let transformed = source_kind;
-            let fixed = FxHashMap::default();
-            (result, transformed, fixed)
-        }
-    } else {
-        let result = lint_only(
-            path.unwrap_or_else(|| Path::new("-")),
-            package,
-            &settings.linter,
-            noqa,
-            &source_kind,
-            source_type,
-            ParseSource::None,
-        );
-        let transformed = source_kind;
-        let fixed = FxHashMap::default();
-        (result, transformed, fixed)
-    };
-
-    let imports = imports.unwrap_or_default();
-
-    if let Some(error) = parse_error {
-        error!(
-            "{}",
-            DisplayParseError::from_source_kind(error, path.map(Path::to_path_buf), &transformed)
-        );
-    }
-
-    let notebook_indexes = if let SourceKind::IpyNotebook(notebook) = transformed {
-        FxHashMap::from_iter([(
-            path.map_or_else(|| "-".into(), |path| path.to_string_lossy().to_string()),
-            notebook.into_index(),
-        )])
-    } else {
-        FxHashMap::default()
-    };
-
-    Ok(Diagnostics {
-        messages,
-        fixed: FixMap::from_iter([(
-            fs::relativize_path(path.unwrap_or_else(|| Path::new("-"))),
-            fixed,
-        )]),
-        imports,
-        notebook_indexes,
-    })
-}

crates/ruff/src/lib.rs

@@ -1,561 +0,0 @@
-#![allow(clippy::print_stdout)]
-
-use std::fs::File;
-use std::io::{self, stdout, BufWriter, Write};
-use std::num::NonZeroUsize;
-use std::path::{Path, PathBuf};
-use std::process::ExitCode;
-use std::sync::mpsc::channel;
-
-use anyhow::Result;
-use args::{GlobalConfigArgs, ServerCommand};
-use clap::CommandFactory;
-use colored::Colorize;
-use log::warn;
-use notify::{recommended_watcher, RecursiveMode, Watcher};
-
-use ruff_linter::logging::{set_up_logging, LogLevel};
-use ruff_linter::settings::flags::FixMode;
-use ruff_linter::settings::types::SerializationFormat;
-use ruff_linter::{fs, warn_user, warn_user_once};
-use ruff_workspace::Settings;
-
-use crate::args::{Args, CheckCommand, Command, FormatCommand};
-use crate::printer::{Flags as PrinterFlags, Printer};
-
-pub mod args;
-mod cache;
-mod commands;
-mod diagnostics;
-mod panic;
-mod printer;
-pub mod resolve;
-mod stdin;
-mod version;
-
-#[derive(Copy, Clone)]
-pub enum ExitStatus {
-    /// Linting was successful and there were no linting errors.
-    Success,
-    /// Linting was successful but there were linting errors.
-    Failure,
-    /// Linting failed.
-    Error,
-}
-
-impl From<ExitStatus> for ExitCode {
-    fn from(status: ExitStatus) -> Self {
-        match status {
-            ExitStatus::Success => ExitCode::from(0),
-            ExitStatus::Failure => ExitCode::from(1),
-            ExitStatus::Error => ExitCode::from(2),
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug, Eq, PartialEq)]
-enum ChangeKind {
-    Configuration,
-    SourceFile,
-}
-
-/// Return the [`ChangeKind`] based on the list of modified file paths.
-///
-/// Returns `None` if no relevant changes were detected.
-fn change_detected(paths: &[PathBuf]) -> Option<ChangeKind> {
-    // If any `.toml` files were modified, return `ChangeKind::Configuration`. Otherwise, return
-    // `ChangeKind::SourceFile` if any `.py`, `.pyi`, `.pyw`, or `.ipynb` files were modified.
-    let mut source_file = false;
-    for path in paths {
-        if let Some(suffix) = path.extension() {
-            match suffix.to_str() {
-                Some("toml") => {
-                    return Some(ChangeKind::Configuration);
-                }
-                Some("py" | "pyi" | "pyw" | "ipynb") => source_file = true,
-                _ => {}
-            }
-        }
-    }
-    if source_file {
-        return Some(ChangeKind::SourceFile);
-    }
-    None
-}
-
-/// Returns true if the command should read from standard input.
-fn is_stdin(files: &[PathBuf], stdin_filename: Option<&Path>) -> bool {
-    // If the user provided a `--stdin-filename`, always read from standard input.
-    if stdin_filename.is_some() {
-        if let Some(file) = files.iter().find(|file| file.as_path() != Path::new("-")) {
-            warn_user_once!(
-                "Ignoring file {} in favor of standard input.",
-                file.display()
-            );
-        }
-        return true;
-    }
-
-    let [file] = files else {
-        return false;
-    };
-    // If the user provided exactly `-`, read from standard input.
-    file == Path::new("-")
-}
-
-/// Returns the default set of files if none are provided, otherwise returns `None`.
-fn resolve_default_files(files: Vec<PathBuf>, is_stdin: bool) -> Vec<PathBuf> {
-    if files.is_empty() {
-        if is_stdin {
-            vec![Path::new("-").to_path_buf()]
-        } else {
-            vec![Path::new(".").to_path_buf()]
-        }
-    } else {
-        files
-    }
-}
-
-pub fn run(
-    Args {
-        command,
-        global_options,
-    }: Args,
-    deprecated_alias_warning: Option<&'static str>,
-) -> Result<ExitStatus> {
-    {
-        let default_panic_hook = std::panic::take_hook();
-        std::panic::set_hook(Box::new(move |info| {
-            #[allow(clippy::print_stderr)]
-            {
-                eprintln!(
-                    r#"
-{}{} {} If you could open an issue at:
-
-    https://github.com/astral-sh/ruff/issues/new?title=%5BPanic%5D
-
-...quoting the executed command, along with the relevant file contents and `pyproject.toml` settings, we'd be very appreciative!
-"#,
-                    "error".red().bold(),
-                    ":".bold(),
-                    "Ruff crashed.".bold(),
-                );
-            }
-            default_panic_hook(info);
-        }));
-    }
-
-    // Enabled ANSI colors on Windows 10.
-    #[cfg(windows)]
-    assert!(colored::control::set_virtual_terminal(true).is_ok());
-
-    // support FORCE_COLOR env var
-    if let Some(force_color) = std::env::var_os("FORCE_COLOR") {
-        if force_color.len() > 0 {
-            colored::control::set_override(true);
-        }
-    }
-
-    set_up_logging(global_options.log_level())?;
-
-    if let Some(deprecated_alias_warning) = deprecated_alias_warning {
-        warn_user!("{}", deprecated_alias_warning);
-    }
-
-    match command {
-        Command::Version { output_format } => {
-            commands::version::version(output_format)?;
-            Ok(ExitStatus::Success)
-        }
-        Command::Rule {
-            rule,
-            all,
-            output_format,
-        } => {
-            if all {
-                commands::rule::rules(output_format)?;
-            }
-            if let Some(rule) = rule {
-                commands::rule::rule(rule, output_format)?;
-            }
-            Ok(ExitStatus::Success)
-        }
-        Command::Config { option } => {
-            commands::config::config(option.as_deref())?;
-            Ok(ExitStatus::Success)
-        }
-        Command::Linter { output_format } => {
-            commands::linter::linter(output_format)?;
-            Ok(ExitStatus::Success)
-        }
-        Command::Clean => {
-            commands::clean::clean(global_options.log_level())?;
-            Ok(ExitStatus::Success)
-        }
-        Command::GenerateShellCompletion { shell } => {
-            shell.generate(&mut Args::command(), &mut stdout());
-            Ok(ExitStatus::Success)
-        }
-        Command::Check(args) => check(args, global_options),
-        Command::Format(args) => format(args, global_options),
-        Command::Server(args) => server(args, global_options.log_level()),
-    }
-}
-
-fn format(args: FormatCommand, global_options: GlobalConfigArgs) -> Result<ExitStatus> {
-    let (cli, config_arguments) = args.partition(global_options)?;
-
-    if is_stdin(&cli.files, cli.stdin_filename.as_deref()) {
-        commands::format_stdin::format_stdin(&cli, &config_arguments)
-    } else {
-        commands::format::format(cli, &config_arguments)
-    }
-}
-
-fn server(args: ServerCommand, log_level: LogLevel) -> Result<ExitStatus> {
-    let ServerCommand { preview } = args;
-    // by default, we set the number of worker threads to `num_cpus`, with a maximum of 4.
-    let worker_threads = num_cpus::get().max(4);
-    commands::server::run_server(
-        preview,
-        NonZeroUsize::try_from(worker_threads).expect("a non-zero worker thread count"),
-        log_level,
-    )
-}
-
-pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<ExitStatus> {
-    let (cli, config_arguments) = args.partition(global_options)?;
-
-    // Construct the "default" settings. These are used when no `pyproject.toml`
-    // files are present, or files are injected from outside of the hierarchy.
-    let pyproject_config = resolve::resolve(&config_arguments, cli.stdin_filename.as_deref())?;
-
-    let mut writer: Box<dyn Write> = match cli.output_file {
-        Some(path) if !cli.watch => {
-            colored::control::set_override(false);
-            let file = File::create(path)?;
-            Box::new(BufWriter::new(file))
-        }
-        _ => Box::new(BufWriter::new(io::stdout())),
-    };
-    let stderr_writer = Box::new(BufWriter::new(io::stderr()));
-
-    let is_stdin = is_stdin(&cli.files, cli.stdin_filename.as_deref());
-    let files = resolve_default_files(cli.files, is_stdin);
-
-    if cli.show_settings {
-        commands::show_settings::show_settings(
-            &files,
-            &pyproject_config,
-            &config_arguments,
-            &mut writer,
-        )?;
-        return Ok(ExitStatus::Success);
-    }
-    if cli.show_files {
-        commands::show_files::show_files(
-            &files,
-            &pyproject_config,
-            &config_arguments,
-            &mut writer,
-        )?;
-        return Ok(ExitStatus::Success);
-    }
-
-    // Extract options that are included in `Settings`, but only apply at the top
-    // level.
-    let Settings {
-        fix,
-        fix_only,
-        unsafe_fixes,
-        output_format,
-        show_fixes,
-        ..
-    } = pyproject_config.settings;
-
-    // Fix rules are as follows:
-    // - By default, generate all fixes, but don't apply them to the filesystem.
-    // - If `--fix` or `--fix-only` is set, apply applicable fixes to the filesystem (or
-    //   print them to stdout, if we're reading from stdin).
-    // - If `--diff` or `--fix-only` are set, don't print any violations (only applicable fixes)
-    // - By default, applicable fixes only include [`Applicablility::Automatic`], but if
-    //   `--unsafe-fixes` is set, then [`Applicablility::Suggested`] fixes are included.
-
-    let fix_mode = if cli.diff {
-        FixMode::Diff
-    } else if fix || fix_only {
-        FixMode::Apply
-    } else {
-        FixMode::Generate
-    };
-
-    let cache = !cli.no_cache;
-    let noqa = !cli.ignore_noqa;
-    let mut printer_flags = PrinterFlags::empty();
-    if !(cli.diff || fix_only) {
-        printer_flags |= PrinterFlags::SHOW_VIOLATIONS;
-    }
-    if show_fixes {
-        printer_flags |= PrinterFlags::SHOW_FIX_SUMMARY;
-    }
-    if cli.ecosystem_ci {
-        warn_user!(
-            "The formatting of fixes emitted by this option is a work-in-progress, subject to \
-            change at any time, and intended only for internal use."
-        );
-        printer_flags |= PrinterFlags::SHOW_FIX_DIFF;
-    }
-
-    #[cfg(debug_assertions)]
-    if cache {
-        // `--no-cache` doesn't respect code changes, and so is often confusing during
-        // development.
-        warn_user!("Detected debug build without --no-cache.");
-    }
-
-    if cli.add_noqa {
-        if !fix_mode.is_generate() {
-            warn_user!("--fix is incompatible with --add-noqa.");
-        }
-        let modifications =
-            commands::add_noqa::add_noqa(&files, &pyproject_config, &config_arguments)?;
-        if modifications > 0 && config_arguments.log_level >= LogLevel::Default {
-            let s = if modifications == 1 { "" } else { "s" };
-            #[allow(clippy::print_stderr)]
-            {
-                eprintln!("Added {modifications} noqa directive{s}.");
-            }
-        }
-        return Ok(ExitStatus::Success);
-    }
-
-    let printer = Printer::new(
-        output_format,
-        config_arguments.log_level,
-        fix_mode,
-        unsafe_fixes,
-        printer_flags,
-    );
-
-    // the settings should already be combined with the CLI overrides at this point
-    // TODO(jane): let's make this `PreviewMode`
-    // TODO: this should reference the global preview mode once https://github.com/astral-sh/ruff/issues/8232
-    //   is resolved.
-    let preview = pyproject_config.settings.linter.preview.is_enabled();
-
-    if cli.watch {
-        if output_format != SerializationFormat::default(preview) {
-            warn_user!(
-                "`--output-format {}` is always used in watch mode.",
-                SerializationFormat::default(preview)
-            );
-        }
-
-        // Configure the file watcher.
-        let (tx, rx) = channel();
-        let mut watcher = recommended_watcher(tx)?;
-        for file in &files {
-            watcher.watch(file, RecursiveMode::Recursive)?;
-        }
-        if let Some(file) = pyproject_config.path.as_ref() {
-            watcher.watch(file, RecursiveMode::Recursive)?;
-        }
-
-        // Perform an initial run instantly.
-        Printer::clear_screen()?;
-        printer.write_to_user("Starting linter in watch mode...\n");
-
-        let messages = commands::check::check(
-            &files,
-            &pyproject_config,
-            &config_arguments,
-            cache.into(),
-            noqa.into(),
-            fix_mode,
-            unsafe_fixes,
-        )?;
-        printer.write_continuously(&mut writer, &messages, preview)?;
-
-        // In watch mode, we may need to re-resolve the configuration.
-        // TODO(charlie): Re-compute other derivative values, like the `printer`.
-        let mut pyproject_config = pyproject_config;
-
-        loop {
-            match rx.recv() {
-                Ok(event) => {
-                    let Some(change_kind) = change_detected(&event?.paths) else {
-                        continue;
-                    };
-
-                    if matches!(change_kind, ChangeKind::Configuration) {
-                        pyproject_config =
-                            resolve::resolve(&config_arguments, cli.stdin_filename.as_deref())?;
-                    }
-                    Printer::clear_screen()?;
-                    printer.write_to_user("File change detected...\n");
-
-                    let messages = commands::check::check(
-                        &files,
-                        &pyproject_config,
-                        &config_arguments,
-                        cache.into(),
-                        noqa.into(),
-                        fix_mode,
-                        unsafe_fixes,
-                    )?;
-                    printer.write_continuously(&mut writer, &messages, preview)?;
-                }
-                Err(err) => return Err(err.into()),
-            }
-        }
-    } else {
-        // Generate lint violations.
-        let diagnostics = if is_stdin {
-            commands::check_stdin::check_stdin(
-                cli.stdin_filename.map(fs::normalize_path).as_deref(),
-                &pyproject_config,
-                &config_arguments,
-                noqa.into(),
-                fix_mode,
-            )?
-        } else {
-            commands::check::check(
-                &files,
-                &pyproject_config,
-                &config_arguments,
-                cache.into(),
-                noqa.into(),
-                fix_mode,
-                unsafe_fixes,
-            )?
-        };
-
-        // Always try to print violations (though the printer itself may suppress output)
-        // If we're writing fixes via stdin, the transformed source code goes to the writer
-        // so send the summary to stderr instead
-        let mut summary_writer = if is_stdin && matches!(fix_mode, FixMode::Apply | FixMode::Diff) {
-            stderr_writer
-        } else {
-            writer
-        };
-        if cli.statistics {
-            printer.write_statistics(&diagnostics, &mut summary_writer)?;
-        } else {
-            printer.write_once(&diagnostics, &mut summary_writer)?;
-        }
-
-        if !cli.exit_zero {
-            if cli.diff {
-                // If we're printing a diff, we always want to exit non-zero if there are
-                // any fixable violations (since we've printed the diff, but not applied the
-                // fixes).
-                if !diagnostics.fixed.is_empty() {
-                    return Ok(ExitStatus::Failure);
-                }
-            } else if fix_only {
-                // If we're only fixing, we want to exit zero (since we've fixed all fixable
-                // violations), unless we're explicitly asked to exit non-zero on fix.
-                if cli.exit_non_zero_on_fix {
-                    if !diagnostics.fixed.is_empty() {
-                        return Ok(ExitStatus::Failure);
-                    }
-                }
-            } else {
-                // If we're running the linter (not just fixing), we want to exit non-zero if
-                // there are any violations, unless we're explicitly asked to exit zero on
-                // fix.
-                if cli.exit_non_zero_on_fix {
-                    if !diagnostics.fixed.is_empty() || !diagnostics.messages.is_empty() {
-                        return Ok(ExitStatus::Failure);
-                    }
-                } else {
-                    if !diagnostics.messages.is_empty() {
-                        return Ok(ExitStatus::Failure);
-                    }
-                }
-            }
-        }
-    }
-    Ok(ExitStatus::Success)
-}
-
-#[cfg(test)]
-mod test_file_change_detector {
-    use std::path::PathBuf;
-
-    use crate::{change_detected, ChangeKind};
-
-    #[test]
-    fn detect_correct_file_change() {
-        assert_eq!(
-            Some(ChangeKind::Configuration),
-            change_detected(&[
-                PathBuf::from("tmp/pyproject.toml"),
-                PathBuf::from("tmp/bin/ruff.rs"),
-            ]),
-        );
-        assert_eq!(
-            Some(ChangeKind::Configuration),
-            change_detected(&[
-                PathBuf::from("pyproject.toml"),
-                PathBuf::from("tmp/bin/ruff.rs"),
-            ]),
-        );
-        assert_eq!(
-            Some(ChangeKind::Configuration),
-            change_detected(&[
-                PathBuf::from("tmp1/tmp2/tmp3/pyproject.toml"),
-                PathBuf::from("tmp/bin/ruff.rs"),
-            ]),
-        );
-        assert_eq!(
-            Some(ChangeKind::Configuration),
-            change_detected(&[
-                PathBuf::from("tmp/ruff.toml"),
-                PathBuf::from("tmp/bin/ruff.rs"),
-            ]),
-        );
-        assert_eq!(
-            Some(ChangeKind::Configuration),
-            change_detected(&[
-                PathBuf::from("tmp/.ruff.toml"),
-                PathBuf::from("tmp/bin/ruff.rs"),
-            ]),
-        );
-        assert_eq!(
-            Some(ChangeKind::SourceFile),
-            change_detected(&[
-                PathBuf::from("tmp/rule.py"),
-                PathBuf::from("tmp/bin/ruff.rs"),
-            ]),
-        );
-        assert_eq!(
-            Some(ChangeKind::SourceFile),
-            change_detected(&[
-                PathBuf::from("tmp/rule.pyi"),
-                PathBuf::from("tmp/bin/ruff.rs"),
-            ]),
-        );
-        assert_eq!(
-            Some(ChangeKind::Configuration),
-            change_detected(&[
-                PathBuf::from("pyproject.toml"),
-                PathBuf::from("tmp/rule.py"),
-            ]),
-        );
-        assert_eq!(
-            Some(ChangeKind::Configuration),
-            change_detected(&[
-                PathBuf::from("tmp/rule.py"),
-                PathBuf::from("pyproject.toml"),
-            ]),
-        );
-        assert_eq!(
-            None,
-            change_detected(&[
-                PathBuf::from("tmp/rule.js"),
-                PathBuf::from("tmp/bin/ruff.rs"),
-            ]),
-        );
-    }
-}

crates/ruff/src/main.rs

@@ -1,83 +0,0 @@
-use std::process::ExitCode;
-
-use clap::{Parser, Subcommand};
-use colored::Colorize;
-
-use ruff::args::{Args, Command};
-use ruff::{run, ExitStatus};
-
-#[cfg(target_os = "windows")]
-#[global_allocator]
-static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
-
-#[cfg(all(
-    not(target_os = "windows"),
-    not(target_os = "openbsd"),
-    any(
-        target_arch = "x86_64",
-        target_arch = "aarch64",
-        target_arch = "powerpc64"
-    )
-))]
-#[global_allocator]
-static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
-
-pub fn main() -> ExitCode {
-    let args = wild::args_os();
-    let mut args =
-        argfile::expand_args_from(args, argfile::parse_fromfile, argfile::PREFIX).unwrap();
-
-    // We can't use `warn_user` here because logging isn't set up at this point
-    // and we also don't know if the user runs ruff with quiet.
-    // Keep the message and pass it to `run` that is responsible for emitting the warning.
-    let deprecated_alias_warning = match args.get(1).and_then(|arg| arg.to_str()) {
-        // Deprecated aliases that are handled by clap
-        Some("--explain") => {
-            Some("`ruff --explain <RULE>` is deprecated. Use `ruff rule <RULE>` instead.")
-        }
-        Some("--clean") => {
-            Some("`ruff --clean` is deprecated. Use `ruff clean` instead.")
-        }
-        Some("--generate-shell-completion") => {
-            Some("`ruff --generate-shell-completion <SHELL>` is deprecated. Use `ruff generate-shell-completion <SHELL>` instead.")
-        }
-        // Deprecated `ruff` alias to `ruff check`
-        // Clap doesn't support default subcommands but we want to run `check` by
-        // default for convenience and backwards-compatibility, so we just
-        // preprocess the arguments accordingly before passing them to Clap.
-        Some(arg) if !Command::has_subcommand(arg)
-            && arg != "-h"
-            && arg != "--help"
-            && arg != "-V"
-            && arg != "--version"
-            && arg != "help" => {
-
-            {
-                args.insert(1, "check".into());
-                Some("`ruff <path>` is deprecated. Use `ruff check <path>` instead.")
-            }
-        },
-        _ => None
-    };
-
-    let args = Args::parse_from(args);
-
-    match run(args, deprecated_alias_warning) {
-        Ok(code) => code.into(),
-        Err(err) => {
-            #[allow(clippy::print_stderr)]
-            {
-                // This communicates that this isn't a linter error but ruff itself hard-errored for
-                // some reason (e.g. failed to resolve the configuration)
-                eprintln!("{}", "ruff failed".red().bold());
-                // Currently we generally only see one error, but e.g. with io errors when resolving
-                // the configuration it is help to chain errors ("resolving configuration failed" ->
-                // "failed to read file: subdir/pyproject.toml")
-                for cause in err.chain() {
-                    eprintln!("  {} {cause}", "Cause:".bold());
-                }
-            }
-            ExitStatus::Error.into()
-        }
-    }
-}

crates/ruff/src/panic.rs

@@ -1,46 +0,0 @@
-#[derive(Default, Debug)]
-pub(crate) struct PanicError {
-    pub(crate) info: String,
-    pub(crate) backtrace: Option<std::backtrace::Backtrace>,
-}
-
-impl std::fmt::Display for PanicError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        writeln!(f, "{}", self.info)?;
-        if let Some(backtrace) = &self.backtrace {
-            writeln!(f, "Backtrace: {backtrace}")
-        } else {
-            Ok(())
-        }
-    }
-}
-
-thread_local! {
-    static LAST_PANIC: std::cell::Cell<Option<PanicError>> = const { std::cell::Cell::new(None) };
-}
-
-/// [`catch_unwind`](std::panic::catch_unwind) wrapper that sets a custom [`set_hook`](std::panic::set_hook)
-/// to extract the backtrace. The original panic-hook gets restored before returning.
-pub(crate) fn catch_unwind<F, R>(f: F) -> Result<R, PanicError>
-where
-    F: FnOnce() -> R + std::panic::UnwindSafe,
-{
-    let prev = std::panic::take_hook();
-    std::panic::set_hook(Box::new(|info| {
-        let info = info.to_string();
-        let backtrace = std::backtrace::Backtrace::force_capture();
-        LAST_PANIC.with(|cell| {
-            cell.set(Some(PanicError {
-                info,
-                backtrace: Some(backtrace),
-            }));
-        });
-    }));
-
-    let result = std::panic::catch_unwind(f)
-        .map_err(|_| LAST_PANIC.with(std::cell::Cell::take).unwrap_or_default());
-
-    std::panic::set_hook(prev);
-
-    result
-}

crates/ruff/src/printer.rs

@@ -1,552 +0,0 @@
-use std::cmp::Reverse;
-use std::fmt::Display;
-use std::hash::Hash;
-use std::io::Write;
-
-use anyhow::Result;
-use bitflags::bitflags;
-use colored::Colorize;
-use itertools::{iterate, Itertools};
-use serde::Serialize;
-
-use ruff_linter::fs::relativize_path;
-use ruff_linter::logging::LogLevel;
-use ruff_linter::message::{
-    AzureEmitter, Emitter, EmitterContext, GithubEmitter, GitlabEmitter, GroupedEmitter,
-    JsonEmitter, JsonLinesEmitter, JunitEmitter, PylintEmitter, SarifEmitter, TextEmitter,
-};
-use ruff_linter::notify_user;
-use ruff_linter::registry::{AsRule, Rule};
-use ruff_linter::settings::flags::{self};
-use ruff_linter::settings::types::{SerializationFormat, UnsafeFixes};
-
-use crate::diagnostics::{Diagnostics, FixMap};
-
-bitflags! {
-    #[derive(Default, Debug, Copy, Clone)]
-    pub(crate) struct Flags: u8 {
-        /// Whether to show violations when emitting diagnostics.
-        const SHOW_VIOLATIONS = 0b0000_0001;
-        /// Whether to show a summary of the fixed violations when emitting diagnostics.
-        const SHOW_FIX_SUMMARY = 0b0000_0100;
-        /// Whether to show a diff of each fixed violation when emitting diagnostics.
-        const SHOW_FIX_DIFF = 0b0000_1000;
-    }
-}
-
-#[derive(Serialize)]
-struct ExpandedStatistics<'a> {
-    code: SerializeRuleAsCode,
-    message: &'a str,
-    count: usize,
-    fixable: bool,
-}
-
-struct SerializeRuleAsCode(Rule);
-
-impl Serialize for SerializeRuleAsCode {
-    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.serialize_str(&self.0.noqa_code().to_string())
-    }
-}
-
-impl Display for SerializeRuleAsCode {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0.noqa_code())
-    }
-}
-
-impl From<Rule> for SerializeRuleAsCode {
-    fn from(rule: Rule) -> Self {
-        Self(rule)
-    }
-}
-
-pub(crate) struct Printer {
-    format: SerializationFormat,
-    log_level: LogLevel,
-    fix_mode: flags::FixMode,
-    unsafe_fixes: UnsafeFixes,
-    flags: Flags,
-}
-
-impl Printer {
-    pub(crate) const fn new(
-        format: SerializationFormat,
-        log_level: LogLevel,
-        fix_mode: flags::FixMode,
-        unsafe_fixes: UnsafeFixes,
-        flags: Flags,
-    ) -> Self {
-        Self {
-            format,
-            log_level,
-            fix_mode,
-            unsafe_fixes,
-            flags,
-        }
-    }
-
-    pub(crate) fn write_to_user(&self, message: &str) {
-        if self.log_level >= LogLevel::Default {
-            notify_user!("{}", message);
-        }
-    }
-
-    fn write_summary_text(&self, writer: &mut dyn Write, diagnostics: &Diagnostics) -> Result<()> {
-        if self.log_level >= LogLevel::Default {
-            let fixables = FixableStatistics::try_from(diagnostics, self.unsafe_fixes);
-
-            let fixed = diagnostics
-                .fixed
-                .values()
-                .flat_map(std::collections::HashMap::values)
-                .sum::<usize>();
-
-            if self.flags.intersects(Flags::SHOW_VIOLATIONS) {
-                let remaining = diagnostics.messages.len();
-                let total = fixed + remaining;
-                if fixed > 0 {
-                    let s = if total == 1 { "" } else { "s" };
-                    writeln!(
-                        writer,
-                        "Found {total} error{s} ({fixed} fixed, {remaining} remaining)."
-                    )?;
-                } else if remaining > 0 {
-                    let s = if remaining == 1 { "" } else { "s" };
-                    writeln!(writer, "Found {remaining} error{s}.")?;
-                } else if remaining == 0 {
-                    writeln!(writer, "All checks passed!")?;
-                }
-
-                if let Some(fixables) = fixables {
-                    let fix_prefix = format!("[{}]", "*".cyan());
-
-                    if self.unsafe_fixes.is_hint() {
-                        if fixables.applicable > 0 && fixables.unapplicable_unsafe > 0 {
-                            let es = if fixables.unapplicable_unsafe == 1 {
-                                ""
-                            } else {
-                                "es"
-                            };
-                            writeln!(writer,
-                                "{fix_prefix} {} fixable with the `--fix` option ({} hidden fix{es} can be enabled with the `--unsafe-fixes` option).",
-                                fixables.applicable, fixables.unapplicable_unsafe
-                            )?;
-                        } else if fixables.applicable > 0 {
-                            // Only applicable fixes
-                            writeln!(
-                                writer,
-                                "{fix_prefix} {} fixable with the `--fix` option.",
-                                fixables.applicable,
-                            )?;
-                        } else {
-                            // Only unapplicable fixes
-                            let es = if fixables.unapplicable_unsafe == 1 {
-                                ""
-                            } else {
-                                "es"
-                            };
-                            writeln!(writer,
-                                "No fixes available ({} hidden fix{es} can be enabled with the `--unsafe-fixes` option).",
-                                fixables.unapplicable_unsafe
-                            )?;
-                        }
-                    } else {
-                        if fixables.applicable > 0 {
-                            writeln!(
-                                writer,
-                                "{fix_prefix} {} fixable with the --fix option.",
-                                fixables.applicable
-                            )?;
-                        }
-                    }
-                }
-            } else {
-                // Check if there are unapplied fixes
-                let unapplied = {
-                    if let Some(fixables) = fixables {
-                        fixables.unapplicable_unsafe
-                    } else {
-                        0
-                    }
-                };
-
-                if unapplied > 0 {
-                    let es = if unapplied == 1 { "" } else { "es" };
-                    if fixed > 0 {
-                        let s = if fixed == 1 { "" } else { "s" };
-                        if self.fix_mode.is_apply() {
-                            writeln!(writer, "Fixed {fixed} error{s} ({unapplied} additional fix{es} available with `--unsafe-fixes`).")?;
-                        } else {
-                            writeln!(writer, "Would fix {fixed} error{s} ({unapplied} additional fix{es} available with `--unsafe-fixes`).")?;
-                        }
-                    } else {
-                        if self.fix_mode.is_apply() {
-                            writeln!(writer, "No errors fixed ({unapplied} fix{es} available with `--unsafe-fixes`).")?;
-                        } else {
-                            writeln!(writer, "No errors would be fixed ({unapplied} fix{es} available with `--unsafe-fixes`).")?;
-                        }
-                    }
-                } else {
-                    if fixed > 0 {
-                        let s = if fixed == 1 { "" } else { "s" };
-                        if self.fix_mode.is_apply() {
-                            writeln!(writer, "Fixed {fixed} error{s}.")?;
-                        } else {
-                            writeln!(writer, "Would fix {fixed} error{s}.")?;
-                        }
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-
-    pub(crate) fn write_once(
-        &self,
-        diagnostics: &Diagnostics,
-        writer: &mut dyn Write,
-    ) -> Result<()> {
-        if matches!(self.log_level, LogLevel::Silent) {
-            return Ok(());
-        }
-
-        if !self.flags.intersects(Flags::SHOW_VIOLATIONS) {
-            if matches!(
-                self.format,
-                SerializationFormat::Text
-                    | SerializationFormat::Full
-                    | SerializationFormat::Concise
-                    | SerializationFormat::Grouped
-            ) {
-                if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
-                    if !diagnostics.fixed.is_empty() {
-                        writeln!(writer)?;
-                        print_fix_summary(writer, &diagnostics.fixed)?;
-                        writeln!(writer)?;
-                    }
-                }
-                self.write_summary_text(writer, diagnostics)?;
-            }
-            return Ok(());
-        }
-
-        let context = EmitterContext::new(&diagnostics.notebook_indexes);
-        let fixables = FixableStatistics::try_from(diagnostics, self.unsafe_fixes);
-
-        match self.format {
-            SerializationFormat::Json => {
-                JsonEmitter.emit(writer, &diagnostics.messages, &context)?;
-            }
-            SerializationFormat::JsonLines => {
-                JsonLinesEmitter.emit(writer, &diagnostics.messages, &context)?;
-            }
-            SerializationFormat::Junit => {
-                JunitEmitter.emit(writer, &diagnostics.messages, &context)?;
-            }
-            SerializationFormat::Concise
-            | SerializationFormat::Full => {
-                TextEmitter::default()
-                    .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
-                    .with_show_fix_diff(self.flags.intersects(Flags::SHOW_FIX_DIFF))
-                    .with_show_source(self.format == SerializationFormat::Full)
-                    .with_unsafe_fixes(self.unsafe_fixes)
-                    .emit(writer, &diagnostics.messages, &context)?;
-
-                if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
-                    if !diagnostics.fixed.is_empty() {
-                        writeln!(writer)?;
-                        print_fix_summary(writer, &diagnostics.fixed)?;
-                        writeln!(writer)?;
-                    }
-                }
-
-                self.write_summary_text(writer, diagnostics)?;
-            }
-            SerializationFormat::Grouped => {
-                GroupedEmitter::default()
-                    .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
-                    .with_unsafe_fixes(self.unsafe_fixes)
-                    .emit(writer, &diagnostics.messages, &context)?;
-
-                if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
-                    if !diagnostics.fixed.is_empty() {
-                        writeln!(writer)?;
-                        print_fix_summary(writer, &diagnostics.fixed)?;
-                        writeln!(writer)?;
-                    }
-                }
-                self.write_summary_text(writer, diagnostics)?;
-            }
-            SerializationFormat::Github => {
-                GithubEmitter.emit(writer, &diagnostics.messages, &context)?;
-            }
-            SerializationFormat::Gitlab => {
-                GitlabEmitter::default().emit(writer, &diagnostics.messages, &context)?;
-            }
-            SerializationFormat::Pylint => {
-                PylintEmitter.emit(writer, &diagnostics.messages, &context)?;
-            }
-            SerializationFormat::Azure => {
-                AzureEmitter.emit(writer, &diagnostics.messages, &context)?;
-            }
-            SerializationFormat::Sarif => {
-                SarifEmitter.emit(writer, &diagnostics.messages, &context)?;
-            }
-            SerializationFormat::Text => unreachable!("Text is deprecated and should have been automatically converted to the default serialization format")
-        }
-
-        writer.flush()?;
-
-        Ok(())
-    }
-
-    pub(crate) fn write_statistics(
-        &self,
-        diagnostics: &Diagnostics,
-        writer: &mut dyn Write,
-    ) -> Result<()> {
-        let statistics: Vec<ExpandedStatistics> = diagnostics
-            .messages
-            .iter()
-            .map(|message| {
-                (
-                    message.kind.rule(),
-                    &message.kind.body,
-                    message.fix.is_some(),
-                )
-            })
-            .sorted()
-            .fold(vec![], |mut acc, (rule, body, fixable)| {
-                if let Some((prev_rule, _, _, count)) = acc.last_mut() {
-                    if *prev_rule == rule {
-                        *count += 1;
-                        return acc;
-                    }
-                }
-                acc.push((rule, body, fixable, 1));
-                acc
-            })
-            .iter()
-            .map(|(rule, message, fixable, count)| ExpandedStatistics {
-                code: (*rule).into(),
-                count: *count,
-                message,
-                fixable: *fixable,
-            })
-            .sorted_by_key(|statistic| Reverse(statistic.count))
-            .collect();
-
-        if statistics.is_empty() {
-            return Ok(());
-        }
-
-        match self.format {
-            SerializationFormat::Text
-            | SerializationFormat::Full
-            | SerializationFormat::Concise => {
-                // Compute the maximum number of digits in the count and code, for all messages,
-                // to enable pretty-printing.
-                let count_width = num_digits(
-                    statistics
-                        .iter()
-                        .map(|statistic| statistic.count)
-                        .max()
-                        .unwrap(),
-                );
-                let code_width = statistics
-                    .iter()
-                    .map(|statistic| statistic.code.to_string().len())
-                    .max()
-                    .unwrap();
-                let any_fixable = statistics.iter().any(|statistic| statistic.fixable);
-
-                let fixable = format!("[{}] ", "*".cyan());
-                let unfixable = "[ ] ";
-
-                // By default, we mimic Flake8's `--statistics` format.
-                for statistic in statistics {
-                    writeln!(
-                        writer,
-                        "{:>count_width$}\t{:<code_width$}\t{}{}",
-                        statistic.count.to_string().bold(),
-                        statistic.code.to_string().red().bold(),
-                        if any_fixable {
-                            if statistic.fixable {
-                                &fixable
-                            } else {
-                                unfixable
-                            }
-                        } else {
-                            ""
-                        },
-                        statistic.message,
-                    )?;
-                }
-                return Ok(());
-            }
-            SerializationFormat::Json => {
-                writeln!(writer, "{}", serde_json::to_string_pretty(&statistics)?)?;
-            }
-            _ => {
-                anyhow::bail!(
-                    "Unsupported serialization format for statistics: {:?}",
-                    self.format
-                )
-            }
-        }
-
-        writer.flush()?;
-
-        Ok(())
-    }
-
-    pub(crate) fn write_continuously(
-        &self,
-        writer: &mut dyn Write,
-        diagnostics: &Diagnostics,
-        preview: bool,
-    ) -> Result<()> {
-        if matches!(self.log_level, LogLevel::Silent) {
-            return Ok(());
-        }
-
-        if self.log_level >= LogLevel::Default {
-            let s = if diagnostics.messages.len() == 1 {
-                ""
-            } else {
-                "s"
-            };
-            notify_user!(
-                "Found {} error{s}. Watching for file changes.",
-                diagnostics.messages.len()
-            );
-        }
-
-        let fixables = FixableStatistics::try_from(diagnostics, self.unsafe_fixes);
-
-        if !diagnostics.messages.is_empty() {
-            if self.log_level >= LogLevel::Default {
-                writeln!(writer)?;
-            }
-
-            let context = EmitterContext::new(&diagnostics.notebook_indexes);
-            TextEmitter::default()
-                .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
-                .with_show_source(preview)
-                .with_unsafe_fixes(self.unsafe_fixes)
-                .emit(writer, &diagnostics.messages, &context)?;
-        }
-        writer.flush()?;
-
-        Ok(())
-    }
-
-    pub(crate) fn clear_screen() -> Result<()> {
-        #[cfg(not(target_family = "wasm"))]
-        clearscreen::clear()?;
-        Ok(())
-    }
-}
-
-fn num_digits(n: usize) -> usize {
-    iterate(n, |&n| n / 10)
-        .take_while(|&n| n > 0)
-        .count()
-        .max(1)
-}
-
-/// Return `true` if the [`Printer`] should indicate that a rule is fixable.
-fn show_fix_status(fix_mode: flags::FixMode, fixables: Option<&FixableStatistics>) -> bool {
-    // If we're in application mode, avoid indicating that a rule is fixable.
-    // If the specific violation were truly fixable, it would've been fixed in
-    // this pass! (We're occasionally unable to determine whether a specific
-    // violation is fixable without trying to fix it, so if fix is not
-    // enabled, we may inadvertently indicate that a rule is fixable.)
-    (!fix_mode.is_apply()) && fixables.is_some_and(FixableStatistics::any_applicable_fixes)
-}
-
-fn print_fix_summary(writer: &mut dyn Write, fixed: &FixMap) -> Result<()> {
-    let total = fixed
-        .values()
-        .map(|table| table.values().sum::<usize>())
-        .sum::<usize>();
-    assert!(total > 0);
-    let num_digits = num_digits(
-        *fixed
-            .values()
-            .filter_map(|table| table.values().max())
-            .max()
-            .unwrap(),
-    );
-
-    let s = if total == 1 { "" } else { "s" };
-    let label = format!("Fixed {total} error{s}:");
-    writeln!(writer, "{}", label.bold().green())?;
-
-    for (filename, table) in fixed
-        .iter()
-        .sorted_by_key(|(filename, ..)| filename.as_str())
-    {
-        writeln!(
-            writer,
-            "{} {}{}",
-            "-".cyan(),
-            relativize_path(filename).bold(),
-            ":".cyan()
-        )?;
-        for (rule, count) in table.iter().sorted_by_key(|(.., count)| Reverse(*count)) {
-            writeln!(
-                writer,
-                "    {count:>num_digits$} × {} ({})",
-                rule.noqa_code().to_string().red().bold(),
-                rule.as_ref(),
-            )?;
-        }
-    }
-    Ok(())
-}
-
-/// Statistics for [applicable][ruff_diagnostics::Applicability] fixes.
-#[derive(Debug)]
-struct FixableStatistics {
-    applicable: u32,
-    unapplicable_unsafe: u32,
-}
-
-impl FixableStatistics {
-    fn try_from(diagnostics: &Diagnostics, unsafe_fixes: UnsafeFixes) -> Option<Self> {
-        let mut applicable = 0;
-        let mut unapplicable_unsafe = 0;
-
-        for message in &diagnostics.messages {
-            if let Some(fix) = &message.fix {
-                if fix.applies(unsafe_fixes.required_applicability()) {
-                    applicable += 1;
-                } else {
-                    // Do not include unapplicable fixes at other levels that do not provide an opt-in
-                    if fix.applicability().is_unsafe() {
-                        unapplicable_unsafe += 1;
-                    }
-                }
-            }
-        }
-
-        if applicable == 0 && unapplicable_unsafe == 0 {
-            None
-        } else {
-            Some(Self {
-                applicable,
-                unapplicable_unsafe,
-            })
-        }
-    }
-
-    fn any_applicable_fixes(&self) -> bool {
-        self.applicable > 0
-    }
-}

crates/ruff/src/resolve.rs

@@ -1,101 +0,0 @@
-use std::path::Path;
-
-use anyhow::Result;
-use log::debug;
-use path_absolutize::path_dedot;
-
-use ruff_workspace::configuration::Configuration;
-use ruff_workspace::pyproject;
-use ruff_workspace::resolver::{
-    resolve_root_settings, ConfigurationTransformer, PyprojectConfig, PyprojectDiscoveryStrategy,
-    Relativity,
-};
-
-use crate::args::ConfigArguments;
-
-/// Resolve the relevant settings strategy and defaults for the current
-/// invocation.
-pub fn resolve(
-    config_arguments: &ConfigArguments,
-    stdin_filename: Option<&Path>,
-) -> Result<PyprojectConfig> {
-    // First priority: if we're running in isolated mode, use the default settings.
-    if config_arguments.isolated {
-        let config = config_arguments.transform(Configuration::default());
-        let settings = config.into_settings(&path_dedot::CWD)?;
-        debug!("Isolated mode, not reading any pyproject.toml");
-        return Ok(PyprojectConfig::new(
-            PyprojectDiscoveryStrategy::Fixed,
-            settings,
-            None,
-        ));
-    }
-
-    // Second priority: the user specified a `pyproject.toml` file. Use that
-    // `pyproject.toml` for _all_ configuration, and resolve paths relative to the
-    // current working directory. (This matches ESLint's behavior.)
-    if let Some(pyproject) = config_arguments.config_file() {
-        let settings = resolve_root_settings(pyproject, Relativity::Cwd, config_arguments)?;
-        debug!(
-            "Using user-specified configuration file at: {}",
-            pyproject.display()
-        );
-        return Ok(PyprojectConfig::new(
-            PyprojectDiscoveryStrategy::Fixed,
-            settings,
-            Some(pyproject.to_path_buf()),
-        ));
-    }
-
-    // Third priority: find a `pyproject.toml` file in either an ancestor of
-    // `stdin_filename` (if set) or the current working path all paths relative to
-    // that directory. (With `Strategy::Hierarchical`, we'll end up finding
-    // the "closest" `pyproject.toml` file for every Python file later on,
-    // so these act as the "default" settings.)
-    if let Some(pyproject) = pyproject::find_settings_toml(
-        stdin_filename
-            .as_ref()
-            .unwrap_or(&path_dedot::CWD.as_path()),
-    )? {
-        debug!(
-            "Using configuration file (via parent) at: {}",
-            pyproject.display()
-        );
-        let settings = resolve_root_settings(&pyproject, Relativity::Parent, config_arguments)?;
-        return Ok(PyprojectConfig::new(
-            PyprojectDiscoveryStrategy::Hierarchical,
-            settings,
-            Some(pyproject),
-        ));
-    }
-
-    // Fourth priority: find a user-specific `pyproject.toml`, but resolve all paths
-    // relative the current working directory. (With `Strategy::Hierarchical`, we'll
-    // end up the "closest" `pyproject.toml` file for every Python file later on, so
-    // these act as the "default" settings.)
-    if let Some(pyproject) = pyproject::find_user_settings_toml() {
-        debug!(
-            "Using configuration file (via cwd) at: {}",
-            pyproject.display()
-        );
-        let settings = resolve_root_settings(&pyproject, Relativity::Cwd, config_arguments)?;
-        return Ok(PyprojectConfig::new(
-            PyprojectDiscoveryStrategy::Hierarchical,
-            settings,
-            Some(pyproject),
-        ));
-    }
-
-    // Fallback: load Ruff's default settings, and resolve all paths relative to the
-    // current working directory. (With `Strategy::Hierarchical`, we'll end up the
-    // "closest" `pyproject.toml` file for every Python file later on, so these act
-    // as the "default" settings.)
-    debug!("Using Ruff default settings");
-    let config = config_arguments.transform(Configuration::default());
-    let settings = config.into_settings(&path_dedot::CWD)?;
-    Ok(PyprojectConfig::new(
-        PyprojectDiscoveryStrategy::Hierarchical,
-        settings,
-        None,
-    ))
-}