Fix comparison when using greater than or equal in UP036

## Summary

Django's `gettext` doesn't support f-strings, so we should avoid
translating `.format` calls in those cases.

Closes https://github.com/astral-sh/ruff/issues/7891.

.gitattributes

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

.github/CODEOWNERS

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

.github/dependabot.yml

@@ -9,5 +9,5 @@ updates:
   - package-ecosystem: "cargo"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     labels: ["internal"]

.github/release.yml

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

.github/workflows/ci.yaml

@@ -96,7 +96,6 @@ jobs:
         uses: taiki-e/install-action@v2
         with:
           tool: cargo-insta
-      - run: pip install black[d]==23.1.0
       - uses: Swatinem/rust-cache@v2
       - name: "Run tests (Ubuntu)"
         if: ${{ matrix.os == 'ubuntu-latest' }}
@@ -106,10 +105,6 @@ jobs:
         shell: bash
         # We can't reject unreferenced snapshots on windows because flake8_executable can't run on windows
         run: cargo insta test --all --all-features
-      - run: cargo test --package ruff_cli --test black_compatibility_test -- --ignored
-        # TODO: Skipped as it's currently broken. The resource were moved from the
-        # ruff_cli to ruff crate, but this test was not updated.
-        if: false
       # Check for broken links in the documentation.
       - run: cargo doc --all --no-deps
         env:

.github/workflows/docs.yaml

@@ -47,7 +47,7 @@ jobs:
         run: mkdocs build --strict -f mkdocs.generated.yml
       - name: "Deploy to Cloudflare Pages"
         if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@v3.1.1
+        uses: cloudflare/wrangler-action@v3.2.0
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}

.github/workflows/playground.yaml

@@ -40,8 +40,9 @@ jobs:
         working-directory: playground
       - name: "Deploy to Cloudflare Pages"
         if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@v3.1.1
+        uses: cloudflare/wrangler-action@v3.2.0
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          command: pages deploy playground/dist --project-name=ruff-playground --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}
+          # `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}

.gitignore

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

.pre-commit-config.yaml

@@ -2,8 +2,8 @@ fail_fast: true
 
 exclude: |
   (?x)^(
-    crates/ruff/resources/.*|
-    crates/ruff/src/rules/.*/snapshots/.*|
+    crates/ruff_linter/resources/.*|
+    crates/ruff_linter/src/rules/.*/snapshots/.*|
     crates/ruff_cli/resources/.*|
     crates/ruff_python_formatter/resources/.*|
     crates/ruff_python_formatter/tests/snapshots/.*|
@@ -50,7 +50,7 @@ repos:
         require_serial: true
         exclude: |
           (?x)^(
-            crates/ruff/resources/.*|
+            crates/ruff_linter/resources/.*|
             crates/ruff_python_formatter/resources/.*
           )$
 

CONTRIBUTING.md

@@ -112,11 +112,11 @@ Ruff is structured as a monorepo with a [flat crate structure](https://matklad.g
 such that all crates are contained in a flat `crates` directory.
 
 The vast majority of the code, including all lint rules, lives in the `ruff` crate (located at
-`crates/ruff`). As a contributor, that's the crate that'll be most relevant to you.
+`crates/ruff_linter`). As a contributor, that's the crate that'll be most relevant to you.
 
 At time of writing, the repository includes the following crates:
 
-- `crates/ruff`: library crate containing all lint rules and the core logic for running them.
+- `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.
@@ -153,7 +153,7 @@ At a high level, the steps involved in adding a new lint rule are as follows:
 1. Determine a name for the new rule as per our [rule naming convention](#rule-naming-convention)
     (e.g., `AssertFalse`, as in, "allow `assert False`").
 
-1. Create a file for your rule (e.g., `crates/ruff/src/rules/flake8_bugbear/rules/assert_false.rs`).
+1. Create a file for your rule (e.g., `crates/ruff_linter/src/rules/flake8_bugbear/rules/assert_false.rs`).
 
 1. In that file, define a violation struct (e.g., `pub struct AssertFalse`). You can grep for
     `#[violation]` to see examples.
@@ -162,21 +162,21 @@ At a high level, the steps involved in adding a new lint rule are as follows:
     (e.g., `pub(crate) fn assert_false`) based on whatever inputs are required for the rule (e.g.,
     an `ast::StmtAssert` node).
 
-1. Define the logic for invoking the diagnostic in `crates/ruff/src/checkers/ast/analyze` (for
-    AST-based rules), `crates/ruff/src/checkers/tokens.rs` (for token-based rules),
-    `crates/ruff/src/checkers/physical_lines.rs` (for text-based rules),
-    `crates/ruff/src/checkers/filesystem.rs` (for filesystem-based rules), etc. For AST-based rules,
+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).
 
-1. Map the violation struct to a rule code in `crates/ruff/src/codes.rs` (e.g., `B011`).
+1. Map the violation struct to a rule code in `crates/ruff_linter/src/codes.rs` (e.g., `B011`).
 
 1. Add proper [testing](#rule-testing-fixtures-and-snapshots) for your rule.
 
 1. Update the generated files (documentation and generated code).
 
-To trigger the violation, you'll likely want to augment the logic in `crates/ruff/src/checkers/ast.rs`
+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.
@@ -204,7 +204,7 @@ As such, rule names should...
     For example, `AssertFalse` guards against `assert False` statements.
 
 - _Not_ contain instructions on how to fix the violation, which instead belong in the rule
-    documentation and the `autofix_title`.
+    documentation and the `fix_title`.
 
 - _Not_ contain a redundant prefix, like `Disallow` or `Banned`, which are already implied by the
     convention.
@@ -221,7 +221,7 @@ Ruff's output for each fixture, which you can then commit alongside your changes
 
 Once you've completed the code for the rule itself, you can define tests with the following steps:
 
-1. Add a Python file to `crates/ruff/resources/test/fixtures/[linter]` that contains the code you
+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.
 
@@ -230,16 +230,16 @@ Once you've completed the code for the rule itself, you can define tests with th
     For example, if you're adding a new rule named `E402`, you would run:
 
     ```shell
-    cargo run -p ruff_cli -- check crates/ruff/resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402
+    cargo run -p ruff_cli -- check crates/ruff_linter/resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402
     ```
 
     **Note:** Only a subset of rules are enabled by default. When testing a new rule, ensure that
     you activate it by adding `--select ${rule_code}` to the command.
 
-1. Add the test to the relevant `crates/ruff/src/rules/[linter]/mod.rs` file. If you're contributing
+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/src/rules/flake8_bugbear/mod.rs`)
+    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,
@@ -251,25 +251,24 @@ Once you've completed the code for the rule itself, you can define tests with th
 
 Ruff's user-facing settings live in a few different places.
 
-First, the command-line options are defined via the `Cli` struct in `crates/ruff/src/cli.rs`.
+First, the command-line options are defined via the `Args` struct in `crates/ruff_cli/src/args.rs`.
 
-Second, the `pyproject.toml` options are defined in `crates/ruff/src/settings/options.rs` (via the
-`Options` struct), `crates/ruff/src/settings/configuration.rs` (via the `Configuration` struct), and
-`crates/ruff/src/settings/mod.rs` (via the `Settings` struct). These represent, respectively: the
-schema used to parse the `pyproject.toml` file; an internal, intermediate representation; and the
-final, internal representation used to power Ruff.
+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.
 
 To add a new configuration option, you'll likely want to modify these latter few files (along with
-`cli.rs`, if appropriate). If you want to pattern-match against an existing example, grep for
+`arg.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.,
-`crates/ruff/src/flake8_unused_arguments/settings.rs`).
-
-You may also want to add the new configuration option to the `flake8-to-ruff` tool, which is
-responsible for converting `flake8` configuration files to Ruff's TOML format. This logic
-lives in `crates/ruff/src/flake8_to_ruff/converter.rs`.
+`Settings` in `crates/ruff_linter/src/flake8_unused_arguments/settings.rs` coupled with
+`Flake8UnusedArgumentsOptions` in `crates/ruff_workspace/src/options.rs`).
 
 Finally, regenerate the documentation and generated code with `cargo dev generate-all`.
 
@@ -362,46 +361,46 @@ First, clone [CPython](https://github.com/python/cpython). It's a large and dive
 which makes it a good target for benchmarking.
 
 ```shell
-git clone --branch 3.10 https://github.com/python/cpython.git crates/ruff/resources/test/cpython
+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/resources/test/cpython/ --no-cache -e" \
-  "./target/release/ruff ./crates/ruff/resources/test/cpython/ -e"
+  "./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/resources/test/cpython/ --no-cache
+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/resources/test/cpython/
+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/resources/test/cpython/' ran
-    6.12 ± 0.41 times faster than './target/release/ruff ./crates/ruff/resources/test/cpython/ --no-cache'
+  './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/resources/test/cpython/ --no-cache" \
-  "pyflakes crates/ruff/resources/test/cpython" \
+  "./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/resources/test/cpython" \
-  "flake8 crates/ruff/resources/test/cpython"
+  "pycodestyle crates/ruff_linter/resources/test/cpython" \
+  "flake8 crates/ruff_linter/resources/test/cpython"
 
-Benchmark 1: ./target/release/ruff ./crates/ruff/resources/test/cpython/ --no-cache
+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/resources/test/cpython
+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
 
@@ -411,31 +410,31 @@ Benchmark 3: autoflake --recursive --expand-star-imports --remove-all-unused-imp
   Time (mean ± σ):      6.175 s ±  0.169 s    [User: 54.102 s, System: 1.057 s]
   Range (min … max):    5.950 s …  6.391 s    10 runs
 
-Benchmark 4: pycodestyle crates/ruff/resources/test/cpython
+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/resources/test/cpython
+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/resources/test/cpython/ --no-cache' ran
+  './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/resources/test/cpython'
-   53.64 ± 0.77 times faster than 'pyflakes crates/ruff/resources/test/cpython'
-  159.43 ± 2.48 times faster than 'pycodestyle crates/ruff/resources/test/cpython'
+   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/resources/test/cpython/ --no-cache -e --select W505,E501"
+  "./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
@@ -468,10 +467,10 @@ rm Lib/test/bad_coding.py \
   Lib/test/test_typing.py
 ```
 
-Then, from `crates/ruff/resources/test/cpython`, run: `time pylint -j 0 -E $(git ls-files '*.py')`. This
+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/resources/test/cpython`:
+To benchmark Pyupgrade, run the following from `crates/ruff_linter/resources/test/cpython`:
 
 ```shell
 hyperfine --ignore-failure --warmup 5 --prepare "git reset --hard HEAD" \

Cargo.toml

@@ -15,49 +15,46 @@ license = "MIT"
 anyhow = { version = "1.0.69" }
 bitflags = { version = "2.3.1" }
 chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
 colored = { version = "2.0.0" }
 filetime = { version = "0.2.20" }
 glob = { version = "0.3.1" }
 globset = { version = "0.4.10" }
 ignore = { version = "0.4.20" }
-insta = { version = "1.31.0", feature = ["filters", "glob"] }
+insta = { version = "1.33.0", feature = ["filters", "glob"] }
 is-macro = { version = "0.3.0" }
 itertools = { version = "0.11.0" }
+libcst = { version = "1.1.0", default-features = false }
 log = { version = "0.4.17" }
-memchr = "2.6.3"
-num-bigint = { version = "0.4.3" }
-num-traits = { version = "0.2.15" }
+memchr = { version = "2.6.4" }
 once_cell = { version = "1.17.1" }
 path-absolutize = { version = "3.1.1" }
-proc-macro2 = { version = "1.0.67" }
+proc-macro2 = { version = "1.0.69" }
 quote = { version = "1.0.23" }
-regex = { version = "1.9.5" }
+regex = { version = "1.9.6" }
 rustc-hash = { version = "1.1.0" }
 schemars = { version = "0.8.15" }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = { version = "1.0.107" }
 shellexpand = { version = "3.0.0" }
-similar = { version = "2.2.1", features = ["inline"] }
-smallvec = { version = "1.10.0" }
+similar = { version = "2.3.0", features = ["inline"] }
+smallvec = { version = "1.11.1" }
 static_assertions = "1.1.0"
 strum = { version = "0.25.0", features = ["strum_macros"] }
 strum_macros = { version = "0.25.2" }
-syn = { version = "2.0.37" }
+syn = { version = "2.0.38" }
 test-case = { version = "3.2.1" }
-thiserror = { version = "1.0.48" }
+thiserror = { version = "1.0.49" }
 toml = { version = "0.7.8" }
-tracing = "0.1.37"
-tracing-indicatif = "0.3.4"
+tracing = { version = "0.1.37" }
+tracing-indicatif = { version = "0.3.4" }
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-unicode-ident = "1.0.12"
-unicode-width = "0.1.10"
+unicode-ident = { version = "1.0.12" }
+unicode_names2 = { version = "1.1.0" }
+unicode-width = { version = "0.1.11" }
 uuid = { version = "1.4.1", features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
 wsl = { version = "0.1.0" }
 
-# v1.0.1
-libcst = { version = "0.1.0", default-features = false }
-
 [profile.release]
 lto = "fat"
 codegen-units = 1

LICENSE

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

README.md

@@ -27,10 +27,10 @@ An extremely fast Python linter, written in Rust.
 - ⚡️ 10-100x faster than existing linters
 - 🐍 Installable via `pip`
 - 🛠️ `pyproject.toml` support
-- 🤝 Python 3.11 compatibility
+- 🤝 Python 3.12 compatibility
 - 📦 Built-in caching, to avoid re-analyzing unchanged files
-- 🔧 Autofix support, for automatic error correction (e.g., automatically remove unused imports)
-- 📏 Over [600 built-in rules](https://docs.astral.sh/ruff/rules/)
+- 🔧 Fix support, for automatic error correction (e.g., automatically remove unused imports)
+- 📏 Over [700 built-in rules](https://docs.astral.sh/ruff/rules/)
 - ⚖️ [Near-parity](https://docs.astral.sh/ruff/faq/#how-does-ruff-compare-to-flake8) with the
     built-in Flake8 rule set
 - 🔌 Native re-implementations of dozens of Flake8 plugins, like flake8-bugbear
@@ -140,7 +140,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.0.290
+  rev: v0.0.292
   hooks:
     - id: ruff
 ```
@@ -176,7 +176,7 @@ If left unspecified, the default configuration is equivalent to:
 select = ["E", "F"]
 ignore = []
 
-# Allow autofix for all enabled rules (when `--fix`) is provided.
+# Allow fix for all enabled rules (when `--fix`) is provided.
 fixable = ["A", "B", "C", "D", "E", "F", "G", "I", "N", "Q", "S", "T", "W", "ANN", "ARG", "BLE", "COM", "DJ", "DTZ", "EM", "ERA", "EXE", "FBT", "ICN", "INP", "ISC", "NPY", "PD", "PGH", "PIE", "PL", "PT", "PTH", "PYI", "RET", "RSE", "RUF", "SIM", "SLF", "TCH", "TID", "TRY", "UP", "YTT"]
 unfixable = []
 
@@ -233,7 +233,7 @@ linting command.
 
 <!-- Begin section: Rules -->
 
-**Ruff supports over 600 lint rules**, many of which are inspired by popular tools like Flake8,
+**Ruff supports over 700 lint rules**, many of which are inspired by popular tools like Flake8,
 isort, pyupgrade, and others. Regardless of the rule's origin, Ruff re-implements every rule in
 Rust as a first-party feature.
 

crates/flake8_to_ruff/Cargo.toml

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

crates/flake8_to_ruff/src/black.rs

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

crates/flake8_to_ruff/src/converter.rs

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

crates/flake8_to_ruff/src/main.rs

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

crates/flake8_to_ruff/src/parser.rs

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

crates/flake8_to_ruff/src/plugin.rs

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

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

@@ -1,34 +0,0 @@
-x = [1, 2, 3]
-list(list(x))
-list(tuple(x))
-tuple(list(x))
-tuple(tuple(x))
-set(set(x))
-set(list(x))
-set(tuple(x))
-set(sorted(x))
-set(sorted(x, key=lambda y: y))
-set(reversed(x))
-sorted(list(x))
-sorted(tuple(x))
-sorted(sorted(x))
-sorted(sorted(x, key=foo, reverse=False), reverse=False, key=foo)
-sorted(sorted(x, reverse=True), reverse=True)
-sorted(reversed(x))
-sorted(list(x), key=lambda y: y)
-tuple(
-    list(
-        [x, 3, "hell"\
-        "o"]
-    )
-)
-set(set())
-set(list())
-set(tuple())
-sorted(reversed())
-
-# Nested sorts with differing keyword arguments. Not flagged.
-sorted(sorted(x, key=lambda y: y))
-sorted(sorted(x, key=lambda y: y), key=lambda x: x)
-sorted(sorted(x), reverse=True)
-sorted(sorted(x, reverse=False), reverse=True)

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

@@ -1,61 +0,0 @@
-_ = "a" "b" "c"
-
-_ = "abc" + "def"
-
-_ = "abc" \
-    "def"
-
-_ = (
-  "abc" +
-  "def"
-)
-
-_ = (
-  f"abc" +
-  "def"
-)
-
-_ = (
-  b"abc" +
-  b"def"
-)
-
-_ = (
-  "abc"
-  "def"
-)
-
-_ = (
-  f"abc"
-  "def"
-)
-
-_ = (
-  b"abc"
-  b"def"
-)
-
-_ = """a""" """b"""
-
-_ = """a
-b""" """c
-d"""
-
-_ = f"""a""" f"""b"""
-
-_ = f"a" "b"
-
-_ = """a""" "b"
-
-_ = 'a' "b"
-
-_ = rf"a" rf"b"
-
-# Single-line explicit concatenation should be ignored.
-_ = "abc" + "def" + "ghi"
-_ = foo + "abc" + "def"
-_ = "abc" + foo + "def"
-_ = "abc" + "def" + foo
-_ = foo + bar + "abc"
-_ = "abc" + foo + bar
-_ = foo + "abc" + bar

crates/ruff/resources/test/fixtures/flake8_logging/LOG007.py

@@ -1,16 +0,0 @@
-import logging
-
-logger = logging.getLogger(__name__)
-
-logging.exception("foo")  # OK
-logging.exception("foo", exc_info=False)  # LOG007
-logging.exception("foo", exc_info=[])  # LOG007
-logger.exception("foo")  # OK
-logger.exception("foo", exc_info=False)  # LOG007
-logger.exception("foo", exc_info=[])  # LOG007
-
-
-from logging import exception
-
-exception("foo", exc_info=False)  # LOG007
-exception("foo", exc_info=True)  # OK

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

@@ -1,18 +0,0 @@
-import logging
-import logging as foo
-
-logging.info("Hello {}".format("World!"))
-logging.log(logging.INFO, "Hello {}".format("World!"))
-foo.info("Hello {}".format("World!"))
-logging.log(logging.INFO, msg="Hello {}".format("World!"))
-logging.log(level=logging.INFO, msg="Hello {}".format("World!"))
-logging.log(msg="Hello {}".format("World!"), level=logging.INFO)
-
-# Flask support
-import flask
-from flask import current_app
-from flask import current_app as app
-
-flask.current_app.logger.info("Hello {}".format("World!"))
-current_app.logger.info("Hello {}".format("World!"))
-app.logger.log(logging.INFO, "Hello {}".format("World!"))

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

@@ -1,4 +0,0 @@
-import logging
-
-logging.info("Hello %s" % "World!")
-logging.log(logging.INFO, "Hello %s" % "World!")

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

@@ -1,4 +0,0 @@
-import logging
-
-logging.info("Hello" + " " + "World!")
-logging.log(logging.INFO, "Hello" + " " + "World!")

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

@@ -1,8 +0,0 @@
-import logging
-
-name = "world"
-logging.info(f"Hello {name}")
-logging.log(logging.INFO, f"Hello {name}")
-
-_LOGGER = logging.getLogger()
-_LOGGER.info(f"{__name__}")

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

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

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

@@ -1,8 +0,0 @@
-import logging
-
-logging.info(
-    "Hello world!",
-    extra={
-        "name": "foobar",
-    },
-)

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

@@ -1,8 +0,0 @@
-import logging
-
-logging.info(
-    "Hello world!",
-    extra=dict(
-        name="foobar",
-    ),
-)

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

@@ -1,21 +0,0 @@
-import logging
-import sys
-
-# G201
-try:
-    pass
-except:
-    logging.error("Hello World", exc_info=True)
-
-try:
-    pass
-except:
-    logging.error("Hello World", exc_info=sys.exc_info())
-
-# OK
-try:
-    pass
-except:
-    logging.error("Hello World", exc_info=False)
-
-logging.error("Hello World", exc_info=sys.exc_info())

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

@@ -1,21 +0,0 @@
-import logging
-import sys
-
-# G202
-try:
-    pass
-except:
-    logging.exception("Hello World", exc_info=True)
-
-try:
-    pass
-except:
-    logging.exception("Hello World", exc_info=sys.exc_info())
-
-# OK
-try:
-    pass
-except:
-    logging.exception("Hello World", exc_info=False)
-
-logging.exception("Hello World", exc_info=True)

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

@@ -1,17 +0,0 @@
-import pytest
-
-
-@pytest.fixture()
-def ok_complex_logic():
-    if some_condition:
-        resource = acquire_resource()
-        yield resource
-        resource.release()
-        return
-    yield None
-
-
-@pytest.fixture()
-def error():
-    resource = acquire_resource()
-    yield resource

crates/ruff/resources/test/fixtures/flake8_quotes/doubles_escaped.py

@@ -1,11 +0,0 @@
-this_should_raise_Q003 = 'This is a \'string\''
-this_should_raise_Q003 = 'This is \\ a \\\'string\''
-this_is_fine = '"This" is a \'string\''
-this_is_fine = "This is a 'string'"
-this_is_fine = "\"This\" is a 'string'"
-this_is_fine = r'This is a \'string\''
-this_is_fine = R'This is a \'string\''
-this_should_raise = (
-    'This is a'
-    '\'string\''
-)

crates/ruff/resources/test/fixtures/flake8_quotes/singles_escaped.py

@@ -1,10 +0,0 @@
-this_should_raise_Q003 = "This is a \"string\""
-this_is_fine = "'This' is a \"string\""
-this_is_fine = 'This is a "string"'
-this_is_fine = '\'This\' is a "string"'
-this_is_fine = r"This is a \"string\""
-this_is_fine = R"This is a \"string\""
-this_should_raise = (
-    "This is a"
-    "\"string\""
-)

crates/ruff/resources/test/fixtures/flake8_use_pathlib/full_name.py

@@ -1,35 +0,0 @@
-import os
-import os.path
-
-p = "/foo"
-q = "bar"
-
-a = os.path.abspath(p)
-aa = os.chmod(p)
-aaa = os.mkdir(p)
-os.makedirs(p)
-os.rename(p)
-os.replace(p)
-os.rmdir(p)
-os.remove(p)
-os.unlink(p)
-os.getcwd(p)
-b = os.path.exists(p)
-bb = os.path.expanduser(p)
-bbb = os.path.isdir(p)
-bbbb = os.path.isfile(p)
-bbbbb = os.path.islink(p)
-os.readlink(p)
-os.stat(p)
-os.path.isabs(p)
-os.path.join(p, q)
-os.sep.join([p, q])
-os.sep.join((p, q))
-os.path.basename(p)
-os.path.dirname(p)
-os.path.samefile(p)
-os.path.splitext(p)
-with open(p) as fp:
-    fp.read()
-open(p).close()
-os.getcwdb(p)

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

@@ -1,33 +0,0 @@
-#: E231
-a = (1,2)
-#: E231
-a[b1,:]
-#: E231
-a = [{'a':''}]
-#: Okay
-a = (4,)
-b = (5, )
-c = {'text': text[5:]}
-
-result = {
-    'key1': 'value',
-    'key2': 'value',
-}
-
-def foo() -> None:
-    #: E231
-    if (1,2):
-        pass
-
-#: Okay
-a = (1,\
-2)
-
-#: E231:2:20
-mdtypes_template = {
-    'tag_full': [('mdtype', 'u4'), ('byte_count', 'u4')],
-    'tag_smalldata':[('byte_count_mdtype', 'u4'), ('data', 'S4')],
-}
-
-#: Okay
-a = (1,

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

@@ -1,6 +0,0 @@
-# TODO: comments starting with one of the configured task-tags sometimes are longer than line-length so that you can easily find them with `git grep`
-# TODO comments starting with one of the configured task-tags sometimes are longer than line-length so that you can easily find them with `git grep`
-#     TODO    comments starting with one of the configured task-tags sometimes are longer than line-length so that you can easily find them with `git grep`
-# FIXME: comments starting with one of the configured task-tags sometimes are longer than line-length so that you can easily find them with `git grep`
-# FIXME comments starting with one of the configured task-tags sometimes are longer than line-length so that you can easily find them with `git grep`
-#     FIXME    comments starting with one of the configured task-tags sometimes are longer than line-length so that you can easily find them with `git grep`

crates/ruff/resources/test/fixtures/pygrep_hooks/PGH002_0.py

@@ -1,7 +0,0 @@
-import logging
-import warnings
-from warnings import warn
-
-warnings.warn("this is ok")
-warn("by itself is also ok")
-logging.warning("this is fine")

crates/ruff/resources/test/fixtures/pygrep_hooks/PGH002_1.py

@@ -1,5 +0,0 @@
-import logging
-from logging import warn
-
-logging.warn("this is not ok")
-warn("not ok")

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

@@ -1,28 +0,0 @@
-import logging
-
-logging.warning("Hello %s %s", "World!")  # [logging-too-few-args]
-
-# do not handle calls with kwargs (like pylint)
-logging.warning("Hello %s", "World!", "again", something="else")
-
-logging.warning("Hello %s", "World!")
-
-# do not handle calls without any args
-logging.info("100% dynamic")
-
-# do not handle calls with *args
-logging.error("Example log %s, %s", "foo", "bar", "baz", *args)
-
-# do not handle calls with **kwargs
-logging.error("Example log %s, %s", "foo", "bar", "baz", **kwargs)
-
-# do not handle keyword arguments
-logging.error("%(objects)d modifications: %(modifications)d errors: %(errors)d")
-
-logging.info(msg="Hello %s")
-
-logging.info(msg="Hello %s %s")
-
-import warning
-
-warning.warning("Hello %s %s", "World!")

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

@@ -1,24 +0,0 @@
-import logging
-
-logging.warning("Hello %s", "World!", "again")  # [logging-too-many-args]
-
-logging.warning("Hello %s", "World!", "again", something="else")
-
-logging.warning("Hello %s", "World!")
-
-# do not handle calls with *args
-logging.error("Example log %s, %s", "foo", "bar", "baz", *args)
-
-# do not handle calls with **kwargs
-logging.error("Example log %s, %s", "foo", "bar", "baz", **kwargs)
-
-# do not handle keyword arguments
-logging.error("%(objects)d modifications: %(modifications)d errors: %(errors)d", {"objects": 1, "modifications": 1, "errors": 1})
-
-logging.info(msg="Hello")
-
-logging.info(msg="Hello", something="else")
-
-import warning
-
-warning.warning("Hello %s", "World!", "again")

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

@@ -1,80 +0,0 @@
-open("foo", "U")
-open("foo", "Ur")
-open("foo", "Ub")
-open("foo", "rUb")
-open("foo", "r")
-open("foo", "rt")
-open("f", "r", encoding="UTF-8")
-open("f", "wt")
-
-with open("foo", "U") as f:
-    pass
-with open("foo", "Ur") as f:
-    pass
-with open("foo", "Ub") as f:
-    pass
-with open("foo", "rUb") as f:
-    pass
-with open("foo", "r") as f:
-    pass
-with open("foo", "rt") as f:
-    pass
-with open("foo", "r", encoding="UTF-8") as f:
-    pass
-with open("foo", "wt") as f:
-    pass
-
-open(f("a", "b", "c"), "U")
-open(f("a", "b", "c"), "Ub")
-
-with open(f("a", "b", "c"), "U") as f:
-    pass
-with open(f("a", "b", "c"), "Ub") as f:
-    pass
-
-with open("foo", "U") as fa, open("bar", "U") as fb:
-    pass
-with open("foo", "Ub") as fa, open("bar", "Ub") as fb:
-    pass
-
-open("foo", mode="U")
-open(name="foo", mode="U")
-open(mode="U", name="foo")
-
-with open("foo", mode="U") as f:
-    pass
-with open(name="foo", mode="U") as f:
-    pass
-with open(mode="U", name="foo") as f:
-    pass
-
-open("foo", mode="Ub")
-open(name="foo", mode="Ub")
-open(mode="Ub", name="foo")
-
-with open("foo", mode="Ub") as f:
-    pass
-with open(name="foo", mode="Ub") as f:
-    pass
-with open(mode="Ub", name="foo") as f:
-    pass
-
-open(file="foo", mode='U', buffering=- 1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-open(file="foo", buffering=- 1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='U')
-open(file="foo", buffering=- 1, encoding=None, errors=None, mode='U', newline=None, closefd=True, opener=None)
-open(mode='U', file="foo", buffering=- 1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-
-open(file="foo", mode='Ub', buffering=- 1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-open(file="foo", buffering=- 1, encoding=None, errors=None, newline=None, closefd=True, opener=None, mode='Ub')
-open(file="foo", buffering=- 1, encoding=None, errors=None, mode='Ub', newline=None, closefd=True, opener=None)
-open(mode='Ub', file="foo", buffering=- 1, encoding=None, errors=None, newline=None, closefd=True, opener=None)
-
-open = 1
-open("foo", "U")
-open("foo", "Ur")
-open("foo", "Ub")
-open("foo", "rUb")
-open("foo", "r")
-open("foo", "rt")
-open("f", "r", encoding="UTF-8")
-open("f", "wt")

crates/ruff/resources/test/fixtures/refurb/FURB140.py

@@ -1,43 +0,0 @@
-def zipped():
-    return zip([1, 2, 3], "ABC")
-
-# Errors.
-
-# FURB140
-[print(x, y) for x, y in zipped()]
-
-# FURB140
-(print(x, y) for x, y in zipped())
-
-# FURB140
-{print(x, y) for x, y in zipped()}
-
-
-from itertools import starmap as sm
-
-# FURB140
-[print(x, y) for x, y in zipped()]
-
-# FURB140
-(print(x, y) for x, y in zipped())
-
-# FURB140
-{print(x, y) for x, y in zipped()}
-
-# Non-errors.
-
-[print(x, int) for x, _ in zipped()]
-
-[print(x, *y) for x, y in zipped()]
-
-[print(x, y, 1) for x, y in zipped()]
-
-[print(y, x) for x, y in zipped()]
-
-[print(x + 1, y) for x, y in zipped()]
-
-[print(x) for x in range(100)]
-
-[print() for x, y in zipped()]
-
-[print(x, end=y) for x, y in zipped()]

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

@@ -1,21 +0,0 @@
-x = [1, 2, 3]
-y = [4, 5, 6]
-
-# RUF017
-sum([x, y], start=[])
-sum([x, y], [])
-sum([[1, 2, 3], [4, 5, 6]], start=[])
-sum([[1, 2, 3], [4, 5, 6]], [])
-sum([[1, 2, 3], [4, 5, 6]],
-    [])
-
-# OK
-sum([x, y])
-sum([[1, 2, 3], [4, 5, 6]])
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7059
-def func():
-    import functools, operator
-
-    sum([x, y], [])

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

@@ -1,31 +0,0 @@
-x = "𝐁ad string"
-y = "−"
-
-
-def f():
-    """Here's a docstring with an unusual parenthesis: ）"""
-    # And here's a comment with an unusual punctuation mark: ᜵
-    ...
-
-
-def f():
-    """Here's a docstring with a greek rho: ρ"""
-    # And here's a comment with a greek alpha: ∗
-    ...
-
-
-x = "𝐁ad string"
-x = "−"
-
-# This should be ignored, since it contains an unambiguous unicode character, and no
-# ASCII.
-x = "Русский"
-
-# The first word should be ignored, while the second should be included, since it
-# contains ASCII.
-x = "βα Bαd"
-
-# The two characters should be flagged here. The first character is a "word"
-# consisting of a single ambiguous character, while the second character is a "word
-# boundary" (whitespace) that it itself ambiguous.
-x = "Р усский"

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

@@ -1,77 +0,0 @@
-"""
-Violation:
-Use '.exception' over '.error' inside except blocks
-"""
-
-import logging
-import sys
-
-logger = logging.getLogger(__name__)
-
-
-def bad():
-    try:
-        a = 1
-    except Exception:
-        logging.error("Context message here")
-
-        if True:
-            logging.error("Context message here")
-
-
-def bad():
-    try:
-        a = 1
-    except Exception:
-        logger.error("Context message here")
-
-        if True:
-            logger.error("Context message here")
-
-
-def bad():
-    try:
-        a = 1
-    except Exception:
-        log.error("Context message here")
-
-        if True:
-            log.error("Context message here")
-
-
-def bad():
-    try:
-        a = 1
-    except Exception:
-        self.logger.error("Context message here")
-
-        if True:
-            self.logger.error("Context message here")
-
-
-def good():
-    try:
-        a = 1
-    except Exception:
-        logger.exception("Context message here")
-
-
-def good():
-    try:
-        a = 1
-    except Exception:
-        foo.exception("Context message here")
-
-
-def fine():
-    try:
-        a = 1
-    except Exception:
-        logger.error("Context message here", exc_info=True)
-
-
-def fine():
-    try:
-        a = 1
-    except Exception:
-        logger.error("Context message here", exc_info=sys.exc_info())

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

@@ -1,64 +0,0 @@
-# Errors
-def main_function():
-    try:
-        process()
-        handle()
-        finish()
-    except Exception as ex:
-        logger.exception(f"Found an error: {ex}")  # TRY401
-
-
-def main_function():
-    try:
-        process()
-        handle()
-        finish()
-    except ValueError as bad:
-        if True is False:
-            for i in range(10):
-                logger.exception(f"Found an error: {bad} {good}")  # TRY401
-    except IndexError as bad:
-        logger.exception(f"Found an error: {bad} {bad}")  # TRY401
-    except Exception as bad:
-        logger.exception(f"Found an error: {bad}")  # TRY401
-        logger.exception(f"Found an error: {bad}")  # TRY401
-
-        if True:
-            logger.exception(f"Found an error: {bad}")  # TRY401
-
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-def func_fstr():
-    try:
-        ...
-    except Exception as ex:
-        logger.exception(f"Logging an error: {ex}")  # TRY401
-
-
-def func_concat():
-    try:
-        ...
-    except Exception as ex:
-        logger.exception("Logging an error: " + str(ex))  # TRY401
-
-
-def func_comma():
-    try:
-        ...
-    except Exception as ex:
-        logger.exception("Logging an error:", ex)  # TRY401
-
-
-# OK
-def main_function():
-    try:
-        process()
-        handle()
-        finish()
-    except Exception as ex:
-        logger.exception(f"Found an error: {er}")
-        logger.exception(f"Found an error: {ex.field}")

crates/ruff/resources/test/project/README.md

@@ -1,96 +0,0 @@
-# project
-
-An example multi-package Python project used to test setting resolution and other complex
-behaviors.
-
-## Expected behavior
-
-Running from the repo root should pick up and enforce the appropriate settings for each package:
-
-```console
-∴ cargo run -p ruff_cli -- check crates/ruff/resources/test/project/
-crates/ruff/resources/test/project/examples/.dotfiles/script.py:1:1: I001 [*] Import block is un-sorted or un-formatted
-crates/ruff/resources/test/project/examples/.dotfiles/script.py:1:8: F401 [*] `numpy` imported but unused
-crates/ruff/resources/test/project/examples/.dotfiles/script.py:2:17: F401 [*] `app.app_file` imported but unused
-crates/ruff/resources/test/project/examples/docs/docs/file.py:1:1: I001 [*] Import block is un-sorted or un-formatted
-crates/ruff/resources/test/project/examples/docs/docs/file.py:8:5: F841 [*] Local variable `x` is assigned to but never used
-crates/ruff/resources/test/project/project/file.py:1:8: F401 [*] `os` imported but unused
-crates/ruff/resources/test/project/project/import_file.py:1:1: I001 [*] Import block is un-sorted or un-formatted
-Found 7 errors.
-[*] 7 potentially fixable with the --fix option.
-```
-
-Running from the project directory itself should exhibit the same behavior:
-
-```console
-∴ (cd crates/ruff/resources/test/project/ && cargo run -p ruff_cli -- check .)
-examples/.dotfiles/script.py:1:1: I001 [*] Import block is un-sorted or un-formatted
-examples/.dotfiles/script.py:1:8: F401 [*] `numpy` imported but unused
-examples/.dotfiles/script.py:2:17: F401 [*] `app.app_file` imported but unused
-examples/docs/docs/file.py:1:1: I001 [*] Import block is un-sorted or un-formatted
-examples/docs/docs/file.py:8:5: F841 [*] Local variable `x` is assigned to but never used
-project/file.py:1:8: F401 [*] `os` imported but unused
-project/import_file.py:1:1: I001 [*] Import block is un-sorted or un-formatted
-Found 7 errors.
-[*] 7 potentially fixable with the --fix option.
-```
-
-Running from the sub-package directory should exhibit the same behavior, but omit the top-level
-files:
-
-```console
-∴ (cd crates/ruff/resources/test/project/examples/docs && cargo run -p ruff_cli -- check .)
-docs/file.py:1:1: I001 [*] Import block is un-sorted or un-formatted
-docs/file.py:8:5: F841 [*] Local variable `x` is assigned to but never used
-Found 2 errors.
-[*] 2 potentially fixable with the --fix option.
-```
-
-`--config` should force Ruff to use the specified `pyproject.toml` for all files, and resolve
-file paths from the current working directory:
-
-```console
-∴ (cargo run -p ruff_cli -- check --config=crates/ruff/resources/test/project/pyproject.toml crates/ruff/resources/test/project/)
-crates/ruff/resources/test/project/examples/.dotfiles/script.py:1:8: F401 [*] `numpy` imported but unused
-crates/ruff/resources/test/project/examples/.dotfiles/script.py:2:17: F401 [*] `app.app_file` imported but unused
-crates/ruff/resources/test/project/examples/docs/docs/concepts/file.py:1:8: F401 [*] `os` imported but unused
-crates/ruff/resources/test/project/examples/docs/docs/file.py:1:1: I001 [*] Import block is un-sorted or un-formatted
-crates/ruff/resources/test/project/examples/docs/docs/file.py:1:8: F401 [*] `os` imported but unused
-crates/ruff/resources/test/project/examples/docs/docs/file.py:3:8: F401 [*] `numpy` imported but unused
-crates/ruff/resources/test/project/examples/docs/docs/file.py:4:27: F401 [*] `docs.concepts.file` imported but unused
-crates/ruff/resources/test/project/examples/excluded/script.py:1:8: F401 [*] `os` imported but unused
-crates/ruff/resources/test/project/project/file.py:1:8: F401 [*] `os` imported but unused
-Found 9 errors.
-[*] 9 potentially fixable with the --fix option.
-```
-
-Running from a parent directory should "ignore" the `exclude` (hence, `concepts/file.py` gets
-included in the output):
-
-```console
-∴ (cd crates/ruff/resources/test/project/examples && cargo run -p ruff_cli -- check --config=docs/ruff.toml .)
-docs/docs/concepts/file.py:5:5: F841 [*] Local variable `x` is assigned to but never used
-docs/docs/file.py:1:1: I001 [*] Import block is un-sorted or un-formatted
-docs/docs/file.py:8:5: F841 [*] Local variable `x` is assigned to but never used
-excluded/script.py:5:5: F841 [*] Local variable `x` is assigned to but never used
-Found 4 errors.
-[*] 4 potentially fixable with the --fix option.
-```
-
-Passing an excluded directory directly should report errors in the contained files:
-
-```console
-∴ cargo run -p ruff_cli -- check crates/ruff/resources/test/project/examples/excluded/
-crates/ruff/resources/test/project/examples/excluded/script.py:1:8: F401 [*] `os` imported but unused
-Found 1 error.
-[*] 1 potentially fixable with the --fix option.
-```
-
-Unless we `--force-exclude`:
-
-```console
-∴ cargo run -p ruff_cli -- check crates/ruff/resources/test/project/examples/excluded/ --force-exclude
-warning: No Python files found under the given path(s)
-∴ cargo run -p ruff_cli -- check crates/ruff/resources/test/project/examples/excluded/script.py --force-exclude
-warning: No Python files found under the given path(s)
-```

crates/ruff/src/autofix/mod.rs

@@ -1,357 +0,0 @@
-use itertools::Itertools;
-use std::collections::BTreeSet;
-
-use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
-use rustc_hash::{FxHashMap, FxHashSet};
-
-use ruff_diagnostics::{Diagnostic, Edit, Fix, IsolationLevel, SourceMap};
-use ruff_source_file::Locator;
-
-use crate::linter::FixTable;
-use crate::registry::{AsRule, Rule};
-
-pub(crate) mod codemods;
-pub(crate) mod edits;
-pub(crate) mod snippet;
-
-pub(crate) struct FixResult {
-    /// The resulting source code, after applying all fixes.
-    pub(crate) code: String,
-    /// The number of fixes applied for each [`Rule`].
-    pub(crate) fixes: FixTable,
-    /// Source map for the fixed source code.
-    pub(crate) source_map: SourceMap,
-}
-
-/// Auto-fix errors in a file, and write the fixed source code to disk.
-pub(crate) fn fix_file(diagnostics: &[Diagnostic], locator: &Locator) -> Option<FixResult> {
-    let mut with_fixes = diagnostics
-        .iter()
-        .filter(|diag| diag.fix.is_some())
-        .peekable();
-
-    if with_fixes.peek().is_none() {
-        None
-    } else {
-        Some(apply_fixes(with_fixes, locator))
-    }
-}
-
-/// Apply a series of fixes.
-fn apply_fixes<'a>(
-    diagnostics: impl Iterator<Item = &'a Diagnostic>,
-    locator: &'a Locator<'a>,
-) -> FixResult {
-    let mut output = String::with_capacity(locator.len());
-    let mut last_pos: Option<TextSize> = None;
-    let mut applied: BTreeSet<&Edit> = BTreeSet::default();
-    let mut isolated: FxHashSet<u32> = FxHashSet::default();
-    let mut fixed = FxHashMap::default();
-    let mut source_map = SourceMap::default();
-
-    for (rule, fix) in diagnostics
-        .filter_map(|diagnostic| {
-            diagnostic
-                .fix
-                .as_ref()
-                .map(|fix| (diagnostic.kind.rule(), fix))
-        })
-        .sorted_by(|(rule1, fix1), (rule2, fix2)| cmp_fix(*rule1, *rule2, fix1, fix2))
-    {
-        let mut edits = fix
-            .edits()
-            .iter()
-            .filter(|edit| !applied.contains(edit))
-            .peekable();
-
-        // If the fix contains at least one new edit, enforce isolation and positional requirements.
-        if let Some(first) = edits.peek() {
-            // If this fix requires isolation, and we've already applied another fix in the
-            // same isolation group, skip it.
-            if let IsolationLevel::Group(id) = fix.isolation() {
-                if !isolated.insert(id) {
-                    continue;
-                }
-            }
-
-            // If this fix overlaps with a fix we've already applied, skip it.
-            if last_pos.is_some_and(|last_pos| last_pos >= first.start()) {
-                continue;
-            }
-        }
-
-        let mut applied_edits = Vec::with_capacity(fix.edits().len());
-        for edit in edits {
-            // Add all contents from `last_pos` to `fix.location`.
-            let slice = locator.slice(TextRange::new(last_pos.unwrap_or_default(), edit.start()));
-            output.push_str(slice);
-
-            // Add the start source marker for the patch.
-            source_map.push_start_marker(edit, output.text_len());
-
-            // Add the patch itself.
-            output.push_str(edit.content().unwrap_or_default());
-
-            // Add the end source marker for the added patch.
-            source_map.push_end_marker(edit, output.text_len());
-
-            // Track that the edit was applied.
-            last_pos = Some(edit.end());
-            applied_edits.push(edit);
-        }
-
-        applied.extend(applied_edits.drain(..));
-        *fixed.entry(rule).or_default() += 1;
-    }
-
-    // Add the remaining content.
-    let slice = locator.after(last_pos.unwrap_or_default());
-    output.push_str(slice);
-
-    FixResult {
-        code: output,
-        fixes: fixed,
-        source_map,
-    }
-}
-
-/// Compare two fixes.
-fn cmp_fix(rule1: Rule, rule2: Rule, fix1: &Fix, fix2: &Fix) -> std::cmp::Ordering {
-    fix1.min_start()
-        .cmp(&fix2.min_start())
-        .then_with(|| match (&rule1, &rule2) {
-            // Apply `EndsInPeriod` fixes before `NewLineAfterLastParagraph` fixes.
-            (Rule::EndsInPeriod, Rule::NewLineAfterLastParagraph) => std::cmp::Ordering::Less,
-            (Rule::NewLineAfterLastParagraph, Rule::EndsInPeriod) => std::cmp::Ordering::Greater,
-            // Apply `IfElseBlockInsteadOfDictGet` fixes before `IfElseBlockInsteadOfIfExp` fixes.
-            (Rule::IfElseBlockInsteadOfDictGet, Rule::IfElseBlockInsteadOfIfExp) => {
-                std::cmp::Ordering::Less
-            }
-            (Rule::IfElseBlockInsteadOfIfExp, Rule::IfElseBlockInsteadOfDictGet) => {
-                std::cmp::Ordering::Greater
-            }
-            _ => std::cmp::Ordering::Equal,
-        })
-}
-
-#[cfg(test)]
-mod tests {
-    use ruff_text_size::{Ranged, TextSize};
-
-    use ruff_diagnostics::{Diagnostic, Edit, Fix, SourceMarker};
-    use ruff_source_file::Locator;
-
-    use crate::autofix::{apply_fixes, FixResult};
-    use crate::rules::pycodestyle::rules::MissingNewlineAtEndOfFile;
-
-    #[allow(deprecated)]
-    fn create_diagnostics(edit: impl IntoIterator<Item = Edit>) -> Vec<Diagnostic> {
-        edit.into_iter()
-            .map(|edit| Diagnostic {
-                // The choice of rule here is arbitrary.
-                kind: MissingNewlineAtEndOfFile.into(),
-                range: edit.range(),
-                fix: Some(Fix::unspecified(edit)),
-                parent: None,
-            })
-            .collect()
-    }
-
-    #[test]
-    fn empty_file() {
-        let locator = Locator::new(r#""#);
-        let diagnostics = create_diagnostics([]);
-        let FixResult {
-            code,
-            fixes,
-            source_map,
-        } = apply_fixes(diagnostics.iter(), &locator);
-        assert_eq!(code, "");
-        assert_eq!(fixes.values().sum::<usize>(), 0);
-        assert!(source_map.markers().is_empty());
-    }
-
-    #[test]
-    fn apply_one_insertion() {
-        let locator = Locator::new(
-            r#"
-import os
-
-print("hello world")
-"#
-            .trim(),
-        );
-        let diagnostics = create_diagnostics([Edit::insertion(
-            "import sys\n".to_string(),
-            TextSize::new(10),
-        )]);
-        let FixResult {
-            code,
-            fixes,
-            source_map,
-        } = apply_fixes(diagnostics.iter(), &locator);
-        assert_eq!(
-            code,
-            r#"
-import os
-import sys
-
-print("hello world")
-"#
-            .trim()
-        );
-        assert_eq!(fixes.values().sum::<usize>(), 1);
-        assert_eq!(
-            source_map.markers(),
-            &[
-                SourceMarker::new(10.into(), 10.into(),),
-                SourceMarker::new(10.into(), 21.into(),),
-            ]
-        );
-    }
-
-    #[test]
-    fn apply_one_replacement() {
-        let locator = Locator::new(
-            r#"
-class A(object):
-    ...
-"#
-            .trim(),
-        );
-        let diagnostics = create_diagnostics([Edit::replacement(
-            "Bar".to_string(),
-            TextSize::new(8),
-            TextSize::new(14),
-        )]);
-        let FixResult {
-            code,
-            fixes,
-            source_map,
-        } = apply_fixes(diagnostics.iter(), &locator);
-        assert_eq!(
-            code,
-            r#"
-class A(Bar):
-    ...
-"#
-            .trim(),
-        );
-        assert_eq!(fixes.values().sum::<usize>(), 1);
-        assert_eq!(
-            source_map.markers(),
-            &[
-                SourceMarker::new(8.into(), 8.into(),),
-                SourceMarker::new(14.into(), 11.into(),),
-            ]
-        );
-    }
-
-    #[test]
-    fn apply_one_removal() {
-        let locator = Locator::new(
-            r#"
-class A(object):
-    ...
-"#
-            .trim(),
-        );
-        let diagnostics = create_diagnostics([Edit::deletion(TextSize::new(7), TextSize::new(15))]);
-        let FixResult {
-            code,
-            fixes,
-            source_map,
-        } = apply_fixes(diagnostics.iter(), &locator);
-        assert_eq!(
-            code,
-            r#"
-class A:
-    ...
-"#
-            .trim()
-        );
-        assert_eq!(fixes.values().sum::<usize>(), 1);
-        assert_eq!(
-            source_map.markers(),
-            &[
-                SourceMarker::new(7.into(), 7.into()),
-                SourceMarker::new(15.into(), 7.into()),
-            ]
-        );
-    }
-
-    #[test]
-    fn apply_two_removals() {
-        let locator = Locator::new(
-            r#"
-class A(object, object, object):
-    ...
-"#
-            .trim(),
-        );
-        let diagnostics = create_diagnostics([
-            Edit::deletion(TextSize::from(8), TextSize::from(16)),
-            Edit::deletion(TextSize::from(22), TextSize::from(30)),
-        ]);
-        let FixResult {
-            code,
-            fixes,
-            source_map,
-        } = apply_fixes(diagnostics.iter(), &locator);
-
-        assert_eq!(
-            code,
-            r#"
-class A(object):
-    ...
-"#
-            .trim()
-        );
-        assert_eq!(fixes.values().sum::<usize>(), 2);
-        assert_eq!(
-            source_map.markers(),
-            &[
-                SourceMarker::new(8.into(), 8.into()),
-                SourceMarker::new(16.into(), 8.into()),
-                SourceMarker::new(22.into(), 14.into(),),
-                SourceMarker::new(30.into(), 14.into(),),
-            ]
-        );
-    }
-
-    #[test]
-    fn ignore_overlapping_fixes() {
-        let locator = Locator::new(
-            r#"
-class A(object):
-    ...
-"#
-            .trim(),
-        );
-        let diagnostics = create_diagnostics([
-            Edit::deletion(TextSize::from(7), TextSize::from(15)),
-            Edit::replacement("ignored".to_string(), TextSize::from(9), TextSize::from(11)),
-        ]);
-        let FixResult {
-            code,
-            fixes,
-            source_map,
-        } = apply_fixes(diagnostics.iter(), &locator);
-        assert_eq!(
-            code,
-            r#"
-class A:
-    ...
-"#
-            .trim(),
-        );
-        assert_eq!(fixes.values().sum::<usize>(), 1);
-        assert_eq!(
-            source_map.markers(),
-            &[
-                SourceMarker::new(7.into(), 7.into(),),
-                SourceMarker::new(15.into(), 7.into(),),
-            ]
-        );
-    }
-}

crates/ruff/src/checkers/noqa.rs

@@ -1,243 +0,0 @@
-//! `NoQA` enforcement and validation.
-
-use std::path::Path;
-
-use itertools::Itertools;
-use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
-
-use ruff_diagnostics::{Diagnostic, Edit, Fix};
-use ruff_python_trivia::CommentRanges;
-use ruff_source_file::Locator;
-
-use crate::noqa;
-use crate::noqa::{Directive, FileExemption, NoqaDirectives, NoqaMapping};
-use crate::registry::{AsRule, Rule};
-use crate::rule_redirects::get_redirect_target;
-use crate::rules::ruff::rules::{UnusedCodes, UnusedNOQA};
-use crate::settings::Settings;
-
-pub(crate) fn check_noqa(
-    diagnostics: &mut Vec<Diagnostic>,
-    path: &Path,
-    locator: &Locator,
-    comment_ranges: &CommentRanges,
-    noqa_line_for: &NoqaMapping,
-    analyze_directives: bool,
-    settings: &Settings,
-) -> Vec<usize> {
-    // Identify any codes that are globally exempted (within the current file).
-    let exemption = FileExemption::try_extract(locator.contents(), comment_ranges, path, locator);
-
-    // Extract all `noqa` directives.
-    let mut noqa_directives = NoqaDirectives::from_commented_ranges(comment_ranges, path, locator);
-
-    // Indices of diagnostics that were ignored by a `noqa` directive.
-    let mut ignored_diagnostics = vec![];
-
-    // Remove any ignored diagnostics.
-    'outer: for (index, diagnostic) in diagnostics.iter().enumerate() {
-        if matches!(diagnostic.kind.rule(), Rule::BlanketNOQA) {
-            continue;
-        }
-
-        match &exemption {
-            Some(FileExemption::All) => {
-                // If the file is exempted, ignore all diagnostics.
-                ignored_diagnostics.push(index);
-                continue;
-            }
-            Some(FileExemption::Codes(codes)) => {
-                // If the diagnostic is ignored by a global exemption, ignore it.
-                if codes.contains(&diagnostic.kind.rule().noqa_code()) {
-                    ignored_diagnostics.push(index);
-                    continue;
-                }
-            }
-            None => {}
-        }
-
-        let noqa_offsets = diagnostic
-            .parent
-            .into_iter()
-            .chain(std::iter::once(diagnostic.start()))
-            .map(|position| noqa_line_for.resolve(position))
-            .unique();
-
-        for noqa_offset in noqa_offsets {
-            if let Some(directive_line) = noqa_directives.find_line_with_directive_mut(noqa_offset)
-            {
-                let suppressed = match &directive_line.directive {
-                    Directive::All(_) => {
-                        directive_line
-                            .matches
-                            .push(diagnostic.kind.rule().noqa_code());
-                        ignored_diagnostics.push(index);
-                        true
-                    }
-                    Directive::Codes(directive) => {
-                        if noqa::includes(diagnostic.kind.rule(), directive.codes()) {
-                            directive_line
-                                .matches
-                                .push(diagnostic.kind.rule().noqa_code());
-                            ignored_diagnostics.push(index);
-                            true
-                        } else {
-                            false
-                        }
-                    }
-                };
-
-                if suppressed {
-                    continue 'outer;
-                }
-            }
-        }
-    }
-
-    // Enforce that the noqa directive was actually used (RUF100), unless RUF100 was itself
-    // suppressed.
-    if settings.rules.enabled(Rule::UnusedNOQA)
-        && analyze_directives
-        && !exemption.is_some_and(|exemption| match exemption {
-            FileExemption::All => true,
-            FileExemption::Codes(codes) => codes.contains(&Rule::UnusedNOQA.noqa_code()),
-        })
-    {
-        for line in noqa_directives.lines() {
-            match &line.directive {
-                Directive::All(directive) => {
-                    if line.matches.is_empty() {
-                        let mut diagnostic =
-                            Diagnostic::new(UnusedNOQA { codes: None }, directive.range());
-                        if settings.rules.should_fix(diagnostic.kind.rule()) {
-                            diagnostic
-                                .set_fix(Fix::suggested(delete_noqa(directive.range(), locator)));
-                        }
-                        diagnostics.push(diagnostic);
-                    }
-                }
-                Directive::Codes(directive) => {
-                    let mut disabled_codes = vec![];
-                    let mut unknown_codes = vec![];
-                    let mut unmatched_codes = vec![];
-                    let mut valid_codes = vec![];
-                    let mut self_ignore = false;
-                    for code in directive.codes() {
-                        let code = get_redirect_target(code).unwrap_or(code);
-                        if Rule::UnusedNOQA.noqa_code() == code {
-                            self_ignore = true;
-                            break;
-                        }
-
-                        if line.matches.iter().any(|match_| *match_ == code)
-                            || settings.external.contains(code)
-                        {
-                            valid_codes.push(code);
-                        } else {
-                            if let Ok(rule) = Rule::from_code(code) {
-                                if settings.rules.enabled(rule) {
-                                    unmatched_codes.push(code);
-                                } else {
-                                    disabled_codes.push(code);
-                                }
-                            } else {
-                                unknown_codes.push(code);
-                            }
-                        }
-                    }
-
-                    if self_ignore {
-                        continue;
-                    }
-
-                    if !(disabled_codes.is_empty()
-                        && unknown_codes.is_empty()
-                        && unmatched_codes.is_empty())
-                    {
-                        let mut diagnostic = Diagnostic::new(
-                            UnusedNOQA {
-                                codes: Some(UnusedCodes {
-                                    disabled: disabled_codes
-                                        .iter()
-                                        .map(|code| (*code).to_string())
-                                        .collect(),
-                                    unknown: unknown_codes
-                                        .iter()
-                                        .map(|code| (*code).to_string())
-                                        .collect(),
-                                    unmatched: unmatched_codes
-                                        .iter()
-                                        .map(|code| (*code).to_string())
-                                        .collect(),
-                                }),
-                            },
-                            directive.range(),
-                        );
-                        if settings.rules.should_fix(diagnostic.kind.rule()) {
-                            if valid_codes.is_empty() {
-                                diagnostic.set_fix(Fix::suggested(delete_noqa(
-                                    directive.range(),
-                                    locator,
-                                )));
-                            } else {
-                                diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
-                                    format!("# noqa: {}", valid_codes.join(", ")),
-                                    directive.range(),
-                                )));
-                            }
-                        }
-                        diagnostics.push(diagnostic);
-                    }
-                }
-            }
-        }
-    }
-
-    ignored_diagnostics.sort_unstable();
-    ignored_diagnostics
-}
-
-/// Generate a [`Edit`] to delete a `noqa` directive.
-fn delete_noqa(range: TextRange, locator: &Locator) -> Edit {
-    let line_range = locator.line_range(range.start());
-
-    // Compute the leading space.
-    let prefix = locator.slice(TextRange::new(line_range.start(), range.start()));
-    let leading_space = prefix
-        .rfind(|c: char| !c.is_whitespace())
-        .map_or(prefix.len(), |i| prefix.len() - i - 1);
-    let leading_space_len = TextSize::try_from(leading_space).unwrap();
-
-    // Compute the trailing space.
-    let suffix = locator.slice(TextRange::new(range.end(), line_range.end()));
-    let trailing_space = suffix
-        .find(|c: char| !c.is_whitespace())
-        .map_or(suffix.len(), |i| i);
-    let trailing_space_len = TextSize::try_from(trailing_space).unwrap();
-
-    // Ex) `# noqa`
-    if line_range
-        == TextRange::new(
-            range.start() - leading_space_len,
-            range.end() + trailing_space_len,
-        )
-    {
-        let full_line_end = locator.full_line_end(line_range.end());
-        Edit::deletion(line_range.start(), full_line_end)
-    }
-    // Ex) `x = 1  # noqa`
-    else if range.end() + trailing_space_len == line_range.end() {
-        Edit::deletion(range.start() - leading_space_len, line_range.end())
-    }
-    // Ex) `x = 1  # noqa  # type: ignore`
-    else if locator.contents()[usize::from(range.end() + trailing_space_len)..].starts_with('#') {
-        Edit::deletion(range.start(), range.end() + trailing_space_len)
-    }
-    // Ex) `x = 1  # noqa here`
-    else {
-        Edit::deletion(
-            range.start() + "# ".text_len(),
-            range.end() + trailing_space_len,
-        )
-    }
-}

crates/ruff/src/comments/snapshots/ruff__comments__shebang__tests__shebang_end_of_line.snap

@@ -1,5 +0,0 @@
----
-source: crates/ruff/src/comments/shebang.rs
-expression: "ShebangDirective::try_extract(source)"
----
-None

crates/ruff/src/comments/snapshots/ruff__comments__shebang__tests__shebang_leading_space.snap

@@ -1,5 +0,0 @@
----
-source: crates/ruff/src/comments/shebang.rs
-expression: "ShebangDirective::try_extract(source)"
----
-None

crates/ruff/src/comments/snapshots/ruff__comments__shebang__tests__shebang_match.snap

@@ -1,9 +0,0 @@
----
-source: crates/ruff/src/comments/shebang.rs
-expression: "ShebangDirective::try_extract(source)"
----
-Some(
-    ShebangDirective(
-        "/usr/bin/env python",
-    ),
-)

crates/ruff/src/comments/snapshots/ruff__comments__shebang__tests__shebang_match_trailing_comment.snap

@@ -1,9 +0,0 @@
----
-source: crates/ruff/src/comments/shebang.rs
-expression: "ShebangDirective::try_extract(source)"
----
-Some(
-    ShebangDirective(
-        "/usr/bin/env python # trailing comment",
-    ),
-)

crates/ruff/src/comments/snapshots/ruff__comments__shebang__tests__shebang_non_match.snap

@@ -1,5 +0,0 @@
----
-source: crates/ruff/src/comments/shebang.rs
-expression: "ShebangDirective::try_extract(source)"
----
-None

crates/ruff/src/importer/mod.rs

@@ -1,500 +0,0 @@
-//! Code modification struct to add and modify import statements.
-//!
-//! Enables rules to make module members available (that may be not yet be imported) during fix
-//! execution.
-
-use std::error::Error;
-
-use anyhow::Result;
-use libcst_native::{ImportAlias, Name, NameOrAttribute};
-use ruff_python_ast::{self as ast, PySourceType, Stmt, Suite};
-use ruff_text_size::{Ranged, TextSize};
-
-use ruff_diagnostics::Edit;
-use ruff_python_ast::imports::{AnyImport, Import, ImportFrom};
-use ruff_python_codegen::Stylist;
-use ruff_python_semantic::SemanticModel;
-use ruff_python_trivia::textwrap::indent;
-use ruff_source_file::Locator;
-
-use crate::autofix;
-use crate::autofix::codemods::CodegenStylist;
-use crate::cst::matchers::{match_aliases, match_import_from, match_statement};
-use crate::importer::insertion::Insertion;
-
-mod insertion;
-
-pub(crate) struct Importer<'a> {
-    /// The Python AST to which we are adding imports.
-    python_ast: &'a Suite,
-    /// The [`Locator`] for the Python AST.
-    locator: &'a Locator<'a>,
-    /// The [`Stylist`] for the Python AST.
-    stylist: &'a Stylist<'a>,
-    /// The list of visited, top-level runtime imports in the Python AST.
-    runtime_imports: Vec<&'a Stmt>,
-    /// The list of visited, top-level `if TYPE_CHECKING:` blocks in the Python AST.
-    type_checking_blocks: Vec<&'a Stmt>,
-}
-
-impl<'a> Importer<'a> {
-    pub(crate) fn new(
-        python_ast: &'a Suite,
-        locator: &'a Locator<'a>,
-        stylist: &'a Stylist<'a>,
-    ) -> Self {
-        Self {
-            python_ast,
-            locator,
-            stylist,
-            runtime_imports: Vec::default(),
-            type_checking_blocks: Vec::default(),
-        }
-    }
-
-    /// Visit a top-level import statement.
-    pub(crate) fn visit_import(&mut self, import: &'a Stmt) {
-        self.runtime_imports.push(import);
-    }
-
-    /// Visit a top-level type-checking block.
-    pub(crate) fn visit_type_checking_block(&mut self, type_checking_block: &'a Stmt) {
-        self.type_checking_blocks.push(type_checking_block);
-    }
-
-    /// Add an import statement to import the given module.
-    ///
-    /// If there are no existing imports, the new import will be added at the top
-    /// of the file. Otherwise, it will be added after the most recent top-level
-    /// import statement.
-    pub(crate) fn add_import(&self, import: &AnyImport, at: TextSize) -> Edit {
-        let required_import = import.to_string();
-        if let Some(stmt) = self.preceding_import(at) {
-            // Insert after the last top-level import.
-            Insertion::end_of_statement(stmt, self.locator, self.stylist)
-                .into_edit(&required_import)
-        } else {
-            // Insert at the start of the file.
-            Insertion::start_of_file(self.python_ast, self.locator, self.stylist)
-                .into_edit(&required_import)
-        }
-    }
-
-    /// Move an existing import to the top-level, thereby making it available at runtime.
-    ///
-    /// If there are no existing imports, the new import will be added at the top
-    /// of the file. Otherwise, it will be added after the most recent top-level
-    /// import statement.
-    pub(crate) fn runtime_import_edit(
-        &self,
-        import: &ImportedMembers,
-        at: TextSize,
-    ) -> Result<RuntimeImportEdit> {
-        // Generate the modified import statement.
-        let content = autofix::codemods::retain_imports(
-            &import.names,
-            import.statement,
-            self.locator,
-            self.stylist,
-        )?;
-
-        // Add the import to the top-level.
-        let insertion = if let Some(stmt) = self.preceding_import(at) {
-            // Insert after the last top-level import.
-            Insertion::end_of_statement(stmt, self.locator, self.stylist)
-        } else {
-            // Insert at the start of the file.
-            Insertion::start_of_file(self.python_ast, self.locator, self.stylist)
-        };
-        let add_import_edit = insertion.into_edit(&content);
-
-        Ok(RuntimeImportEdit { add_import_edit })
-    }
-
-    /// Move an existing import into a `TYPE_CHECKING` block.
-    ///
-    /// If there are no existing `TYPE_CHECKING` blocks, a new one will be added at the top
-    /// of the file. Otherwise, it will be added after the most recent top-level
-    /// `TYPE_CHECKING` block.
-    pub(crate) fn typing_import_edit(
-        &self,
-        import: &ImportedMembers,
-        at: TextSize,
-        semantic: &SemanticModel,
-        source_type: PySourceType,
-    ) -> Result<TypingImportEdit> {
-        // Generate the modified import statement.
-        let content = autofix::codemods::retain_imports(
-            &import.names,
-            import.statement,
-            self.locator,
-            self.stylist,
-        )?;
-
-        // Import the `TYPE_CHECKING` symbol from the typing module.
-        let (type_checking_edit, type_checking) = self.get_or_import_symbol(
-            &ImportRequest::import_from("typing", "TYPE_CHECKING"),
-            at,
-            semantic,
-        )?;
-
-        // Add the import to a `TYPE_CHECKING` block.
-        let add_import_edit = if let Some(block) = self.preceding_type_checking_block(at) {
-            // Add the import to the `TYPE_CHECKING` block.
-            self.add_to_type_checking_block(&content, block.start(), source_type)
-        } else {
-            // Add the import to a new `TYPE_CHECKING` block.
-            self.add_type_checking_block(
-                &format!(
-                    "{}if {type_checking}:{}{}",
-                    self.stylist.line_ending().as_str(),
-                    self.stylist.line_ending().as_str(),
-                    indent(&content, self.stylist.indentation())
-                ),
-                at,
-            )?
-        };
-
-        Ok(TypingImportEdit {
-            type_checking_edit,
-            add_import_edit,
-        })
-    }
-
-    /// Generate an [`Edit`] to reference the given symbol. Returns the [`Edit`] necessary to make
-    /// the symbol available in the current scope along with the bound name of the symbol.
-    ///
-    /// Attempts to reuse existing imports when possible.
-    pub(crate) fn get_or_import_symbol(
-        &self,
-        symbol: &ImportRequest,
-        at: TextSize,
-        semantic: &SemanticModel,
-    ) -> Result<(Edit, String), ResolutionError> {
-        self.get_symbol(symbol, at, semantic)?
-            .map_or_else(|| self.import_symbol(symbol, at, semantic), Ok)
-    }
-
-    /// Return an [`Edit`] to reference an existing symbol, if it's present in the given [`SemanticModel`].
-    fn get_symbol(
-        &self,
-        symbol: &ImportRequest,
-        at: TextSize,
-        semantic: &SemanticModel,
-    ) -> Result<Option<(Edit, String)>, ResolutionError> {
-        // If the symbol is already available in the current scope, use it.
-        let Some(imported_name) =
-            semantic.resolve_qualified_import_name(symbol.module, symbol.member)
-        else {
-            return Ok(None);
-        };
-
-        // If the symbol source (i.e., the import statement) comes after the current location,
-        // abort. For example, we could be generating an edit within a function, and the import
-        // could be defined in the module scope, but after the function definition. In this case,
-        // it's unclear whether we can use the symbol (the function could be called between the
-        // import and the current location, and thus the symbol would not be available). It's also
-        // unclear whether should add an import statement at the start of the file, since it could
-        // be shadowed between the import and the current location.
-        if imported_name.start() > at {
-            return Err(ResolutionError::ImportAfterUsage);
-        }
-
-        // If the symbol source (i.e., the import statement) is in a typing-only context, but we're
-        // in a runtime context, abort.
-        if imported_name.context().is_typing() && semantic.execution_context().is_runtime() {
-            return Err(ResolutionError::IncompatibleContext);
-        }
-
-        // We also add a no-op edit to force conflicts with any other fixes that might try to
-        // remove the import. Consider:
-        //
-        // ```py
-        // import sys
-        //
-        // quit()
-        // ```
-        //
-        // Assume you omit this no-op edit. If you run Ruff with `unused-imports` and
-        // `sys-exit-alias` over this snippet, it will generate two fixes: (1) remove the unused
-        // `sys` import; and (2) replace `quit()` with `sys.exit()`, under the assumption that `sys`
-        // is already imported and available.
-        //
-        // By adding this no-op edit, we force the `unused-imports` fix to conflict with the
-        // `sys-exit-alias` fix, and thus will avoid applying both fixes in the same pass.
-        let import_edit = Edit::range_replacement(
-            self.locator.slice(imported_name.range()).to_string(),
-            imported_name.range(),
-        );
-        Ok(Some((import_edit, imported_name.into_name())))
-    }
-
-    /// Generate an [`Edit`] to reference the given symbol. Returns the [`Edit`] necessary to make
-    /// the symbol available in the current scope along with the bound name of the symbol.
-    ///
-    /// For example, assuming `module` is `"functools"` and `member` is `"lru_cache"`, this function
-    /// could return an [`Edit`] to add `import functools` to the start of the file, alongside with
-    /// the name on which the `lru_cache` symbol would be made available (`"functools.lru_cache"`).
-    fn import_symbol(
-        &self,
-        symbol: &ImportRequest,
-        at: TextSize,
-        semantic: &SemanticModel,
-    ) -> Result<(Edit, String), ResolutionError> {
-        if let Some(stmt) = self.find_import_from(symbol.module, at) {
-            // Case 1: `from functools import lru_cache` is in scope, and we're trying to reference
-            // `functools.cache`; thus, we add `cache` to the import, and return `"cache"` as the
-            // bound name.
-            if semantic.is_available(symbol.member) {
-                let Ok(import_edit) = self.add_member(stmt, symbol.member) else {
-                    return Err(ResolutionError::InvalidEdit);
-                };
-                Ok((import_edit, symbol.member.to_string()))
-            } else {
-                Err(ResolutionError::ConflictingName(symbol.member.to_string()))
-            }
-        } else {
-            match symbol.style {
-                ImportStyle::Import => {
-                    // Case 2a: No `functools` import is in scope; thus, we add `import functools`,
-                    // and return `"functools.cache"` as the bound name.
-                    if semantic.is_available(symbol.module) {
-                        let import_edit =
-                            self.add_import(&AnyImport::Import(Import::module(symbol.module)), at);
-                        Ok((
-                            import_edit,
-                            format!(
-                                "{module}.{member}",
-                                module = symbol.module,
-                                member = symbol.member
-                            ),
-                        ))
-                    } else {
-                        Err(ResolutionError::ConflictingName(symbol.module.to_string()))
-                    }
-                }
-                ImportStyle::ImportFrom => {
-                    // Case 2b: No `functools` import is in scope; thus, we add
-                    // `from functools import cache`, and return `"cache"` as the bound name.
-                    if semantic.is_available(symbol.member) {
-                        let import_edit = self.add_import(
-                            &AnyImport::ImportFrom(ImportFrom::member(
-                                symbol.module,
-                                symbol.member,
-                            )),
-                            at,
-                        );
-                        Ok((import_edit, symbol.member.to_string()))
-                    } else {
-                        Err(ResolutionError::ConflictingName(symbol.member.to_string()))
-                    }
-                }
-            }
-        }
-    }
-
-    /// Return the top-level [`Stmt`] that imports the given module using `Stmt::ImportFrom`
-    /// preceding the given position, if any.
-    fn find_import_from(&self, module: &str, at: TextSize) -> Option<&Stmt> {
-        let mut import_from = None;
-        for stmt in &self.runtime_imports {
-            if stmt.start() >= at {
-                break;
-            }
-            if let Stmt::ImportFrom(ast::StmtImportFrom {
-                module: name,
-                names,
-                level,
-                range: _,
-            }) = stmt
-            {
-                if level.map_or(true, |level| level.to_u32() == 0)
-                    && name.as_ref().is_some_and(|name| name == module)
-                    && names.iter().all(|alias| alias.name.as_str() != "*")
-                {
-                    import_from = Some(*stmt);
-                }
-            }
-        }
-        import_from
-    }
-
-    /// Add the given member to an existing `Stmt::ImportFrom` statement.
-    fn add_member(&self, stmt: &Stmt, member: &str) -> Result<Edit> {
-        let mut statement = match_statement(self.locator.slice(stmt))?;
-        let import_from = match_import_from(&mut statement)?;
-        let aliases = match_aliases(import_from)?;
-        aliases.push(ImportAlias {
-            name: NameOrAttribute::N(Box::new(Name {
-                value: member,
-                lpar: vec![],
-                rpar: vec![],
-            })),
-            asname: None,
-            comma: aliases.last().and_then(|alias| alias.comma.clone()),
-        });
-        Ok(Edit::range_replacement(
-            statement.codegen_stylist(self.stylist),
-            stmt.range(),
-        ))
-    }
-
-    /// Add a `TYPE_CHECKING` block to the given module.
-    fn add_type_checking_block(&self, content: &str, at: TextSize) -> Result<Edit> {
-        let insertion = if let Some(stmt) = self.preceding_import(at) {
-            // Insert after the last top-level import.
-            Insertion::end_of_statement(stmt, self.locator, self.stylist)
-        } else {
-            // Insert at the start of the file.
-            Insertion::start_of_file(self.python_ast, self.locator, self.stylist)
-        };
-        if insertion.is_inline() {
-            Err(anyhow::anyhow!(
-                "Cannot insert `TYPE_CHECKING` block inline"
-            ))
-        } else {
-            Ok(insertion.into_edit(content))
-        }
-    }
-
-    /// Add an import statement to an existing `TYPE_CHECKING` block.
-    fn add_to_type_checking_block(
-        &self,
-        content: &str,
-        at: TextSize,
-        source_type: PySourceType,
-    ) -> Edit {
-        Insertion::start_of_block(at, self.locator, self.stylist, source_type).into_edit(content)
-    }
-
-    /// Return the import statement that precedes the given position, if any.
-    fn preceding_import(&self, at: TextSize) -> Option<&'a Stmt> {
-        self.runtime_imports
-            .partition_point(|stmt| stmt.start() < at)
-            .checked_sub(1)
-            .map(|idx| self.runtime_imports[idx])
-    }
-
-    /// Return the `TYPE_CHECKING` block that precedes the given position, if any.
-    fn preceding_type_checking_block(&self, at: TextSize) -> Option<&'a Stmt> {
-        let block = self.type_checking_blocks.first()?;
-        if block.start() <= at {
-            Some(block)
-        } else {
-            None
-        }
-    }
-}
-
-/// An edit to the top-level of a module, making it available at runtime.
-#[derive(Debug)]
-pub(crate) struct RuntimeImportEdit {
-    /// The edit to add the import to the top-level of the module.
-    add_import_edit: Edit,
-}
-
-impl RuntimeImportEdit {
-    pub(crate) fn into_edits(self) -> Vec<Edit> {
-        vec![self.add_import_edit]
-    }
-}
-
-/// An edit to an import to a typing-only context.
-#[derive(Debug)]
-pub(crate) struct TypingImportEdit {
-    /// The edit to add the `TYPE_CHECKING` symbol to the module.
-    type_checking_edit: Edit,
-    /// The edit to add the import to a `TYPE_CHECKING` block.
-    add_import_edit: Edit,
-}
-
-impl TypingImportEdit {
-    pub(crate) fn into_edits(self) -> Vec<Edit> {
-        vec![self.type_checking_edit, self.add_import_edit]
-    }
-}
-
-#[derive(Debug)]
-enum ImportStyle {
-    /// Import the symbol using the `import` statement (e.g. `import foo; foo.bar`).
-    Import,
-    /// Import the symbol using the `from` statement (e.g. `from foo import bar; bar`).
-    ImportFrom,
-}
-
-#[derive(Debug)]
-pub(crate) struct ImportRequest<'a> {
-    /// The module from which the symbol can be imported (e.g., `foo`, in `from foo import bar`).
-    module: &'a str,
-    /// The member to import (e.g., `bar`, in `from foo import bar`).
-    member: &'a str,
-    /// The preferred style to use when importing the symbol (e.g., `import foo` or
-    /// `from foo import bar`), if it's not already in scope.
-    style: ImportStyle,
-}
-
-impl<'a> ImportRequest<'a> {
-    /// Create a new `ImportRequest` from a module and member. If not present in the scope,
-    /// the symbol should be imported using the "import" statement.
-    pub(crate) fn import(module: &'a str, member: &'a str) -> Self {
-        Self {
-            module,
-            member,
-            style: ImportStyle::Import,
-        }
-    }
-
-    /// Create a new `ImportRequest` from a module and member. If not present in the scope,
-    /// the symbol should be imported using the "import from" statement.
-    pub(crate) fn import_from(module: &'a str, member: &'a str) -> Self {
-        Self {
-            module,
-            member,
-            style: ImportStyle::ImportFrom,
-        }
-    }
-}
-
-/// An existing list of module or member imports, located within an import statement.
-pub(crate) struct ImportedMembers<'a> {
-    /// The import statement.
-    pub(crate) statement: &'a Stmt,
-    /// The "names" of the imported members.
-    pub(crate) names: Vec<&'a str>,
-}
-
-/// The result of an [`Importer::get_or_import_symbol`] call.
-#[derive(Debug)]
-pub(crate) enum ResolutionError {
-    /// The symbol is imported, but the import came after the current location.
-    ImportAfterUsage,
-    /// The symbol is imported, but in an incompatible context (e.g., in typing-only context, while
-    /// we're in a runtime context).
-    IncompatibleContext,
-    /// The symbol can't be imported, because another symbol is bound to the same name.
-    ConflictingName(String),
-    /// The symbol can't be imported due to an error in editing an existing import statement.
-    InvalidEdit,
-}
-
-impl std::fmt::Display for ResolutionError {
-    fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ResolutionError::ImportAfterUsage => {
-                fmt.write_str("Unable to use existing symbol due to late binding")
-            }
-            ResolutionError::IncompatibleContext => {
-                fmt.write_str("Unable to use existing symbol due to incompatible context")
-            }
-            ResolutionError::ConflictingName(binding) => std::write!(
-                fmt,
-                "Unable to insert `{binding}` into scope due to name conflict"
-            ),
-            ResolutionError::InvalidEdit => {
-                fmt.write_str("Unable to modify existing import statement")
-            }
-        }
-    }
-}
-
-impl Error for ResolutionError {}

crates/ruff/src/message/mod.rs

@@ -1,235 +0,0 @@
-use std::cmp::Ordering;
-use std::collections::BTreeMap;
-use std::io::Write;
-use std::ops::Deref;
-
-use rustc_hash::FxHashMap;
-
-pub use azure::AzureEmitter;
-pub use github::GithubEmitter;
-pub use gitlab::GitlabEmitter;
-pub use grouped::GroupedEmitter;
-pub use json::JsonEmitter;
-pub use json_lines::JsonLinesEmitter;
-pub use junit::JunitEmitter;
-pub use pylint::PylintEmitter;
-use ruff_diagnostics::{Diagnostic, DiagnosticKind, Fix};
-use ruff_notebook::NotebookIndex;
-use ruff_source_file::{SourceFile, SourceLocation};
-use ruff_text_size::{Ranged, TextRange, TextSize};
-pub use text::TextEmitter;
-
-mod azure;
-mod diff;
-mod github;
-mod gitlab;
-mod grouped;
-mod json;
-mod json_lines;
-mod junit;
-mod pylint;
-mod text;
-
-#[derive(Debug, PartialEq, Eq)]
-pub struct Message {
-    pub kind: DiagnosticKind,
-    pub range: TextRange,
-    pub fix: Option<Fix>,
-    pub file: SourceFile,
-    pub noqa_offset: TextSize,
-}
-
-impl Message {
-    pub fn from_diagnostic(
-        diagnostic: Diagnostic,
-        file: SourceFile,
-        noqa_offset: TextSize,
-    ) -> Self {
-        Self {
-            range: diagnostic.range(),
-            kind: diagnostic.kind,
-            fix: diagnostic.fix,
-            file,
-            noqa_offset,
-        }
-    }
-
-    pub fn filename(&self) -> &str {
-        self.file.name()
-    }
-
-    pub fn compute_start_location(&self) -> SourceLocation {
-        self.file.to_source_code().source_location(self.start())
-    }
-
-    pub fn compute_end_location(&self) -> SourceLocation {
-        self.file.to_source_code().source_location(self.end())
-    }
-}
-
-impl Ord for Message {
-    fn cmp(&self, other: &Self) -> Ordering {
-        (&self.file, self.start()).cmp(&(&other.file, other.start()))
-    }
-}
-
-impl PartialOrd for Message {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ranged for Message {
-    fn range(&self) -> TextRange {
-        self.range
-    }
-}
-
-struct MessageWithLocation<'a> {
-    message: &'a Message,
-    start_location: SourceLocation,
-}
-
-impl Deref for MessageWithLocation<'_> {
-    type Target = Message;
-
-    fn deref(&self) -> &Self::Target {
-        self.message
-    }
-}
-
-fn group_messages_by_filename(messages: &[Message]) -> BTreeMap<&str, Vec<MessageWithLocation>> {
-    let mut grouped_messages = BTreeMap::default();
-    for message in messages {
-        grouped_messages
-            .entry(message.filename())
-            .or_insert_with(Vec::new)
-            .push(MessageWithLocation {
-                message,
-                start_location: message.compute_start_location(),
-            });
-    }
-    grouped_messages
-}
-
-/// Display format for a [`Message`]s.
-///
-/// The emitter serializes a slice of [`Message`]'s and writes them to a [`Write`].
-pub trait Emitter {
-    /// Serializes the `messages` and writes the output to `writer`.
-    fn emit(
-        &mut self,
-        writer: &mut dyn Write,
-        messages: &[Message],
-        context: &EmitterContext,
-    ) -> anyhow::Result<()>;
-}
-
-/// Context passed to [`Emitter`].
-pub struct EmitterContext<'a> {
-    notebook_indexes: &'a FxHashMap<String, NotebookIndex>,
-}
-
-impl<'a> EmitterContext<'a> {
-    pub fn new(notebook_indexes: &'a FxHashMap<String, NotebookIndex>) -> Self {
-        Self { notebook_indexes }
-    }
-
-    /// Tests if the file with `name` is a jupyter notebook.
-    pub fn is_notebook(&self, name: &str) -> bool {
-        self.notebook_indexes.contains_key(name)
-    }
-
-    pub fn notebook_index(&self, name: &str) -> Option<&NotebookIndex> {
-        self.notebook_indexes.get(name)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use rustc_hash::FxHashMap;
-
-    use ruff_diagnostics::{Diagnostic, DiagnosticKind, Edit, Fix};
-    use ruff_source_file::SourceFileBuilder;
-    use ruff_text_size::{Ranged, TextRange, TextSize};
-
-    use crate::message::{Emitter, EmitterContext, Message};
-
-    pub(super) fn create_messages() -> Vec<Message> {
-        let fib = r#"import os
-
-
-def fibonacci(n):
-    """Compute the nth number in the Fibonacci sequence."""
-    x = 1
-    if n == 0:
-        return 0
-    elif n == 1:
-        return 1
-    else:
-        return fibonacci(n - 1) + fibonacci(n - 2)
-"#;
-
-        let unused_import = Diagnostic::new(
-            DiagnosticKind {
-                name: "UnusedImport".to_string(),
-                body: "`os` imported but unused".to_string(),
-                suggestion: Some("Remove unused import: `os`".to_string()),
-            },
-            TextRange::new(TextSize::from(7), TextSize::from(9)),
-        )
-        .with_fix(Fix::suggested(Edit::range_deletion(TextRange::new(
-            TextSize::from(0),
-            TextSize::from(10),
-        ))));
-
-        let fib_source = SourceFileBuilder::new("fib.py", fib).finish();
-
-        let unused_variable = Diagnostic::new(
-            DiagnosticKind {
-                name: "UnusedVariable".to_string(),
-                body: "Local variable `x` is assigned to but never used".to_string(),
-                suggestion: Some("Remove assignment to unused variable `x`".to_string()),
-            },
-            TextRange::new(TextSize::from(94), TextSize::from(95)),
-        )
-        .with_fix(Fix::suggested(Edit::deletion(
-            TextSize::from(94),
-            TextSize::from(99),
-        )));
-
-        let file_2 = r#"if a == 1: pass"#;
-
-        let undefined_name = Diagnostic::new(
-            DiagnosticKind {
-                name: "UndefinedName".to_string(),
-                body: "Undefined name `a`".to_string(),
-                suggestion: None,
-            },
-            TextRange::new(TextSize::from(3), TextSize::from(4)),
-        );
-
-        let file_2_source = SourceFileBuilder::new("undef.py", file_2).finish();
-
-        let unused_import_start = unused_import.start();
-        let unused_variable_start = unused_variable.start();
-        let undefined_name_start = undefined_name.start();
-        vec![
-            Message::from_diagnostic(unused_import, fib_source.clone(), unused_import_start),
-            Message::from_diagnostic(unused_variable, fib_source, unused_variable_start),
-            Message::from_diagnostic(undefined_name, file_2_source, undefined_name_start),
-        ]
-    }
-
-    pub(super) fn capture_emitter_output(
-        emitter: &mut dyn Emitter,
-        messages: &[Message],
-    ) -> String {
-        let notebook_indexes = FxHashMap::default();
-        let context = EmitterContext::new(&notebook_indexes);
-        let mut output: Vec<u8> = Vec::new();
-        emitter.emit(&mut output, messages, &context).unwrap();
-
-        String::from_utf8(output).expect("Output to be valid UTF-8")
-    }
-}

crates/ruff/src/message/snapshots/ruff__message__azure__tests__output.snap

@@ -1,8 +0,0 @@
----
-source: crates/ruff/src/message/azure.rs
-expression: content
----
-##vso[task.logissue type=error;sourcepath=fib.py;linenumber=1;columnnumber=8;code=F401;]`os` imported but unused
-##vso[task.logissue type=error;sourcepath=fib.py;linenumber=6;columnnumber=5;code=F841;]Local variable `x` is assigned to but never used
-##vso[task.logissue type=error;sourcepath=undef.py;linenumber=1;columnnumber=4;code=F821;]Undefined name `a`
-

crates/ruff/src/message/snapshots/ruff__message__github__tests__output.snap

@@ -1,8 +0,0 @@
----
-source: crates/ruff/src/message/github.rs
-expression: content
----
-::error title=Ruff (F401),file=fib.py,line=1,col=8,endLine=1,endColumn=10::fib.py:1:8: F401 `os` imported but unused
-::error title=Ruff (F841),file=fib.py,line=6,col=5,endLine=6,endColumn=6::fib.py:6:5: F841 Local variable `x` is assigned to but never used
-::error title=Ruff (F821),file=undef.py,line=1,col=4,endLine=1,endColumn=5::undef.py:1:4: F821 Undefined name `a`
-

crates/ruff/src/message/snapshots/ruff__message__gitlab__tests__output.snap

@@ -1,42 +0,0 @@
----
-source: crates/ruff/src/message/gitlab.rs
-expression: redact_fingerprint(&content)
----
-[
-  {
-    "description": "(F401) `os` imported but unused",
-    "fingerprint": "<redacted>",
-    "location": {
-      "lines": {
-        "begin": 1,
-        "end": 1
-      },
-      "path": "fib.py"
-    },
-    "severity": "major"
-  },
-  {
-    "description": "(F841) Local variable `x` is assigned to but never used",
-    "fingerprint": "<redacted>",
-    "location": {
-      "lines": {
-        "begin": 6,
-        "end": 6
-      },
-      "path": "fib.py"
-    },
-    "severity": "major"
-  },
-  {
-    "description": "(F821) Undefined name `a`",
-    "fingerprint": "<redacted>",
-    "location": {
-      "lines": {
-        "begin": 1,
-        "end": 1
-      },
-      "path": "undef.py"
-    },
-    "severity": "major"
-  }
-]

crates/ruff/src/message/snapshots/ruff__message__grouped__tests__default.snap

@@ -1,12 +0,0 @@
----
-source: crates/ruff/src/message/grouped.rs
-expression: content
----
-fib.py:
-  1:8 F401 `os` imported but unused
-  6:5 F841 Local variable `x` is assigned to but never used
-
-undef.py:
-  1:4 F821 Undefined name `a`
-
-

crates/ruff/src/message/snapshots/ruff__message__grouped__tests__fix_status.snap

@@ -1,31 +0,0 @@
----
-source: crates/ruff/src/message/grouped.rs
-expression: content
----
-fib.py:
-  1:8 F401 [*] `os` imported but unused
-    |
-  1 | import os
-    |        ^^ F401
-    |
-    = help: Remove unused import: `os`
-  
-  6:5 F841 [*] Local variable `x` is assigned to but never used
-    |
-  4 | def fibonacci(n):
-  5 |     """Compute the nth number in the Fibonacci sequence."""
-  6 |     x = 1
-    |     ^ F841
-  7 |     if n == 0:
-  8 |         return 0
-    |
-    = help: Remove assignment to unused variable `x`
-  
-undef.py:
-  1:4 F821 Undefined name `a`
-    |
-  1 | if a == 1: pass
-    |    ^ F821
-    |
-  
-

crates/ruff/src/message/snapshots/ruff__message__grouped__tests__show_source.snap

@@ -1,31 +0,0 @@
----
-source: crates/ruff/src/message/grouped.rs
-expression: content
----
-fib.py:
-  1:8 F401 `os` imported but unused
-    |
-  1 | import os
-    |        ^^ F401
-    |
-    = help: Remove unused import: `os`
-  
-  6:5 F841 Local variable `x` is assigned to but never used
-    |
-  4 | def fibonacci(n):
-  5 |     """Compute the nth number in the Fibonacci sequence."""
-  6 |     x = 1
-    |     ^ F841
-  7 |     if n == 0:
-  8 |         return 0
-    |
-    = help: Remove assignment to unused variable `x`
-  
-undef.py:
-  1:4 F821 Undefined name `a`
-    |
-  1 | if a == 1: pass
-    |    ^ F821
-    |
-  
-

crates/ruff/src/message/snapshots/ruff__message__json__tests__output.snap

@@ -1,86 +0,0 @@
----
-source: crates/ruff/src/message/json.rs
-expression: content
----
-[
-  {
-    "code": "F401",
-    "end_location": {
-      "column": 10,
-      "row": 1
-    },
-    "filename": "fib.py",
-    "fix": {
-      "applicability": "Suggested",
-      "edits": [
-        {
-          "content": "",
-          "end_location": {
-            "column": 1,
-            "row": 2
-          },
-          "location": {
-            "column": 1,
-            "row": 1
-          }
-        }
-      ],
-      "message": "Remove unused import: `os`"
-    },
-    "location": {
-      "column": 8,
-      "row": 1
-    },
-    "message": "`os` imported but unused",
-    "noqa_row": 1,
-    "url": "https://docs.astral.sh/ruff/rules/unused-import"
-  },
-  {
-    "code": "F841",
-    "end_location": {
-      "column": 6,
-      "row": 6
-    },
-    "filename": "fib.py",
-    "fix": {
-      "applicability": "Suggested",
-      "edits": [
-        {
-          "content": "",
-          "end_location": {
-            "column": 10,
-            "row": 6
-          },
-          "location": {
-            "column": 5,
-            "row": 6
-          }
-        }
-      ],
-      "message": "Remove assignment to unused variable `x`"
-    },
-    "location": {
-      "column": 5,
-      "row": 6
-    },
-    "message": "Local variable `x` is assigned to but never used",
-    "noqa_row": 6,
-    "url": "https://docs.astral.sh/ruff/rules/unused-variable"
-  },
-  {
-    "code": "F821",
-    "end_location": {
-      "column": 5,
-      "row": 1
-    },
-    "filename": "undef.py",
-    "fix": null,
-    "location": {
-      "column": 4,
-      "row": 1
-    },
-    "message": "Undefined name `a`",
-    "noqa_row": 1,
-    "url": "https://docs.astral.sh/ruff/rules/undefined-name"
-  }
-]

crates/ruff/src/message/snapshots/ruff__message__json_lines__tests__output.snap

@@ -1,8 +0,0 @@
----
-source: crates/ruff/src/message/json_lines.rs
-expression: content
----
-{"code":"F401","end_location":{"column":10,"row":1},"filename":"fib.py","fix":{"applicability":"Suggested","edits":[{"content":"","end_location":{"column":1,"row":2},"location":{"column":1,"row":1}}],"message":"Remove unused import: `os`"},"location":{"column":8,"row":1},"message":"`os` imported but unused","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/unused-import"}
-{"code":"F841","end_location":{"column":6,"row":6},"filename":"fib.py","fix":{"applicability":"Suggested","edits":[{"content":"","end_location":{"column":10,"row":6},"location":{"column":5,"row":6}}],"message":"Remove assignment to unused variable `x`"},"location":{"column":5,"row":6},"message":"Local variable `x` is assigned to but never used","noqa_row":6,"url":"https://docs.astral.sh/ruff/rules/unused-variable"}
-{"code":"F821","end_location":{"column":5,"row":1},"filename":"undef.py","fix":null,"location":{"column":4,"row":1},"message":"Undefined name `a`","noqa_row":1,"url":"https://docs.astral.sh/ruff/rules/undefined-name"}
-

crates/ruff/src/message/snapshots/ruff__message__junit__tests__output.snap

@@ -1,21 +0,0 @@
----
-source: crates/ruff/src/message/junit.rs
-expression: content
----
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuites name="ruff" tests="3" failures="3" errors="0">
-    <testsuite name="fib.py" tests="2" disabled="0" errors="0" failures="2" package="org.ruff">
-        <testcase name="org.ruff.F401" classname="fib" line="1" column="8">
-            <failure message="`os` imported but unused">line 1, col 8, `os` imported but unused</failure>
-        </testcase>
-        <testcase name="org.ruff.F841" classname="fib" line="6" column="5">
-            <failure message="Local variable `x` is assigned to but never used">line 6, col 5, Local variable `x` is assigned to but never used</failure>
-        </testcase>
-    </testsuite>
-    <testsuite name="undef.py" tests="1" disabled="0" errors="0" failures="1" package="org.ruff">
-        <testcase name="org.ruff.F821" classname="undef" line="1" column="4">
-            <failure message="Undefined name `a`">line 1, col 4, Undefined name `a`</failure>
-        </testcase>
-    </testsuite>
-</testsuites>
-

crates/ruff/src/message/snapshots/ruff__message__pylint__tests__output.snap

@@ -1,8 +0,0 @@
----
-source: crates/ruff/src/message/pylint.rs
-expression: content
----
-fib.py:1: [F401] `os` imported but unused
-fib.py:6: [F841] Local variable `x` is assigned to but never used
-undef.py:1: [F821] Undefined name `a`
-

crates/ruff/src/message/snapshots/ruff__message__text__tests__default.snap

@@ -1,29 +0,0 @@
----
-source: crates/ruff/src/message/text.rs
-expression: content
----
-fib.py:1:8: F401 `os` imported but unused
-  |
-1 | import os
-  |        ^^ F401
-  |
-  = help: Remove unused import: `os`
-
-fib.py:6:5: F841 Local variable `x` is assigned to but never used
-  |
-4 | def fibonacci(n):
-5 |     """Compute the nth number in the Fibonacci sequence."""
-6 |     x = 1
-  |     ^ F841
-7 |     if n == 0:
-8 |         return 0
-  |
-  = help: Remove assignment to unused variable `x`
-
-undef.py:1:4: F821 Undefined name `a`
-  |
-1 | if a == 1: pass
-  |    ^ F821
-  |
-
-

crates/ruff/src/message/snapshots/ruff__message__text__tests__fix_status.snap

@@ -1,29 +0,0 @@
----
-source: crates/ruff/src/message/text.rs
-expression: content
----
-fib.py:1:8: F401 [*] `os` imported but unused
-  |
-1 | import os
-  |        ^^ F401
-  |
-  = help: Remove unused import: `os`
-
-fib.py:6:5: F841 [*] Local variable `x` is assigned to but never used
-  |
-4 | def fibonacci(n):
-5 |     """Compute the nth number in the Fibonacci sequence."""
-6 |     x = 1
-  |     ^ F841
-7 |     if n == 0:
-8 |         return 0
-  |
-  = help: Remove assignment to unused variable `x`
-
-undef.py:1:4: F821 Undefined name `a`
-  |
-1 | if a == 1: pass
-  |    ^ F821
-  |
-
-

crates/ruff/src/rules/airflow/mod.rs

@@ -1,25 +0,0 @@
-//! Airflow-specific rules.
-pub(crate) mod rules;
-
-#[cfg(test)]
-mod tests {
-    use std::path::Path;
-
-    use anyhow::Result;
-    use test_case::test_case;
-
-    use crate::registry::Rule;
-    use crate::test::test_path;
-    use crate::{assert_messages, settings};
-
-    #[test_case(Rule::AirflowVariableNameTaskIdMismatch, Path::new("AIR001.py"))]
-    fn rules(rule_code: Rule, path: &Path) -> Result<()> {
-        let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
-        let diagnostics = test_path(
-            Path::new("airflow").join(path).as_path(),
-            &settings::Settings::for_rule(rule_code),
-        )?;
-        assert_messages!(snapshot, diagnostics);
-        Ok(())
-    }
-}

crates/ruff/src/rules/airflow/snapshots/ruff__rules__airflow__tests__AIR001_AIR001.py.snap

@@ -1,22 +0,0 @@
----
-source: crates/ruff/src/rules/airflow/mod.rs
----
-AIR001.py:11:1: AIR001 Task variable name should match the `task_id`: "my_task"
-   |
- 9 | my_task_2 = PythonOperator(callable=my_callable, task_id="my_task_2")
-10 | 
-11 | incorrect_name = PythonOperator(task_id="my_task")
-   | ^^^^^^^^^^^^^^ AIR001
-12 | incorrect_name_2 = PythonOperator(callable=my_callable, task_id="my_task_2")
-   |
-
-AIR001.py:12:1: AIR001 Task variable name should match the `task_id`: "my_task_2"
-   |
-11 | incorrect_name = PythonOperator(task_id="my_task")
-12 | incorrect_name_2 = PythonOperator(callable=my_callable, task_id="my_task_2")
-   | ^^^^^^^^^^^^^^^^ AIR001
-13 | 
-14 | from my_module import MyClass
-   |
-
-

crates/ruff/src/rules/eradicate/mod.rs

@@ -1,26 +0,0 @@
-//! Rules from [eradicate](https://pypi.org/project/eradicate/).
-pub(crate) mod detection;
-pub(crate) mod rules;
-
-#[cfg(test)]
-mod tests {
-    use std::path::Path;
-
-    use anyhow::Result;
-    use test_case::test_case;
-
-    use crate::registry::Rule;
-    use crate::test::test_path;
-    use crate::{assert_messages, settings};
-
-    #[test_case(Rule::CommentedOutCode, Path::new("ERA001.py"))]
-    fn rules(rule_code: Rule, path: &Path) -> Result<()> {
-        let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
-        let diagnostics = test_path(
-            Path::new("eradicate").join(path).as_path(),
-            &settings::Settings::for_rule(rule_code),
-        )?;
-        assert_messages!(snapshot, diagnostics);
-        Ok(())
-    }
-}

crates/ruff/src/rules/eradicate/snapshots/ruff__rules__eradicate__tests__ERA001_ERA001.py.snap

@@ -1,151 +0,0 @@
----
-source: crates/ruff/src/rules/eradicate/mod.rs
----
-ERA001.py:1:1: ERA001 [*] Found commented-out code
-  |
-1 | #import os
-  | ^^^^^^^^^^ ERA001
-2 | # from foo import junk
-3 | #a = 3
-  |
-  = help: Remove commented-out code
-
-ℹ Possible fix
-1   |-#import os
-2 1 | # from foo import junk
-3 2 | #a = 3
-4 3 | a = 4
-
-ERA001.py:2:1: ERA001 [*] Found commented-out code
-  |
-1 | #import os
-2 | # from foo import junk
-  | ^^^^^^^^^^^^^^^^^^^^^^ ERA001
-3 | #a = 3
-4 | a = 4
-  |
-  = help: Remove commented-out code
-
-ℹ Possible fix
-1 1 | #import os
-2   |-# from foo import junk
-3 2 | #a = 3
-4 3 | a = 4
-5 4 | #foo(1, 2, 3)
-
-ERA001.py:3:1: ERA001 [*] Found commented-out code
-  |
-1 | #import os
-2 | # from foo import junk
-3 | #a = 3
-  | ^^^^^^ ERA001
-4 | a = 4
-5 | #foo(1, 2, 3)
-  |
-  = help: Remove commented-out code
-
-ℹ Possible fix
-1 1 | #import os
-2 2 | # from foo import junk
-3   |-#a = 3
-4 3 | a = 4
-5 4 | #foo(1, 2, 3)
-6 5 | 
-
-ERA001.py:5:1: ERA001 [*] Found commented-out code
-  |
-3 | #a = 3
-4 | a = 4
-5 | #foo(1, 2, 3)
-  | ^^^^^^^^^^^^^ ERA001
-6 | 
-7 | def foo(x, y, z):
-  |
-  = help: Remove commented-out code
-
-ℹ Possible fix
-2 2 | # from foo import junk
-3 3 | #a = 3
-4 4 | a = 4
-5   |-#foo(1, 2, 3)
-6 5 | 
-7 6 | def foo(x, y, z):
-8 7 |     content = 1 # print('hello')
-
-ERA001.py:13:5: ERA001 [*] Found commented-out code
-   |
-11 |     # This is a real comment.
-12 |     # # This is a (nested) comment.
-13 |     #return True
-   |     ^^^^^^^^^^^^ ERA001
-14 |     return False
-   |
-   = help: Remove commented-out code
-
-ℹ Possible fix
-10 10 | 
-11 11 |     # This is a real comment.
-12 12 |     # # This is a (nested) comment.
-13    |-    #return True
-14 13 |     return False
-15 14 | 
-16 15 | #import os  # noqa: ERA001
-
-ERA001.py:21:5: ERA001 [*] Found commented-out code
-   |
-19 | class A():
-20 |     pass
-21 |     # b = c
-   |     ^^^^^^^ ERA001
-   |
-   = help: Remove commented-out code
-
-ℹ Possible fix
-18 18 | 
-19 19 | class A():
-20 20 |     pass
-21    |-    # b = c
-22 21 | 
-23 22 | 
-24 23 | dictionary = {
-
-ERA001.py:26:5: ERA001 [*] Found commented-out code
-   |
-24 | dictionary = {
-25 |     # "key1": 123,  # noqa: ERA001
-26 |     # "key2": 456,
-   |     ^^^^^^^^^^^^^^ ERA001
-27 |     # "key3": 789,  # test
-28 | }
-   |
-   = help: Remove commented-out code
-
-ℹ Possible fix
-23 23 | 
-24 24 | dictionary = {
-25 25 |     # "key1": 123,  # noqa: ERA001
-26    |-    # "key2": 456,
-27 26 |     # "key3": 789,  # test
-28 27 | }
-29 28 | 
-
-ERA001.py:27:5: ERA001 [*] Found commented-out code
-   |
-25 |     # "key1": 123,  # noqa: ERA001
-26 |     # "key2": 456,
-27 |     # "key3": 789,  # test
-   |     ^^^^^^^^^^^^^^^^^^^^^^ ERA001
-28 | }
-   |
-   = help: Remove commented-out code
-
-ℹ Possible fix
-24 24 | dictionary = {
-25 25 |     # "key1": 123,  # noqa: ERA001
-26 26 |     # "key2": 456,
-27    |-    # "key3": 789,  # test
-28 27 | }
-29 28 | 
-30 29 | #import os  # noqa
-
-

crates/ruff/src/rules/flake8_2020/mod.rs

@@ -1,35 +0,0 @@
-//! Rules from [flake8-2020](https://pypi.org/project/flake8-2020/).
-mod helpers;
-pub(crate) mod rules;
-
-#[cfg(test)]
-mod tests {
-    use std::path::Path;
-
-    use anyhow::Result;
-    use test_case::test_case;
-
-    use crate::registry::Rule;
-    use crate::test::test_path;
-    use crate::{assert_messages, settings};
-
-    #[test_case(Rule::SysVersionSlice3, Path::new("YTT101.py"))]
-    #[test_case(Rule::SysVersion2, Path::new("YTT102.py"))]
-    #[test_case(Rule::SysVersionCmpStr3, Path::new("YTT103.py"))]
-    #[test_case(Rule::SysVersionInfo0Eq3, Path::new("YTT201.py"))]
-    #[test_case(Rule::SixPY3, Path::new("YTT202.py"))]
-    #[test_case(Rule::SysVersionInfo1CmpInt, Path::new("YTT203.py"))]
-    #[test_case(Rule::SysVersionInfoMinorCmpInt, Path::new("YTT204.py"))]
-    #[test_case(Rule::SysVersion0, Path::new("YTT301.py"))]
-    #[test_case(Rule::SysVersionCmpStr10, Path::new("YTT302.py"))]
-    #[test_case(Rule::SysVersionSlice1, Path::new("YTT303.py"))]
-    fn rules(rule_code: Rule, path: &Path) -> Result<()> {
-        let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
-        let diagnostics = test_path(
-            Path::new("flake8_2020").join(path).as_path(),
-            &settings::Settings::for_rule(rule_code),
-        )?;
-        assert_messages!(snapshot, diagnostics);
-        Ok(())
-    }
-}

crates/ruff/src/rules/flake8_2020/snapshots/ruff__rules__flake8_2020__tests__YTT101_YTT101.py.snap

@@ -1,32 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_2020/mod.rs
----
-YTT101.py:6:7: YTT101 `sys.version[:3]` referenced (python3.10), use `sys.version_info`
-  |
-4 | print(sys.version)
-5 | 
-6 | print(sys.version[:3])
-  |       ^^^^^^^^^^^ YTT101
-7 | print(version[:3])
-8 | print(v[:3])
-  |
-
-YTT101.py:7:7: YTT101 `sys.version[:3]` referenced (python3.10), use `sys.version_info`
-  |
-6 | print(sys.version[:3])
-7 | print(version[:3])
-  |       ^^^^^^^ YTT101
-8 | print(v[:3])
-  |
-
-YTT101.py:8:7: YTT101 `sys.version[:3]` referenced (python3.10), use `sys.version_info`
-   |
- 6 | print(sys.version[:3])
- 7 | print(version[:3])
- 8 | print(v[:3])
-   |       ^ YTT101
- 9 | 
-10 | # the tool is timid and only flags certain numeric slices
-   |
-
-

crates/ruff/src/rules/flake8_2020/snapshots/ruff__rules__flake8_2020__tests__YTT102_YTT102.py.snap

@@ -1,20 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_2020/mod.rs
----
-YTT102.py:4:12: YTT102 `sys.version[2]` referenced (python3.10), use `sys.version_info`
-  |
-2 | from sys import version
-3 | 
-4 | py_minor = sys.version[2]
-  |            ^^^^^^^^^^^ YTT102
-5 | py_minor = version[2]
-  |
-
-YTT102.py:5:12: YTT102 `sys.version[2]` referenced (python3.10), use `sys.version_info`
-  |
-4 | py_minor = sys.version[2]
-5 | py_minor = version[2]
-  |            ^^^^^^^ YTT102
-  |
-
-

crates/ruff/src/rules/flake8_2020/snapshots/ruff__rules__flake8_2020__tests__YTT103_YTT103.py.snap

@@ -1,50 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_2020/mod.rs
----
-YTT103.py:4:1: YTT103 `sys.version` compared to string (python3.10), use `sys.version_info`
-  |
-2 | from sys import version
-3 | 
-4 | version < "3.5"
-  | ^^^^^^^ YTT103
-5 | sys.version < "3.5"
-6 | sys.version <= "3.5"
-  |
-
-YTT103.py:5:1: YTT103 `sys.version` compared to string (python3.10), use `sys.version_info`
-  |
-4 | version < "3.5"
-5 | sys.version < "3.5"
-  | ^^^^^^^^^^^ YTT103
-6 | sys.version <= "3.5"
-7 | sys.version > "3.5"
-  |
-
-YTT103.py:6:1: YTT103 `sys.version` compared to string (python3.10), use `sys.version_info`
-  |
-4 | version < "3.5"
-5 | sys.version < "3.5"
-6 | sys.version <= "3.5"
-  | ^^^^^^^^^^^ YTT103
-7 | sys.version > "3.5"
-8 | sys.version >= "3.5"
-  |
-
-YTT103.py:7:1: YTT103 `sys.version` compared to string (python3.10), use `sys.version_info`
-  |
-5 | sys.version < "3.5"
-6 | sys.version <= "3.5"
-7 | sys.version > "3.5"
-  | ^^^^^^^^^^^ YTT103
-8 | sys.version >= "3.5"
-  |
-
-YTT103.py:8:1: YTT103 `sys.version` compared to string (python3.10), use `sys.version_info`
-  |
-6 | sys.version <= "3.5"
-7 | sys.version > "3.5"
-8 | sys.version >= "3.5"
-  | ^^^^^^^^^^^ YTT103
-  |
-
-

crates/ruff/src/rules/flake8_2020/snapshots/ruff__rules__flake8_2020__tests__YTT201_YTT201.py.snap

@@ -1,40 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_2020/mod.rs
----
-YTT201.py:7:7: YTT201 `sys.version_info[0] == 3` referenced (python4), use `>=`
-  |
-5 | PY3 = sys.version_info[0] >= 3
-6 | 
-7 | PY3 = sys.version_info[0] == 3
-  |       ^^^^^^^^^^^^^^^^^^^ YTT201
-8 | PY3 = version_info[0] == 3
-9 | PY2 = sys.version_info[0] != 3
-  |
-
-YTT201.py:8:7: YTT201 `sys.version_info[0] == 3` referenced (python4), use `>=`
-   |
- 7 | PY3 = sys.version_info[0] == 3
- 8 | PY3 = version_info[0] == 3
-   |       ^^^^^^^^^^^^^^^ YTT201
- 9 | PY2 = sys.version_info[0] != 3
-10 | PY2 = version_info[0] != 3
-   |
-
-YTT201.py:9:7: YTT201 `sys.version_info[0] == 3` referenced (python4), use `>=`
-   |
- 7 | PY3 = sys.version_info[0] == 3
- 8 | PY3 = version_info[0] == 3
- 9 | PY2 = sys.version_info[0] != 3
-   |       ^^^^^^^^^^^^^^^^^^^ YTT201
-10 | PY2 = version_info[0] != 3
-   |
-
-YTT201.py:10:7: YTT201 `sys.version_info[0] == 3` referenced (python4), use `>=`
-   |
- 8 | PY3 = version_info[0] == 3
- 9 | PY2 = sys.version_info[0] != 3
-10 | PY2 = version_info[0] != 3
-   |       ^^^^^^^^^^^^^^^ YTT201
-   |
-
-

crates/ruff/src/rules/flake8_2020/snapshots/ruff__rules__flake8_2020__tests__YTT202_YTT202.py.snap

@@ -1,23 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_2020/mod.rs
----
-YTT202.py:4:4: YTT202 `six.PY3` referenced (python4), use `not six.PY2`
-  |
-2 | from six import PY3
-3 | 
-4 | if six.PY3:
-  |    ^^^^^^^ YTT202
-5 |     print("3")
-6 | if PY3:
-  |
-
-YTT202.py:6:4: YTT202 `six.PY3` referenced (python4), use `not six.PY2`
-  |
-4 | if six.PY3:
-5 |     print("3")
-6 | if PY3:
-  |    ^^^ YTT202
-7 |     print("3")
-  |
-
-

crates/ruff/src/rules/flake8_2020/snapshots/ruff__rules__flake8_2020__tests__YTT203_YTT203.py.snap

@@ -1,20 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_2020/mod.rs
----
-YTT203.py:4:1: YTT203 `sys.version_info[1]` compared to integer (python4), compare `sys.version_info` to tuple
-  |
-2 | from sys import version_info
-3 | 
-4 | sys.version_info[1] >= 5
-  | ^^^^^^^^^^^^^^^^^^^ YTT203
-5 | version_info[1] < 6
-  |
-
-YTT203.py:5:1: YTT203 `sys.version_info[1]` compared to integer (python4), compare `sys.version_info` to tuple
-  |
-4 | sys.version_info[1] >= 5
-5 | version_info[1] < 6
-  | ^^^^^^^^^^^^^^^ YTT203
-  |
-
-

crates/ruff/src/rules/flake8_2020/snapshots/ruff__rules__flake8_2020__tests__YTT204_YTT204.py.snap

@@ -1,20 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_2020/mod.rs
----
-YTT204.py:4:1: YTT204 `sys.version_info.minor` compared to integer (python4), compare `sys.version_info` to tuple
-  |
-2 | from sys import version_info
-3 | 
-4 | sys.version_info.minor <= 7
-  | ^^^^^^^^^^^^^^^^^^^^^^ YTT204
-5 | version_info.minor > 8
-  |
-
-YTT204.py:5:1: YTT204 `sys.version_info.minor` compared to integer (python4), compare `sys.version_info` to tuple
-  |
-4 | sys.version_info.minor <= 7
-5 | version_info.minor > 8
-  | ^^^^^^^^^^^^^^^^^^ YTT204
-  |
-
-

crates/ruff/src/rules/flake8_2020/snapshots/ruff__rules__flake8_2020__tests__YTT301_YTT301.py.snap

@@ -1,20 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_2020/mod.rs
----
-YTT301.py:4:12: YTT301 `sys.version[0]` referenced (python10), use `sys.version_info`
-  |
-2 | from sys import version
-3 | 
-4 | py_major = sys.version[0]
-  |            ^^^^^^^^^^^ YTT301
-5 | py_major = version[0]
-  |
-
-YTT301.py:5:12: YTT301 `sys.version[0]` referenced (python10), use `sys.version_info`
-  |
-4 | py_major = sys.version[0]
-5 | py_major = version[0]
-  |            ^^^^^^^ YTT301
-  |
-
-

crates/ruff/src/rules/flake8_2020/snapshots/ruff__rules__flake8_2020__tests__YTT302_YTT302.py.snap

@@ -1,50 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_2020/mod.rs
----
-YTT302.py:4:1: YTT302 `sys.version` compared to string (python10), use `sys.version_info`
-  |
-2 | from sys import version
-3 | 
-4 | version < "3"
-  | ^^^^^^^ YTT302
-5 | sys.version < "3"
-6 | sys.version <= "3"
-  |
-
-YTT302.py:5:1: YTT302 `sys.version` compared to string (python10), use `sys.version_info`
-  |
-4 | version < "3"
-5 | sys.version < "3"
-  | ^^^^^^^^^^^ YTT302
-6 | sys.version <= "3"
-7 | sys.version > "3"
-  |
-
-YTT302.py:6:1: YTT302 `sys.version` compared to string (python10), use `sys.version_info`
-  |
-4 | version < "3"
-5 | sys.version < "3"
-6 | sys.version <= "3"
-  | ^^^^^^^^^^^ YTT302
-7 | sys.version > "3"
-8 | sys.version >= "3"
-  |
-
-YTT302.py:7:1: YTT302 `sys.version` compared to string (python10), use `sys.version_info`
-  |
-5 | sys.version < "3"
-6 | sys.version <= "3"
-7 | sys.version > "3"
-  | ^^^^^^^^^^^ YTT302
-8 | sys.version >= "3"
-  |
-
-YTT302.py:8:1: YTT302 `sys.version` compared to string (python10), use `sys.version_info`
-  |
-6 | sys.version <= "3"
-7 | sys.version > "3"
-8 | sys.version >= "3"
-  | ^^^^^^^^^^^ YTT302
-  |
-
-

crates/ruff/src/rules/flake8_2020/snapshots/ruff__rules__flake8_2020__tests__YTT303_YTT303.py.snap

@@ -1,20 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_2020/mod.rs
----
-YTT303.py:4:7: YTT303 `sys.version[:1]` referenced (python10), use `sys.version_info`
-  |
-2 | from sys import version
-3 | 
-4 | print(sys.version[:1])
-  |       ^^^^^^^^^^^ YTT303
-5 | print(version[:1])
-  |
-
-YTT303.py:5:7: YTT303 `sys.version[:1]` referenced (python10), use `sys.version_info`
-  |
-4 | print(sys.version[:1])
-5 | print(version[:1])
-  |       ^^^^^^^ YTT303
-  |
-
-

crates/ruff/src/rules/flake8_annotations/mod.rs

@@ -1,202 +0,0 @@
-//! Rules from [flake8-annotations](https://pypi.org/project/flake8-annotations/).
-pub(crate) mod helpers;
-pub(crate) mod rules;
-pub mod settings;
-
-#[cfg(test)]
-mod tests {
-    use std::path::Path;
-
-    use anyhow::Result;
-
-    use crate::assert_messages;
-    use crate::registry::Rule;
-    use crate::settings::Settings;
-    use crate::test::test_path;
-
-    #[test]
-    fn defaults() -> Result<()> {
-        let diagnostics = test_path(
-            Path::new("flake8_annotations/annotation_presence.py"),
-            &Settings {
-                ..Settings::for_rules(vec![
-                    Rule::MissingTypeFunctionArgument,
-                    Rule::MissingTypeArgs,
-                    Rule::MissingTypeKwargs,
-                    Rule::MissingTypeSelf,
-                    Rule::MissingTypeCls,
-                    Rule::MissingReturnTypeUndocumentedPublicFunction,
-                    Rule::MissingReturnTypePrivateFunction,
-                    Rule::MissingReturnTypeSpecialMethod,
-                    Rule::MissingReturnTypeStaticMethod,
-                    Rule::MissingReturnTypeClassMethod,
-                    Rule::AnyType,
-                ])
-            },
-        )?;
-        assert_messages!(diagnostics);
-        Ok(())
-    }
-
-    #[test]
-    fn ignore_fully_untyped() -> Result<()> {
-        let diagnostics = test_path(
-            Path::new("flake8_annotations/ignore_fully_untyped.py"),
-            &Settings {
-                flake8_annotations: super::settings::Settings {
-                    ignore_fully_untyped: true,
-                    ..Default::default()
-                },
-                ..Settings::for_rules(vec![
-                    Rule::MissingTypeFunctionArgument,
-                    Rule::MissingTypeArgs,
-                    Rule::MissingTypeKwargs,
-                    Rule::MissingTypeSelf,
-                    Rule::MissingTypeCls,
-                    Rule::MissingReturnTypeUndocumentedPublicFunction,
-                    Rule::MissingReturnTypePrivateFunction,
-                    Rule::MissingReturnTypeSpecialMethod,
-                    Rule::MissingReturnTypeStaticMethod,
-                    Rule::MissingReturnTypeClassMethod,
-                    Rule::AnyType,
-                ])
-            },
-        )?;
-        assert_messages!(diagnostics);
-        Ok(())
-    }
-
-    #[test]
-    fn suppress_dummy_args() -> Result<()> {
-        let diagnostics = test_path(
-            Path::new("flake8_annotations/suppress_dummy_args.py"),
-            &Settings {
-                flake8_annotations: super::settings::Settings {
-                    suppress_dummy_args: true,
-                    ..Default::default()
-                },
-                ..Settings::for_rules(vec![
-                    Rule::MissingTypeFunctionArgument,
-                    Rule::MissingTypeArgs,
-                    Rule::MissingTypeKwargs,
-                    Rule::MissingTypeSelf,
-                    Rule::MissingTypeCls,
-                ])
-            },
-        )?;
-        assert_messages!(diagnostics);
-        Ok(())
-    }
-
-    #[test]
-    fn mypy_init_return() -> Result<()> {
-        let diagnostics = test_path(
-            Path::new("flake8_annotations/mypy_init_return.py"),
-            &Settings {
-                flake8_annotations: super::settings::Settings {
-                    mypy_init_return: true,
-                    ..Default::default()
-                },
-                ..Settings::for_rules(vec![
-                    Rule::MissingReturnTypeUndocumentedPublicFunction,
-                    Rule::MissingReturnTypePrivateFunction,
-                    Rule::MissingReturnTypeSpecialMethod,
-                    Rule::MissingReturnTypeStaticMethod,
-                    Rule::MissingReturnTypeClassMethod,
-                ])
-            },
-        )?;
-        assert_messages!(diagnostics);
-        Ok(())
-    }
-
-    #[test]
-    fn suppress_none_returning() -> Result<()> {
-        let diagnostics = test_path(
-            Path::new("flake8_annotations/suppress_none_returning.py"),
-            &Settings {
-                flake8_annotations: super::settings::Settings {
-                    suppress_none_returning: true,
-                    ..Default::default()
-                },
-                ..Settings::for_rules(vec![
-                    Rule::MissingTypeFunctionArgument,
-                    Rule::MissingTypeArgs,
-                    Rule::MissingTypeKwargs,
-                    Rule::MissingTypeSelf,
-                    Rule::MissingTypeCls,
-                    Rule::MissingReturnTypeUndocumentedPublicFunction,
-                    Rule::MissingReturnTypePrivateFunction,
-                    Rule::MissingReturnTypeSpecialMethod,
-                    Rule::MissingReturnTypeStaticMethod,
-                    Rule::MissingReturnTypeClassMethod,
-                    Rule::AnyType,
-                ])
-            },
-        )?;
-        assert_messages!(diagnostics);
-        Ok(())
-    }
-
-    #[test]
-    fn allow_star_arg_any() -> Result<()> {
-        let diagnostics = test_path(
-            Path::new("flake8_annotations/allow_star_arg_any.py"),
-            &Settings {
-                flake8_annotations: super::settings::Settings {
-                    allow_star_arg_any: true,
-                    ..Default::default()
-                },
-                ..Settings::for_rules(vec![Rule::AnyType])
-            },
-        )?;
-        assert_messages!(diagnostics);
-        Ok(())
-    }
-
-    #[test]
-    fn allow_overload() -> Result<()> {
-        let diagnostics = test_path(
-            Path::new("flake8_annotations/allow_overload.py"),
-            &Settings {
-                ..Settings::for_rules(vec![
-                    Rule::MissingReturnTypeUndocumentedPublicFunction,
-                    Rule::MissingReturnTypePrivateFunction,
-                    Rule::MissingReturnTypeSpecialMethod,
-                    Rule::MissingReturnTypeStaticMethod,
-                    Rule::MissingReturnTypeClassMethod,
-                ])
-            },
-        )?;
-        assert_messages!(diagnostics);
-        Ok(())
-    }
-
-    #[test]
-    fn allow_nested_overload() -> Result<()> {
-        let diagnostics = test_path(
-            Path::new("flake8_annotations/allow_nested_overload.py"),
-            &Settings {
-                ..Settings::for_rules(vec![
-                    Rule::MissingReturnTypeUndocumentedPublicFunction,
-                    Rule::MissingReturnTypePrivateFunction,
-                    Rule::MissingReturnTypeSpecialMethod,
-                    Rule::MissingReturnTypeStaticMethod,
-                    Rule::MissingReturnTypeClassMethod,
-                ])
-            },
-        )?;
-        assert_messages!(diagnostics);
-        Ok(())
-    }
-
-    #[test]
-    fn simple_magic_methods() -> Result<()> {
-        let diagnostics = test_path(
-            Path::new("flake8_annotations/simple_magic_methods.py"),
-            &Settings::for_rule(Rule::MissingReturnTypeSpecialMethod),
-        )?;
-        assert_messages!(diagnostics);
-        Ok(())
-    }
-}

crates/ruff/src/rules/flake8_annotations/snapshots/ruff__rules__flake8_annotations__tests__allow_nested_overload.snap

@@ -1,4 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_annotations/mod.rs
----
-

crates/ruff/src/rules/flake8_annotations/snapshots/ruff__rules__flake8_annotations__tests__allow_overload.snap

@@ -1,12 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_annotations/mod.rs
----
-allow_overload.py:29:9: ANN201 Missing return type annotation for public function `bar`
-   |
-28 | class X:
-29 |     def bar(i):
-   |         ^^^ ANN201
-30 |         return i
-   |
-
-

crates/ruff/src/rules/flake8_annotations/snapshots/ruff__rules__flake8_annotations__tests__allow_star_arg_any.snap

@@ -1,36 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_annotations/mod.rs
----
-allow_star_arg_any.py:10:12: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a`
-   |
- 9 | # ANN401
-10 | def foo(a: Any, *args: str, **kwargs: str) -> int:
-   |            ^^^ ANN401
-11 |     pass
-   |
-
-allow_star_arg_any.py:15:47: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `foo`
-   |
-14 | # ANN401
-15 | def foo(a: int, *args: str, **kwargs: str) -> Any:
-   |                                               ^^^ ANN401
-16 |     pass
-   |
-
-allow_star_arg_any.py:40:29: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a`
-   |
-39 |     # ANN401
-40 |     def foo_method(self, a: Any, *params: str, **options: str) -> int:
-   |                             ^^^ ANN401
-41 |         pass
-   |
-
-allow_star_arg_any.py:44:67: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `foo_method`
-   |
-43 |     # ANN401
-44 |     def foo_method(self, a: int, *params: str, **options: str) -> Any:
-   |                                                                   ^^^ ANN401
-45 |         pass
-   |
-
-

crates/ruff/src/rules/flake8_annotations/snapshots/ruff__rules__flake8_annotations__tests__defaults.snap

@@ -1,263 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_annotations/mod.rs
----
-annotation_presence.py:5:5: ANN201 Missing return type annotation for public function `foo`
-  |
-4 | # Error
-5 | def foo(a, b):
-  |     ^^^ ANN201
-6 |     pass
-  |
-
-annotation_presence.py:5:9: ANN001 Missing type annotation for function argument `a`
-  |
-4 | # Error
-5 | def foo(a, b):
-  |         ^ ANN001
-6 |     pass
-  |
-
-annotation_presence.py:5:12: ANN001 Missing type annotation for function argument `b`
-  |
-4 | # Error
-5 | def foo(a, b):
-  |            ^ ANN001
-6 |     pass
-  |
-
-annotation_presence.py:10:5: ANN201 Missing return type annotation for public function `foo`
-   |
- 9 | # Error
-10 | def foo(a: int, b):
-   |     ^^^ ANN201
-11 |     pass
-   |
-
-annotation_presence.py:10:17: ANN001 Missing type annotation for function argument `b`
-   |
- 9 | # Error
-10 | def foo(a: int, b):
-   |                 ^ ANN001
-11 |     pass
-   |
-
-annotation_presence.py:15:17: ANN001 Missing type annotation for function argument `b`
-   |
-14 | # Error
-15 | def foo(a: int, b) -> int:
-   |                 ^ ANN001
-16 |     pass
-   |
-
-annotation_presence.py:20:5: ANN201 Missing return type annotation for public function `foo`
-   |
-19 | # Error
-20 | def foo(a: int, b: int):
-   |     ^^^ ANN201
-21 |     pass
-   |
-
-annotation_presence.py:25:5: ANN201 Missing return type annotation for public function `foo`
-   |
-24 | # Error
-25 | def foo():
-   |     ^^^ ANN201
-26 |     pass
-   |
-
-annotation_presence.py:45:12: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a`
-   |
-44 | # ANN401
-45 | def foo(a: Any, *args: str, **kwargs: str) -> int:
-   |            ^^^ ANN401
-46 |     pass
-   |
-
-annotation_presence.py:50:47: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `foo`
-   |
-49 | # ANN401
-50 | def foo(a: int, *args: str, **kwargs: str) -> Any:
-   |                                               ^^^ ANN401
-51 |     pass
-   |
-
-annotation_presence.py:55:24: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `*args`
-   |
-54 | # ANN401
-55 | def foo(a: int, *args: Any, **kwargs: Any) -> int:
-   |                        ^^^ ANN401
-56 |     pass
-   |
-
-annotation_presence.py:55:39: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `**kwargs`
-   |
-54 | # ANN401
-55 | def foo(a: int, *args: Any, **kwargs: Any) -> int:
-   |                                       ^^^ ANN401
-56 |     pass
-   |
-
-annotation_presence.py:60:24: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `*args`
-   |
-59 | # ANN401
-60 | def foo(a: int, *args: Any, **kwargs: str) -> int:
-   |                        ^^^ ANN401
-61 |     pass
-   |
-
-annotation_presence.py:65:39: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `**kwargs`
-   |
-64 | # ANN401
-65 | def foo(a: int, *args: str, **kwargs: Any) -> int:
-   |                                       ^^^ ANN401
-66 |     pass
-   |
-
-annotation_presence.py:75:13: ANN101 Missing type annotation for `self` in method
-   |
-74 |     # ANN101
-75 |     def foo(self, a: int, b: int) -> int:
-   |             ^^^^ ANN101
-76 |         pass
-   |
-
-annotation_presence.py:79:29: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a`
-   |
-78 |     # ANN401
-79 |     def foo(self: "Foo", a: Any, *params: str, **options: str) -> int:
-   |                             ^^^ ANN401
-80 |         pass
-   |
-
-annotation_presence.py:83:67: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `foo`
-   |
-82 |     # ANN401
-83 |     def foo(self: "Foo", a: int, *params: str, **options: str) -> Any:
-   |                                                                   ^^^ ANN401
-84 |         pass
-   |
-
-annotation_presence.py:87:43: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `*params`
-   |
-86 |     # ANN401
-87 |     def foo(self: "Foo", a: int, *params: Any, **options: Any) -> int:
-   |                                           ^^^ ANN401
-88 |         pass
-   |
-
-annotation_presence.py:87:59: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `**options`
-   |
-86 |     # ANN401
-87 |     def foo(self: "Foo", a: int, *params: Any, **options: Any) -> int:
-   |                                                           ^^^ ANN401
-88 |         pass
-   |
-
-annotation_presence.py:91:43: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `*params`
-   |
-90 |     # ANN401
-91 |     def foo(self: "Foo", a: int, *params: Any, **options: str) -> int:
-   |                                           ^^^ ANN401
-92 |         pass
-   |
-
-annotation_presence.py:95:59: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `**options`
-   |
-94 |     # ANN401
-95 |     def foo(self: "Foo", a: int, *params: str, **options: Any) -> int:
-   |                                                           ^^^ ANN401
-96 |         pass
-   |
-
-annotation_presence.py:130:13: ANN102 Missing type annotation for `cls` in classmethod
-    |
-128 |     # ANN102
-129 |     @classmethod
-130 |     def foo(cls, a: int, b: int) -> int:
-    |             ^^^ ANN102
-131 |         pass
-    |
-
-annotation_presence.py:134:13: ANN101 Missing type annotation for `self` in method
-    |
-133 |     # ANN101
-134 |     def foo(self, /, a: int, b: int) -> int:
-    |             ^^^^ ANN101
-135 |         pass
-    |
-
-annotation_presence.py:149:10: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a`
-    |
-148 | # ANN401
-149 | def f(a: Any | int) -> None: ...
-    |          ^^^^^^^^^ ANN401
-150 | def f(a: int | Any) -> None: ...
-151 | def f(a: Union[str, bytes, Any]) -> None: ...
-    |
-
-annotation_presence.py:150:10: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a`
-    |
-148 | # ANN401
-149 | def f(a: Any | int) -> None: ...
-150 | def f(a: int | Any) -> None: ...
-    |          ^^^^^^^^^ ANN401
-151 | def f(a: Union[str, bytes, Any]) -> None: ...
-152 | def f(a: Optional[Any]) -> None: ...
-    |
-
-annotation_presence.py:151:10: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a`
-    |
-149 | def f(a: Any | int) -> None: ...
-150 | def f(a: int | Any) -> None: ...
-151 | def f(a: Union[str, bytes, Any]) -> None: ...
-    |          ^^^^^^^^^^^^^^^^^^^^^^ ANN401
-152 | def f(a: Optional[Any]) -> None: ...
-153 | def f(a: Annotated[Any, ...]) -> None: ...
-    |
-
-annotation_presence.py:152:10: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a`
-    |
-150 | def f(a: int | Any) -> None: ...
-151 | def f(a: Union[str, bytes, Any]) -> None: ...
-152 | def f(a: Optional[Any]) -> None: ...
-    |          ^^^^^^^^^^^^^ ANN401
-153 | def f(a: Annotated[Any, ...]) -> None: ...
-154 | def f(a: "Union[str, bytes, Any]") -> None: ...
-    |
-
-annotation_presence.py:153:10: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a`
-    |
-151 | def f(a: Union[str, bytes, Any]) -> None: ...
-152 | def f(a: Optional[Any]) -> None: ...
-153 | def f(a: Annotated[Any, ...]) -> None: ...
-    |          ^^^^^^^^^^^^^^^^^^^ ANN401
-154 | def f(a: "Union[str, bytes, Any]") -> None: ...
-    |
-
-annotation_presence.py:154:10: ANN401 Dynamically typed expressions (typing.Any) are disallowed in `a`
-    |
-152 | def f(a: Optional[Any]) -> None: ...
-153 | def f(a: Annotated[Any, ...]) -> None: ...
-154 | def f(a: "Union[str, bytes, Any]") -> None: ...
-    |          ^^^^^^^^^^^^^^^^^^^^^^^^ ANN401
-    |
-
-annotation_presence.py:159:9: ANN204 [*] Missing return type annotation for special method `__init__`
-    |
-157 | class Foo:
-158 |     @decorator()
-159 |     def __init__(self: "Foo", foo: int):
-    |         ^^^^^^^^ ANN204
-160 |        ...
-    |
-    = help: Add `None` return type
-
-ℹ Suggested fix
-156 156 | 
-157 157 | class Foo:
-158 158 |     @decorator()
-159     |-    def __init__(self: "Foo", foo: int):
-    159 |+    def __init__(self: "Foo", foo: int) -> None:
-160 160 |        ...
-
-

crates/ruff/src/rules/flake8_annotations/snapshots/ruff__rules__flake8_annotations__tests__ignore_fully_untyped.snap

@@ -1,41 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_annotations/mod.rs
----
-ignore_fully_untyped.py:24:5: ANN201 Missing return type annotation for public function `error_partially_typed_1`
-   |
-24 | def error_partially_typed_1(a: int, b):
-   |     ^^^^^^^^^^^^^^^^^^^^^^^ ANN201
-25 |     pass
-   |
-
-ignore_fully_untyped.py:24:37: ANN001 Missing type annotation for function argument `b`
-   |
-24 | def error_partially_typed_1(a: int, b):
-   |                                     ^ ANN001
-25 |     pass
-   |
-
-ignore_fully_untyped.py:28:37: ANN001 Missing type annotation for function argument `b`
-   |
-28 | def error_partially_typed_2(a: int, b) -> int:
-   |                                     ^ ANN001
-29 |     pass
-   |
-
-ignore_fully_untyped.py:32:5: ANN201 Missing return type annotation for public function `error_partially_typed_3`
-   |
-32 | def error_partially_typed_3(a: int, b: int):
-   |     ^^^^^^^^^^^^^^^^^^^^^^^ ANN201
-33 |     pass
-   |
-
-ignore_fully_untyped.py:43:9: ANN201 Missing return type annotation for public function `error_typed_self`
-   |
-41 |         pass
-42 | 
-43 |     def error_typed_self(self: X):
-   |         ^^^^^^^^^^^^^^^^ ANN201
-44 |         pass
-   |
-
-

crates/ruff/src/rules/flake8_annotations/snapshots/ruff__rules__flake8_annotations__tests__mypy_init_return.snap

@@ -1,70 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_annotations/mod.rs
----
-mypy_init_return.py:5:9: ANN204 [*] Missing return type annotation for special method `__init__`
-  |
-3 | # Error
-4 | class Foo:
-5 |     def __init__(self):
-  |         ^^^^^^^^ ANN204
-6 |         ...
-  |
-  = help: Add `None` return type
-
-ℹ Suggested fix
-2 2 | 
-3 3 | # Error
-4 4 | class Foo:
-5   |-    def __init__(self):
-  5 |+    def __init__(self) -> None:
-6 6 |         ...
-7 7 | 
-8 8 | 
-
-mypy_init_return.py:11:9: ANN204 [*] Missing return type annotation for special method `__init__`
-   |
- 9 | # Error
-10 | class Foo:
-11 |     def __init__(self, foo):
-   |         ^^^^^^^^ ANN204
-12 |         ...
-   |
-   = help: Add `None` return type
-
-ℹ Suggested fix
-8  8  | 
-9  9  | # Error
-10 10 | class Foo:
-11    |-    def __init__(self, foo):
-   11 |+    def __init__(self, foo) -> None:
-12 12 |         ...
-13 13 | 
-14 14 | 
-
-mypy_init_return.py:40:5: ANN202 Missing return type annotation for private function `__init__`
-   |
-39 | # Error
-40 | def __init__(self, foo: int):
-   |     ^^^^^^^^ ANN202
-41 |     ...
-   |
-
-mypy_init_return.py:47:9: ANN204 [*] Missing return type annotation for special method `__init__`
-   |
-45 | # of a vararg falsely indicated that the function has a typed argument.
-46 | class Foo:
-47 |     def __init__(self, *arg):
-   |         ^^^^^^^^ ANN204
-48 |         ...
-   |
-   = help: Add `None` return type
-
-ℹ Suggested fix
-44 44 | # Error – used to be ok for a moment since the mere presence
-45 45 | # of a vararg falsely indicated that the function has a typed argument.
-46 46 | class Foo:
-47    |-    def __init__(self, *arg):
-   47 |+    def __init__(self, *arg) -> None:
-48 48 |         ...
-
-

crates/ruff/src/rules/flake8_annotations/snapshots/ruff__rules__flake8_annotations__tests__simple_magic_methods.snap

@@ -1,279 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_annotations/mod.rs
----
-simple_magic_methods.py:2:9: ANN204 [*] Missing return type annotation for special method `__str__`
-  |
-1 | class Foo:
-2 |     def __str__(self):
-  |         ^^^^^^^ ANN204
-3 |         ...
-  |
-  = help: Add `None` return type
-
-ℹ Suggested fix
-1 1 | class Foo:
-2   |-    def __str__(self):
-  2 |+    def __str__(self) -> str:
-3 3 |         ...
-4 4 | 
-5 5 |     def __repr__(self):
-
-simple_magic_methods.py:5:9: ANN204 [*] Missing return type annotation for special method `__repr__`
-  |
-3 |         ...
-4 | 
-5 |     def __repr__(self):
-  |         ^^^^^^^^ ANN204
-6 |         ...
-  |
-  = help: Add `None` return type
-
-ℹ Suggested fix
-2 2 |     def __str__(self):
-3 3 |         ...
-4 4 | 
-5   |-    def __repr__(self):
-  5 |+    def __repr__(self) -> str:
-6 6 |         ...
-7 7 | 
-8 8 |     def __len__(self):
-
-simple_magic_methods.py:8:9: ANN204 [*] Missing return type annotation for special method `__len__`
-  |
-6 |         ...
-7 | 
-8 |     def __len__(self):
-  |         ^^^^^^^ ANN204
-9 |         ...
-  |
-  = help: Add `None` return type
-
-ℹ Suggested fix
-5 5 |     def __repr__(self):
-6 6 |         ...
-7 7 | 
-8   |-    def __len__(self):
-  8 |+    def __len__(self) -> int:
-9 9 |         ...
-10 10 | 
-11 11 |     def __length_hint__(self):
-
-simple_magic_methods.py:11:9: ANN204 [*] Missing return type annotation for special method `__length_hint__`
-   |
- 9 |         ...
-10 | 
-11 |     def __length_hint__(self):
-   |         ^^^^^^^^^^^^^^^ ANN204
-12 |         ...
-   |
-   = help: Add `None` return type
-
-ℹ Suggested fix
-8  8  |     def __len__(self):
-9  9  |         ...
-10 10 | 
-11    |-    def __length_hint__(self):
-   11 |+    def __length_hint__(self) -> int:
-12 12 |         ...
-13 13 | 
-14 14 |     def __init__(self):
-
-simple_magic_methods.py:14:9: ANN204 [*] Missing return type annotation for special method `__init__`
-   |
-12 |         ...
-13 | 
-14 |     def __init__(self):
-   |         ^^^^^^^^ ANN204
-15 |         ...
-   |
-   = help: Add `None` return type
-
-ℹ Suggested fix
-11 11 |     def __length_hint__(self):
-12 12 |         ...
-13 13 | 
-14    |-    def __init__(self):
-   14 |+    def __init__(self) -> None:
-15 15 |         ...
-16 16 | 
-17 17 |     def __del__(self):
-
-simple_magic_methods.py:17:9: ANN204 [*] Missing return type annotation for special method `__del__`
-   |
-15 |         ...
-16 | 
-17 |     def __del__(self):
-   |         ^^^^^^^ ANN204
-18 |         ...
-   |
-   = help: Add `None` return type
-
-ℹ Suggested fix
-14 14 |     def __init__(self):
-15 15 |         ...
-16 16 | 
-17    |-    def __del__(self):
-   17 |+    def __del__(self) -> None:
-18 18 |         ...
-19 19 | 
-20 20 |     def __bool__(self):
-
-simple_magic_methods.py:20:9: ANN204 [*] Missing return type annotation for special method `__bool__`
-   |
-18 |         ...
-19 | 
-20 |     def __bool__(self):
-   |         ^^^^^^^^ ANN204
-21 |         ...
-   |
-   = help: Add `None` return type
-
-ℹ Suggested fix
-17 17 |     def __del__(self):
-18 18 |         ...
-19 19 | 
-20    |-    def __bool__(self):
-   20 |+    def __bool__(self) -> bool:
-21 21 |         ...
-22 22 | 
-23 23 |     def __bytes__(self):
-
-simple_magic_methods.py:23:9: ANN204 [*] Missing return type annotation for special method `__bytes__`
-   |
-21 |         ...
-22 | 
-23 |     def __bytes__(self):
-   |         ^^^^^^^^^ ANN204
-24 |         ...
-   |
-   = help: Add `None` return type
-
-ℹ Suggested fix
-20 20 |     def __bool__(self):
-21 21 |         ...
-22 22 | 
-23    |-    def __bytes__(self):
-   23 |+    def __bytes__(self) -> bytes:
-24 24 |         ...
-25 25 | 
-26 26 |     def __format__(self, format_spec):
-
-simple_magic_methods.py:26:9: ANN204 [*] Missing return type annotation for special method `__format__`
-   |
-24 |         ...
-25 | 
-26 |     def __format__(self, format_spec):
-   |         ^^^^^^^^^^ ANN204
-27 |         ...
-   |
-   = help: Add `None` return type
-
-ℹ Suggested fix
-23 23 |     def __bytes__(self):
-24 24 |         ...
-25 25 | 
-26    |-    def __format__(self, format_spec):
-   26 |+    def __format__(self, format_spec) -> str:
-27 27 |         ...
-28 28 | 
-29 29 |     def __contains__(self, item):
-
-simple_magic_methods.py:29:9: ANN204 [*] Missing return type annotation for special method `__contains__`
-   |
-27 |         ...
-28 | 
-29 |     def __contains__(self, item):
-   |         ^^^^^^^^^^^^ ANN204
-30 |         ...
-   |
-   = help: Add `None` return type
-
-ℹ Suggested fix
-26 26 |     def __format__(self, format_spec):
-27 27 |         ...
-28 28 | 
-29    |-    def __contains__(self, item):
-   29 |+    def __contains__(self, item) -> bool:
-30 30 |         ...
-31 31 | 
-32 32 |     def __complex__(self):
-
-simple_magic_methods.py:32:9: ANN204 [*] Missing return type annotation for special method `__complex__`
-   |
-30 |         ...
-31 | 
-32 |     def __complex__(self):
-   |         ^^^^^^^^^^^ ANN204
-33 |         ...
-   |
-   = help: Add `None` return type
-
-ℹ Suggested fix
-29 29 |     def __contains__(self, item):
-30 30 |         ...
-31 31 | 
-32    |-    def __complex__(self):
-   32 |+    def __complex__(self) -> complex:
-33 33 |         ...
-34 34 | 
-35 35 |     def __int__(self):
-
-simple_magic_methods.py:35:9: ANN204 [*] Missing return type annotation for special method `__int__`
-   |
-33 |         ...
-34 | 
-35 |     def __int__(self):
-   |         ^^^^^^^ ANN204
-36 |         ...
-   |
-   = help: Add `None` return type
-
-ℹ Suggested fix
-32 32 |     def __complex__(self):
-33 33 |         ...
-34 34 | 
-35    |-    def __int__(self):
-   35 |+    def __int__(self) -> int:
-36 36 |         ...
-37 37 | 
-38 38 |     def __float__(self):
-
-simple_magic_methods.py:38:9: ANN204 [*] Missing return type annotation for special method `__float__`
-   |
-36 |         ...
-37 | 
-38 |     def __float__(self):
-   |         ^^^^^^^^^ ANN204
-39 |         ...
-   |
-   = help: Add `None` return type
-
-ℹ Suggested fix
-35 35 |     def __int__(self):
-36 36 |         ...
-37 37 | 
-38    |-    def __float__(self):
-   38 |+    def __float__(self) -> float:
-39 39 |         ...
-40 40 | 
-41 41 |     def __index__(self):
-
-simple_magic_methods.py:41:9: ANN204 [*] Missing return type annotation for special method `__index__`
-   |
-39 |         ...
-40 | 
-41 |     def __index__(self):
-   |         ^^^^^^^^^ ANN204
-42 |         ...
-   |
-   = help: Add `None` return type
-
-ℹ Suggested fix
-38 38 |     def __float__(self):
-39 39 |         ...
-40 40 | 
-41    |-    def __index__(self):
-   41 |+    def __index__(self) -> int:
-42 42 |         ...
-
-

crates/ruff/src/rules/flake8_annotations/snapshots/ruff__rules__flake8_annotations__tests__suppress_dummy_args.snap

@@ -1,4 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_annotations/mod.rs
----
-

crates/ruff/src/rules/flake8_annotations/snapshots/ruff__rules__flake8_annotations__tests__suppress_none_returning.snap

@@ -1,29 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_annotations/mod.rs
----
-suppress_none_returning.py:45:5: ANN201 Missing return type annotation for public function `foo`
-   |
-44 | # Error
-45 | def foo():
-   |     ^^^ ANN201
-46 |     return True
-   |
-
-suppress_none_returning.py:50:5: ANN201 Missing return type annotation for public function `foo`
-   |
-49 | # Error
-50 | def foo():
-   |     ^^^ ANN201
-51 |     a = 2 + 2
-52 |     if a == 4:
-   |
-
-suppress_none_returning.py:59:9: ANN001 Missing type annotation for function argument `a`
-   |
-58 | # Error (on the argument, but not the return type)
-59 | def foo(a):
-   |         ^ ANN001
-60 |     a = 2 + 2
-   |
-
-

crates/ruff/src/rules/flake8_async/mod.rs

@@ -1,28 +0,0 @@
-//! Rules from [flake8-async](https://pypi.org/project/flake8-async/).
-pub(crate) mod rules;
-
-#[cfg(test)]
-mod tests {
-    use std::path::Path;
-
-    use anyhow::Result;
-    use test_case::test_case;
-
-    use crate::assert_messages;
-    use crate::registry::Rule;
-    use crate::settings::Settings;
-    use crate::test::test_path;
-
-    #[test_case(Rule::BlockingHttpCallInAsyncFunction, Path::new("ASYNC100.py"))]
-    #[test_case(Rule::OpenSleepOrSubprocessInAsyncFunction, Path::new("ASYNC101.py"))]
-    #[test_case(Rule::BlockingOsCallInAsyncFunction, Path::new("ASYNC102.py"))]
-    fn rules(rule_code: Rule, path: &Path) -> Result<()> {
-        let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
-        let diagnostics = test_path(
-            Path::new("flake8_async").join(path).as_path(),
-            &Settings::for_rule(rule_code),
-        )?;
-        assert_messages!(snapshot, diagnostics);
-        Ok(())
-    }
-}

crates/ruff/src/rules/flake8_async/snapshots/ruff__rules__flake8_async__tests__ASYNC100_ASYNC100.py.snap

@@ -1,39 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_async/mod.rs
----
-ASYNC100.py:7:5: ASYNC100 Async functions should not call blocking HTTP methods
-  |
-6 | async def foo():
-7 |     urllib.request.urlopen("http://example.com/foo/bar").read()
-  |     ^^^^^^^^^^^^^^^^^^^^^^ ASYNC100
-  |
-
-ASYNC100.py:11:5: ASYNC100 Async functions should not call blocking HTTP methods
-   |
-10 | async def foo():
-11 |     requests.get()
-   |     ^^^^^^^^^^^^ ASYNC100
-   |
-
-ASYNC100.py:15:5: ASYNC100 Async functions should not call blocking HTTP methods
-   |
-14 | async def foo():
-15 |     httpx.get()
-   |     ^^^^^^^^^ ASYNC100
-   |
-
-ASYNC100.py:19:5: ASYNC100 Async functions should not call blocking HTTP methods
-   |
-18 | async def foo():
-19 |     requests.post()
-   |     ^^^^^^^^^^^^^ ASYNC100
-   |
-
-ASYNC100.py:23:5: ASYNC100 Async functions should not call blocking HTTP methods
-   |
-22 | async def foo():
-23 |     httpx.post()
-   |     ^^^^^^^^^^ ASYNC100
-   |
-
-