Bump version to 0.0.222

Before

```
resources/test/fixtures/flake8_simplify/SIM208.py:1:13: SIM208 Use `a` instead of `not (not a)`
  |
1 | if not (not a):  # SIM208
  |             ^ SIM208
  |
  = help: Replace with `a`

resources/test/fixtures/flake8_simplify/SIM208.py:4:14: SIM208 Use `a == b` instead of `not (not a == b)`
  |
4 | if not (not (a == b)):  # SIM208
  |              ^^^^^^ SIM208
  |
  = help: Replace with `a == b`
```

After

```
resources/test/fixtures/flake8_simplify/SIM208.py:1:4: SIM208 Use `a` instead of `not (not a)`
  |
1 | if not (not a):  # SIM208
  |    ^^^^^^^^^^^ SIM208
  |
  = help: Replace with `a`

resources/test/fixtures/flake8_simplify/SIM208.py:4:4: SIM208 Use `a == b` instead of `not (not a == b)`
  |
4 | if not (not (a == b)):  # SIM208
  |    ^^^^^^^^^^^^^^^^^^ SIM208
  |
  = help: Replace with `a == b`
```

.github/workflows/ci.yaml

@@ -60,7 +60,7 @@ jobs:
           target: wasm32-unknown-unknown
       - uses: Swatinem/rust-cache@v1
       - run: cargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::pedantic
-      - run: cargo clippy --workspace --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic
+      - run: cargo clippy -p ruff --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic
 
   cargo-test:
     name: "cargo test"
@@ -79,7 +79,10 @@ jobs:
         run: |
           cargo insta test --all --delete-unreferenced-snapshots
           git diff --exit-code
-      - run: cargo test --package ruff --test black_compatibility_test -- --ignored
+      - run: cargo test --package ruff_cli --test black_compatibility_test -- --ignored
+      # Check for broken links in the documentation.
+      # Setting RUSTDOCFLAGS because `cargo doc --check` isn't yet implemented (https://github.com/rust-lang/cargo/issues/10025).
+      - run: RUSTDOCFLAGS="-D warnings" cargo doc --all --no-deps
 
 # TODO(charlie): Re-enable the `wasm-pack` tests.
 # See: https://github.com/charliermarsh/ruff/issues/1425

.github/workflows/playground.yaml

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

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.220
+    rev: v0.0.222
     hooks:
       - id: ruff
 

BREAKING_CHANGES.md

@@ -1,5 +1,20 @@
 # Breaking Changes
 
+## 0.0.222
+
+### `--max-complexity` has been removed from the CLI ([#1877](https://github.com/charliermarsh/ruff/pull/1877))
+
+The McCabe plugin's `--max-complexity` setting has been removed from the CLI, for consistency with
+the treatment of other, similar settings.
+
+To set the maximum complexity, use the `max-complexity` property in your `pyproject.toml` file,
+like so:
+
+```toml
+[tool.ruff.mccabe]
+max-complexity = 10
+```
+
 ## 0.0.181
 
 ### Files excluded by `.gitignore` are now ignored ([#1234](https://github.com/charliermarsh/ruff/pull/1234))

Cargo.lock

@@ -735,7 +735,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.220-dev.0"
+version = "0.0.222-dev.0"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
@@ -1364,6 +1364,27 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.17.0"
@@ -1621,6 +1642,17 @@ dependencies = [
  "termtree",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
+dependencies = [
+ "once_cell",
+ "thiserror",
+ "toml",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -1874,27 +1906,19 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.220"
+version = "0.0.222"
 dependencies = [
- "annotate-snippets 0.9.1",
  "anyhow",
- "assert_cmd",
- "atty",
- "bincode",
  "bitflags",
- "cachedir",
  "cfg-if 1.0.0",
  "chrono",
  "clap 4.0.32",
- "clap_complete_command",
- "clearscreen",
  "colored",
  "console_error_panic_hook",
  "console_log",
  "criterion",
  "dirs 4.0.0",
  "fern",
- "filetime",
  "getrandom 0.2.8",
  "glob",
  "globset",
@@ -1906,13 +1930,10 @@ dependencies = [
  "log",
  "natord",
  "nohash-hasher",
- "notify",
  "num-bigint",
  "num-traits",
  "once_cell",
  "path-absolutize",
- "quick-junit",
- "rayon",
  "regex",
  "ropey",
  "ruff_macros",
@@ -1924,25 +1945,57 @@ dependencies = [
  "semver",
  "serde",
  "serde-wasm-bindgen",
- "serde_json",
  "shellexpand",
- "similar",
  "strum",
  "strum_macros",
  "test-case",
  "textwrap",
  "titlecase",
  "toml_edit",
- "update-informer",
- "ureq",
- "walkdir",
  "wasm-bindgen",
  "wasm-bindgen-test",
 ]
 
+[[package]]
+name = "ruff_cli"
+version = "0.0.222"
+dependencies = [
+ "annotate-snippets 0.9.1",
+ "anyhow",
+ "assert_cmd",
+ "atty",
+ "bincode",
+ "cachedir",
+ "chrono",
+ "clap 4.0.32",
+ "clap_complete_command",
+ "clearscreen",
+ "colored",
+ "filetime",
+ "glob",
+ "ignore",
+ "itertools",
+ "log",
+ "notify",
+ "path-absolutize",
+ "quick-junit",
+ "rayon",
+ "regex",
+ "ruff",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+ "similar",
+ "strum",
+ "textwrap",
+ "update-informer",
+ "ureq",
+ "walkdir",
+]
+
 [[package]]
 name = "ruff_dev"
-version = "0.0.220"
+version = "0.0.222"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
@@ -1950,6 +2003,7 @@ dependencies = [
  "libcst",
  "once_cell",
  "ruff",
+ "ruff_cli",
  "rustpython-ast",
  "rustpython-common",
  "rustpython-parser",
@@ -1962,7 +2016,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_macros"
-version = "0.0.220"
+version = "0.0.222"
 dependencies = [
  "once_cell",
  "proc-macro2",
@@ -2005,8 +2059,8 @@ dependencies = [
 
 [[package]]
 name = "rustpython-ast"
-version = "0.1.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
+version = "0.2.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=acbc517b55406c76da83d7b2711941d8d3f65b87#acbc517b55406c76da83d7b2711941d8d3f65b87"
 dependencies = [
  "num-bigint",
  "rustpython-common",
@@ -2015,8 +2069,8 @@ dependencies = [
 
 [[package]]
 name = "rustpython-common"
-version = "0.0.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
+version = "0.2.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=acbc517b55406c76da83d7b2711941d8d3f65b87#acbc517b55406c76da83d7b2711941d8d3f65b87"
 dependencies = [
  "ascii",
  "bitflags",
@@ -2040,8 +2094,8 @@ dependencies = [
 
 [[package]]
 name = "rustpython-compiler-core"
-version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
+version = "0.2.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=acbc517b55406c76da83d7b2711941d8d3f65b87#acbc517b55406c76da83d7b2711941d8d3f65b87"
 dependencies = [
  "bincode",
  "bitflags",
@@ -2050,15 +2104,15 @@ dependencies = [
  "lz4_flex",
  "num-bigint",
  "num-complex",
+ "num_enum",
  "serde",
- "static_assertions",
  "thiserror",
 ]
 
 [[package]]
 name = "rustpython-parser"
-version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
+version = "0.2.0"
+source = "git+https://github.com/RustPython/RustPython.git?rev=acbc517b55406c76da83d7b2711941d8d3f65b87#acbc517b55406c76da83d7b2711941d8d3f65b87"
 dependencies = [
  "ahash",
  "anyhow",
@@ -2496,6 +2550,15 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "toml"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.5.0"

Cargo.toml

@@ -2,11 +2,13 @@
 members = [
   "flake8_to_ruff",
   "ruff_dev",
+  "ruff_cli",
 ]
+default-members = [".", "ruff_cli"]
 
 [package]
 name = "ruff"
-version = "0.0.220"
+version = "0.0.222"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
@@ -22,20 +24,14 @@ crate-type = ["cdylib", "rlib"]
 doctest = false
 
 [dependencies]
-annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { version = "1.0.66" }
-atty = { version = "0.2.14" }
-bincode = { version = "1.3.3" }
 bitflags = { version = "1.3.2" }
-cachedir = { version = "0.3.0" }
 cfg-if = { version = "1.0.0" }
 chrono = { version = "0.4.21", default-features = false, features = ["clock"] }
 clap = { version = "4.0.1", features = ["derive", "env"] }
-clap_complete_command = { version = "0.4.0" }
 colored = { version = "2.0.0" }
 dirs = { version = "4.0.0" }
 fern = { version = "0.6.1" }
-filetime = { version = "0.2.17" }
 glob = { version = "0.3.0" }
 globset = { version = "0.4.9" }
 ignore = { version = "0.4.18" }
@@ -44,36 +40,26 @@ libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a87
 log = { version = "0.4.17" }
 natord = { version = "1.0.9" }
 nohash-hasher = { version = "0.2.0" }
-notify = { version = "5.0.0" }
 num-bigint = { version = "0.4.3" }
 num-traits = "0.2.15"
 once_cell = { version = "1.16.0" }
 path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] }
-quick-junit = { version = "0.3.2" }
 regex = { version = "1.6.0" }
 ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
-ruff_macros = { version = "0.0.220", path = "ruff_macros" }
+ruff_macros = { version = "0.0.222", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
 schemars = { version = "0.8.11" }
 semver = { version = "1.0.16" }
 serde = { version = "1.0.147", features = ["derive"] }
-serde_json = { version = "1.0.87" }
 shellexpand = { version = "3.0.0" }
-similar = { version = "2.2.1" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
 textwrap = { version = "0.16.0" }
 titlecase = { version = "2.2.1" }
 toml_edit = { version = "0.17.1", features = ["easy"] }
-walkdir = { version = "2.3.2" }
-
-[target.'cfg(not(target_family = "wasm"))'.dependencies]
-clearscreen = { version = "2.0.0" }
-rayon = { version = "1.5.3" }
-update-informer = { version = "0.6.0", default-features = false, features = ["pypi"], optional = true }
 
 # https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support
 # For (future) wasm-pack support
@@ -88,17 +74,11 @@ wasm-bindgen = { version = "0.2.83" }
 [dev-dependencies]
 insta = { version = "1.19.1", features = ["yaml"] }
 test-case = { version = "2.2.2" }
-ureq = { version = "2.5.0", features = [] }
 wasm-bindgen-test = { version = "0.3.33" }
 
 [target.'cfg(not(target_family = "wasm"))'.dev-dependencies]
-assert_cmd = { version = "2.0.4" }
 criterion = { version = "0.4.0" }
 
-[features]
-default = ["update-informer"]
-update-informer = ["dep:update-informer"]
-
 [profile.release]
 panic = "abort"
 lto = "thin"

README.md

@@ -51,16 +51,18 @@ Ruff is extremely actively developed and used in major open-source projects like
 - [Apache Airflow](https://github.com/apache/airflow)
 - [Bokeh](https://github.com/bokeh/bokeh)
 - [Zulip](https://github.com/zulip/zulip)
+- [Dagster](https://github.com/dagster-io/dagster)
 - [Pydantic](https://github.com/pydantic/pydantic)
 - [Sphinx](https://github.com/sphinx-doc/sphinx)
 - [Hatch](https://github.com/pypa/hatch)
 - [Jupyter](https://github.com/jupyter-server/jupyter_server)
-- [Synapse](https://github.com/matrix-org/synapse)
+- [Synapse (Matrix)](https://github.com/matrix-org/synapse)
 - [Saleor](https://github.com/saleor/saleor)
 - [Polars](https://github.com/pola-rs/polars)
 - [Ibis](https://github.com/ibis-project/ibis)
 - [OpenBB](https://github.com/OpenBB-finance/OpenBBTerminal)
-- [`pyca/cryptography`](https://github.com/pyca/cryptography)
+- [Cryptography (PyCA)](https://github.com/pyca/cryptography)
+- [SnowCLI (Snowflake)](https://github.com/Snowflake-Labs/snowcli)
 
 Read the [launch blog post](https://notes.crmarsh.com/python-tooling-could-be-much-much-faster).
 
@@ -141,8 +143,6 @@ Ruff is available as [`ruff`](https://pypi.org/project/ruff/) on PyPI:
 pip install ruff
 ```
 
-[![Packaging status](https://repology.org/badge/vertical-allrepos/ruff-python-linter.svg?exclude_unsupported=1)](https://repology.org/project/ruff-python-linter/versions)
-
 For **macOS Homebrew** and **Linuxbrew** users, Ruff is also available as [`ruff`](https://formulae.brew.sh/formula/ruff) on Homebrew:
 
 ```shell
@@ -161,6 +161,8 @@ For **Arch Linux** users, Ruff is also available as [`ruff`](https://archlinux.o
 pacman -S ruff
 ```
 
+[![Packaging status](https://repology.org/badge/vertical-allrepos/ruff-python-linter.svg?exclude_unsupported=1)](https://repology.org/project/ruff-python-linter/versions)
+
 ### Usage
 
 To run Ruff, try any of the following:
@@ -182,7 +184,7 @@ Ruff also works with [pre-commit](https://pre-commit.com):
 ```yaml
 - repo: https://github.com/charliermarsh/ruff-pre-commit
   # Ruff version.
-  rev: 'v0.0.220'
+  rev: 'v0.0.222'
   hooks:
     - id: ruff
       # Respect `exclude` and `extend-exclude` settings.
@@ -383,8 +385,6 @@ Options:
           The minimum Python version that should be supported
       --line-length <LINE_LENGTH>
           Set the line-length for length-associated rules and automatic formatting
-      --max-complexity <MAX_COMPLEXITY>
-          Maximum McCabe complexity allowed for a given function
       --add-noqa
           Enable automatic additions of `noqa` directives to failing lines
       --clean
@@ -581,6 +581,7 @@ For more, see [Pyflakes](https://pypi.org/project/pyflakes/2.5.0/) on PyPI.
 
 For more, see [pycodestyle](https://pypi.org/project/pycodestyle/2.9.1/) on PyPI.
 
+#### Error (E)
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
 | E401 | MultipleImportsOnOneLine | Multiple imports on one line |  |
@@ -598,6 +599,10 @@ For more, see [pycodestyle](https://pypi.org/project/pycodestyle/2.9.1/) on PyPI
 | E743 | AmbiguousFunctionName | Ambiguous function name: `...` |  |
 | E902 | IOError | IOError: `...` |  |
 | E999 | SyntaxError | SyntaxError: `...` |  |
+
+#### Warning (W)
+| Code | Name | Message | Fix |
+| ---- | ---- | ------- | --- |
 | W292 | NoNewLineAtEndOfFile | No newline at end of file | 🛠 |
 | W505 | DocLineTooLong | Doc line too long (89 > 88 characters) |  |
 | W605 | InvalidEscapeSequence | Invalid escape sequence: '\c' | 🛠 |
@@ -979,7 +984,6 @@ For more, see [flake8-simplify](https://pypi.org/project/flake8-simplify/0.19.3/
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
-| SIM115 | OpenFileWithContextHandler | Use context handler for opening files |  |
 | SIM101 | DuplicateIsinstanceCall | Multiple `isinstance` calls for `...`, merge into a single call | 🛠 |
 | SIM102 | NestedIfStatements | Use a single `if` statement instead of nested `if` statements |  |
 | SIM103 | ReturnBoolConditionDirectly | Return the condition `...` directly | 🛠 |
@@ -990,6 +994,7 @@ For more, see [flake8-simplify](https://pypi.org/project/flake8-simplify/0.19.3/
 | SIM110 | ConvertLoopToAny | Use `return any(x for x in y)` instead of `for` loop | 🛠 |
 | SIM111 | ConvertLoopToAll | Use `return all(x for x in y)` instead of `for` loop | 🛠 |
 | SIM112 | UseCapitalEnvironmentVariables | Use capitalized environment variable `...` instead of `...` | 🛠 |
+| SIM115 | OpenFileWithContextHandler | Use context handler for opening files |  |
 | SIM117 | MultipleWithStatements | Use a single `with` statement with multiple contexts instead of nested `with` statements |  |
 | SIM118 | KeyInDict | Use `key in dict` instead of `key in dict.keys()` | 🛠 |
 | SIM201 | NegateEqualOp | Use `left != right` instead of `not left == right` | 🛠 |
@@ -1084,18 +1089,33 @@ For more, see [pygrep-hooks](https://github.com/pre-commit/pygrep-hooks) on GitH
 
 For more, see [Pylint](https://pypi.org/project/pylint/2.15.7/) on PyPI.
 
+#### Convention (PLC)
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
 | PLC0414 | UselessImportAlias | Import alias does not rename original package | 🛠 |
 | PLC2201 | MisplacedComparisonConstant | Comparison should be ... | 🛠 |
 | PLC3002 | UnnecessaryDirectLambdaCall | Lambda expression called directly. Execute the expression inline instead. |  |
+
+#### Error (PLE)
+| Code | Name | Message | Fix |
+| ---- | ---- | ------- | --- |
 | PLE0117 | NonlocalWithoutBinding | Nonlocal name `...` found without binding |  |
 | PLE0118 | UsedPriorGlobalDeclaration | Name `...` is used prior to global declaration on line 1 |  |
 | PLE1142 | AwaitOutsideAsync | `await` should be used within an async function |  |
+
+#### Refactor (PLR)
+| Code | Name | Message | Fix |
+| ---- | ---- | ------- | --- |
+| PLR0133 | ConstantComparison | Two constants compared in a comparison, consider replacing `0 == 0` |  |
 | PLR0206 | PropertyWithParameters | Cannot have defined parameters for properties |  |
 | PLR0402 | ConsiderUsingFromImport | Use `from ... import ...` in lieu of alias |  |
 | PLR1701 | ConsiderMergingIsinstance | Merge these isinstance calls: `isinstance(..., (...))` |  |
 | PLR1722 | UseSysExit | Use `sys.exit()` instead of `exit` | 🛠 |
+| PLR2004 | MagicValueComparison | Magic number used in comparison, consider replacing magic with a constant variable |  |
+
+#### Warning (PLW)
+| Code | Name | Message | Fix |
+| ---- | ---- | ------- | --- |
 | PLW0120 | UselessElseOnLoop | Else clause on loop without a break statement, remove the else and de-indent all the code inside it |  |
 | PLW0602 | GlobalVariableNotAssigned | Using global for `...` but no assignment is done |  |
 
@@ -1254,6 +1274,18 @@ officially supported LSP server for Ruff.
 However, Ruff is also available as part of the [coc-pyright](https://github.com/fannheyward/coc-pyright)
 extension for `coc.nvim`.
 
+<details>
+<summary>With the <a href="https://github.com/dense-analysis/ale">ALE</a> plugin for (Neo)Vim.</summary>
+
+```vim
+let g:ale_linters = { "python": ["ruff"] }
+let g:ale_fixers = {
+\       "python": ["black", "ruff"],
+\}
+```
+
+</details>
+
 <details>
 <summary>Ruff can also be integrated via <a href="https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#efm"><code>efm</code></a> in just a <a href="https://github.com/JafarAbdi/myconfigs/blob/6f0b6b2450e92ec8fc50422928cd22005b919110/efm-langserver/config.yaml#L14-L20">few lines</a>.</summary>
 <br>
@@ -1418,7 +1450,7 @@ Beyond the rule set, Ruff suffers from the following limitations vis-à-vis Flak
 
 There are a few other minor incompatibilities between Ruff and the originating Flake8 plugins:
 
-- Ruff doesn't implement the "opinionated" lint rules from `flake8-bugbear`.
+- Ruff doesn't implement all the "opinionated" lint rules from `flake8-bugbear`.
 - Depending on your project structure, Ruff and `isort` can differ in their detection of first-party
   code. (This is often solved by modifying the `src` property, e.g., to `src = ["src"]`, if your
   code is nested in a `src` directory.)
@@ -1908,6 +1940,12 @@ extend-exclude = ["tests", "src/bad.py"]
 A list of rule codes or prefixes to ignore, in addition to those
 specified by `ignore`.
 
+Note that `extend-ignore` is applied after resolving rules from
+`ignore`/`select` and a less specific rule in `extend-ignore`
+would overwrite a more specific rule in `select`. It is
+recommended to only use `extend-ignore` when extending a
+`pyproject.toml` file via `extend`.
+
 **Default value**: `[]`
 
 **Type**: `Vec<RuleCodePrefix>`
@@ -1927,6 +1965,12 @@ extend-ignore = ["F841"]
 A list of rule codes or prefixes to enable, in addition to those
 specified by `select`.
 
+Note that `extend-select` is applied after resolving rules from
+`ignore`/`select` and a less specific rule in `extend-select`
+would overwrite a more specific rule in `ignore`. It is
+recommended to only use `extend-select` when extending a
+`pyproject.toml` file via `extend`.
+
 **Default value**: `[]`
 
 **Type**: `Vec<RuleCodePrefix>`
@@ -2128,6 +2172,25 @@ line-length = 120
 
 ---
 
+#### [`namespace-packages`](#namespace-packages)
+
+Mark the specified directories as namespace packages. For the purpose of
+module resolution, Ruff will treat those directories as if they
+contained an `__init__.py` file.
+
+**Default value**: `[]`
+
+**Type**: `Vec<PathBuf>`
+
+**Example usage**:
+
+```toml
+[tool.ruff]
+namespace-packages = ["airflow/providers"]
+```
+
+---
+
 #### [`per-file-ignores`](#per-file-ignores)
 
 A list of mappings from file pattern to rule codes or prefixes to
@@ -2864,6 +2927,24 @@ ignore-variadic-names = true
 
 ### `isort`
 
+#### [`classes`](#classes)
+
+An override list of tokens to always recognize as a Class for
+`order-by-type` regardless of casing.
+
+**Default value**: `[]`
+
+**Type**: `Vec<String>`
+
+**Example usage**:
+
+```toml
+[tool.ruff.isort]
+classes = ["SVC"]
+```
+
+---
+
 #### [`combine-as-imports`](#combine-as-imports)
 
 Combines as imports on the same line. See isort's [`combine-as-imports`](https://pycqa.github.io/isort/docs/configuration/options.html#combine-as-imports)

flake8_to_ruff/Cargo.lock

@@ -771,7 +771,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8_to_ruff"
-version = "0.0.220"
+version = "0.0.222"
 dependencies = [
  "anyhow",
  "clap",
@@ -1975,7 +1975,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.220"
+version = "0.0.222"
 dependencies = [
  "anyhow",
  "bincode",

flake8_to_ruff/Cargo.toml

@@ -1,12 +1,8 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.220-dev.0"
+version = "0.0.222-dev.0"
 edition = "2021"
 
-[lib]
-name = "flake8_to_ruff"
-doctest = false
-
 [dependencies]
 anyhow = { version = "1.0.66" }
 clap = { version = "4.0.1", features = ["derive"] }

flake8_to_ruff/src/lib.rs

@@ -1,18 +0,0 @@
-#![allow(
-    clippy::collapsible_else_if,
-    clippy::collapsible_if,
-    clippy::implicit_hasher,
-    clippy::match_same_arms,
-    clippy::missing_errors_doc,
-    clippy::missing_panics_doc,
-    clippy::module_name_repetitions,
-    clippy::must_use_candidate,
-    clippy::similar_names,
-    clippy::too_many_lines
-)]
-#![forbid(unsafe_code)]
-
-pub mod black;
-pub mod converter;
-mod parser;
-pub mod plugin;

flake8_to_ruff/src/main.rs

@@ -1,4 +1,4 @@
-//! Utility to generate Ruff's pyproject.toml section from a Flake8 INI file.
+//! Utility to generate Ruff's `pyproject.toml` section from a Flake8 INI file.
 #![allow(
     clippy::collapsible_else_if,
     clippy::collapsible_if,
@@ -18,9 +18,7 @@ use std::path::PathBuf;
 use anyhow::Result;
 use clap::Parser;
 use configparser::ini::Ini;
-use flake8_to_ruff::black::parse_black_options;
-use flake8_to_ruff::converter;
-use flake8_to_ruff::plugin::Plugin;
+use ruff::flake8_to_ruff;
 
 #[derive(Parser)]
 #[command(
@@ -38,7 +36,7 @@ struct Cli {
     pyproject: Option<PathBuf>,
     /// List of plugins to enable.
     #[arg(long, value_delimiter = ',')]
-    plugin: Option<Vec<Plugin>>,
+    plugin: Option<Vec<flake8_to_ruff::Plugin>>,
 }
 
 fn main() -> Result<()> {
@@ -52,12 +50,12 @@ fn main() -> Result<()> {
     // Read the pyproject.toml file.
     let black = cli
         .pyproject
-        .map(parse_black_options)
+        .map(flake8_to_ruff::parse_black_options)
         .transpose()?
         .flatten();
 
     // Create Ruff's pyproject.toml section.
-    let pyproject = converter::convert(&config, black.as_ref(), cli.plugin)?;
+    let pyproject = flake8_to_ruff::convert(&config, black.as_ref(), cli.plugin)?;
     println!("{}", toml_edit::easy::to_string_pretty(&pyproject)?);
 
     Ok(())

pyproject.toml

@@ -1,10 +1,13 @@
 [build-system]
-requires = ["maturin>=0.14,<0.15"]
+requires = ["maturin>=0.14.10,<0.15"]
+# We depend on >=0.14.10 because we specify name in
+# [package.metadata.maturin] in ruff_cli/Cargo.toml.
+
 build-backend = "maturin"
 
 [project]
 name = "ruff"
-version = "0.0.220"
+version = "0.0.222"
 description = "An extremely fast Python linter, written in Rust."
 authors = [
   { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
@@ -35,6 +38,7 @@ urls = { repository = "https://github.com/charliermarsh/ruff" }
 
 [tool.maturin]
 bindings = "bin"
+manifest-path = "ruff_cli/Cargo.toml"
 python-source = "python"
 strip = true
 

resources/test/fixtures/flake8_annotations/allow_nested_overload.py

@@ -0,0 +1,9 @@
+class C:
+    from typing import overload
+
+    @overload
+    def f(self, x: int, y: int) -> None:
+        ...
+
+    def f(self, x, y):
+        pass

resources/test/fixtures/flake8_bugbear/B024.py

@@ -1,15 +1,16 @@
 """
 Should emit:
-B024 - on lines 17, 34, 52, 58, 69, 74, 79, 84, 89
+B024 - on lines 18, 71, 82, 87, 92, 141
 """
 
 import abc
 import abc as notabc
 from abc import ABC, ABCMeta
-from abc import abstractmethod
+from abc import abstractmethod, abstractproperty
 from abc import abstractmethod as abstract
 from abc import abstractmethod as abstractaoeuaoeuaoeu
 from abc import abstractmethod as notabstract
+from abc import abstractproperty as notabstract_property
 
 import foo
 
@@ -49,12 +50,24 @@ class Base_6(ABC):
         foo()
 
 
-class Base_7(ABC):  # error
+class Base_7(ABC):
     @notabstract
     def method(self):
         foo()
 
 
+class Base_8(ABC):
+    @notabstract_property
+    def method(self):
+        foo()
+
+
+class Base_9(ABC):
+    @abstractproperty
+    def method(self):
+        foo()
+
+
 class MetaBase_1(metaclass=ABCMeta):  # error
     def method(self):
         foo()

resources/test/fixtures/flake8_bugbear/B027.py

@@ -1,11 +1,12 @@
 """
 Should emit:
-B027 - on lines 12, 15, 18, 22, 30
+B027 - on lines 13, 16, 19, 23
 """
 import abc
 from abc import ABC
-from abc import abstractmethod
+from abc import abstractmethod, abstractproperty
 from abc import abstractmethod as notabstract
+from abc import abstractproperty as notabstract_property
 
 
 class AbstractClass(ABC):
@@ -42,6 +43,18 @@ class AbstractClass(ABC):
     def abstract_3(self):
         ...
 
+    @abc.abstractproperty
+    def abstract_4(self):
+        ...
+
+    @abstractproperty
+    def abstract_5(self):
+        ...
+
+    @notabstract_property
+    def abstract_6(self):
+        ...
+
     def body_1(self):
         print("foo")
         ...

resources/test/fixtures/flake8_comprehensions/C405.py

@@ -1,5 +1,18 @@
-s1 = set([1, 2])
-s2 = set((1, 2))
-s3 = set([])
-s4 = set(())
-s5 = set()
+set([1, 2])
+set((1, 2))
+set([])
+set(())
+set()
+set((1,))
+set((
+    1,
+))
+set([
+    1,
+])
+set(
+    (1,)
+)
+set(
+    [1,]
+)

resources/test/fixtures/flake8_simplify/SIM117.py

@@ -2,6 +2,11 @@ with A() as a:  # SIM117
     with B() as b:
         print("hello")
 
+with A():  # SIM117
+    with B():
+        with C():
+            print("hello")
+
 with A() as a:
     a()
     with B() as b:

resources/test/fixtures/isort/order_by_type_with_custom_classes.py

@@ -0,0 +1,4 @@
+from sklearn.svm import func, SVC, CONST, Klass
+from subprocess import N_CLASS, PIPE, Popen, STDOUT
+from module import CLASS, Class, CONSTANT, function, BASIC, Apple
+from torch.nn import SELU, AClass, A_CONSTANT

resources/test/fixtures/pyflakes/F401_6.py

@@ -9,7 +9,6 @@ from .background import BackgroundTasks
 # F401 `datastructures.UploadFile` imported but unused
 from .datastructures import UploadFile as FileUpload
 
-
 # OK
 import applications as applications
 

resources/test/fixtures/pygrep-hooks/PGH002_0.py

@@ -5,4 +5,3 @@ from warnings import warn
 warnings.warn("this is ok")
 warn("by itself is also ok")
 logging.warning("this is fine")
-log.warning("this is ok")

resources/test/fixtures/pygrep-hooks/PGH002_1.py

@@ -2,14 +2,4 @@ import logging
 from logging import warn
 
 logging.warn("this is not ok")
-log.warn("this is also not ok")
 warn("not ok")
-
-
-def foo():
-    from logging import warn
-
-    def warn():
-        pass
-
-    warn("has been redefined, but we will still report it")

resources/test/fixtures/pylint/constant_comparison.py

@@ -0,0 +1,59 @@
+"""Check that magic values are not used in comparisons"""
+
+if 100 == 100: # [comparison-of-constants]
+    pass
+
+if 1 == 3: # [comparison-of-constants]
+    pass
+
+if 1 != 3: # [comparison-of-constants]
+    pass
+
+x = 0
+if 4 == 3 == x: # [comparison-of-constants]
+    pass
+
+if x == 0: # correct
+    pass
+
+y = 1
+if x == y: # correct
+    pass
+
+if 1 > 0: # [comparison-of-constants]
+    pass
+
+if x > 0: # correct
+    pass
+
+if 1 >= 0: # [comparison-of-constants]
+    pass
+
+if x >= 0: # correct
+    pass
+
+if 1 < 0: # [comparison-of-constants]
+    pass
+
+if x < 0: # correct
+    pass
+
+if 1 <= 0: # [comparison-of-constants]
+    pass
+
+if x <= 0: # correct
+    pass
+
+word = "hello"
+if word == "": # correct
+    pass
+
+if "hello" == "": # [comparison-of-constants]
+    pass
+
+truthy = True
+if truthy == True: # correct
+    pass
+
+if True == False: # [comparison-of-constants]
+    pass

resources/test/fixtures/pylint/magic_value_comparison.py

@@ -0,0 +1,71 @@
+"""Check that magic values are not used in comparisons"""
+import cmath
+
+user_input = 10
+
+if 10 > user_input: # [magic-value-comparison]
+    pass
+
+if 10 == 100: # [comparison-of-constants] R0133
+    pass
+
+if 1 == 3: # [comparison-of-constants] R0133
+    pass
+
+x = 0
+if 4 == 3 == x: # [comparison-of-constants] R0133
+    pass
+
+time_delta = 7224
+ONE_HOUR = 3600
+
+if time_delta > ONE_HOUR: # correct
+    pass
+
+argc = 1
+
+if argc != -1: # correct
+    pass
+
+if argc != 0: # correct
+    pass
+
+if argc != 1: # correct
+    pass
+
+if argc != 2: # [magic-value-comparison]
+    pass
+
+if __name__ == "__main__": # correct
+    pass
+
+ADMIN_PASSWORD = "SUPERSECRET"
+input_password = "password"
+
+if input_password == "": # correct
+    pass
+
+if input_password == ADMIN_PASSWORD: # correct
+    pass
+
+if input_password == "Hunter2": # [magic-value-comparison]
+    pass
+
+PI = 3.141592653589793238
+pi_estimation = 3.14
+
+if pi_estimation == 3.141592653589793238: # [magic-value-comparison]
+    pass
+
+if pi_estimation == PI: # correct
+    pass
+
+HELLO_WORLD = b"Hello, World!"
+user_input = b"Hello, There!"
+
+if user_input == b"something": # [magic-value-comparison]
+    pass
+
+if user_input == HELLO_WORLD: # correct
+    pass
+

ruff.schema.json

@@ -67,7 +67,7 @@
       }
     },
     "extend-ignore": {
-      "description": "A list of rule codes or prefixes to ignore, in addition to those specified by `ignore`.",
+      "description": "A list of rule codes or prefixes to ignore, in addition to those specified by `ignore`.\n\nNote that `extend-ignore` is applied after resolving rules from `ignore`/`select` and a less specific rule in `extend-ignore` would overwrite a more specific rule in `select`. It is recommended to only use `extend-ignore` when extending a `pyproject.toml` file via `extend`.",
       "type": [
         "array",
         "null"
@@ -77,7 +77,7 @@
       }
     },
     "extend-select": {
-      "description": "A list of rule codes or prefixes to enable, in addition to those specified by `select`.",
+      "description": "A list of rule codes or prefixes to enable, in addition to those specified by `select`.\n\nNote that `extend-select` is applied after resolving rules from `ignore`/`select` and a less specific rule in `extend-select` would overwrite a more specific rule in `ignore`. It is recommended to only use `extend-select` when extending a `pyproject.toml` file via `extend`.",
       "type": [
         "array",
         "null"
@@ -285,6 +285,16 @@
         }
       ]
     },
+    "namespace-packages": {
+      "description": "Mark the specified directories as namespace packages. For the purpose of module resolution, Ruff will treat those directories as if they contained an `__init__.py` file.",
+      "type": [
+        "array",
+        "null"
+      ],
+      "items": {
+        "type": "string"
+      }
+    },
     "pep8-naming": {
       "description": "Options for the `pep8-naming` plugin.",
       "anyOf": [
@@ -755,6 +765,16 @@
     "IsortOptions": {
       "type": "object",
       "properties": {
+        "classes": {
+          "description": "An override list of tokens to always recognize as a Class for `order-by-type` regardless of casing.",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "type": "string"
+          }
+        },
         "combine-as-imports": {
           "description": "Combines as imports on the same line. See isort's [`combine-as-imports`](https://pycqa.github.io/isort/docs/configuration/options.html#combine-as-imports) option.",
           "type": [
@@ -1433,6 +1453,9 @@
         "PLE1142",
         "PLR",
         "PLR0",
+        "PLR01",
+        "PLR013",
+        "PLR0133",
         "PLR02",
         "PLR020",
         "PLR0206",
@@ -1445,6 +1468,10 @@
         "PLR1701",
         "PLR172",
         "PLR1722",
+        "PLR2",
+        "PLR20",
+        "PLR200",
+        "PLR2004",
         "PLW",
         "PLW0",
         "PLW01",

ruff_cli/Cargo.toml

@@ -0,0 +1,68 @@
+[package]
+name = "ruff_cli"
+version = "0.0.222"
+authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
+edition = "2021"
+rust-version = "1.65.0"
+documentation = "https://github.com/charliermarsh/ruff"
+homepage = "https://github.com/charliermarsh/ruff"
+repository = "https://github.com/charliermarsh/ruff"
+readme = "../README.md"
+license = "MIT"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[[bin]]
+name = "ruff"
+path = "src/main.rs"
+doctest = false
+
+# Since the name of the binary is the same as the name of the `ruff` crate
+# running `cargo doc --no-deps --all` results in an `output filename collision`
+# See also https://github.com/rust-lang/cargo/issues/6313.
+# We therefore disable the documentation generation for the binary.
+doc = false
+
+[dependencies]
+ruff = { path = ".." }
+
+annotate-snippets = { version = "0.9.1", features = ["color"] }
+anyhow = { version = "1.0.66" }
+atty = { version = "0.2.14" }
+bincode = { version = "1.3.3" }
+cachedir = { version = "0.3.0" }
+chrono = { version = "0.4.21", default-features = false, features = ["clock"] }
+clap = { version = "4.0.1", features = ["derive", "env"] }
+clap_complete_command = { version = "0.4.0" }
+clearscreen = { version = "2.0.0" }
+colored = { version = "2.0.0" }
+filetime = { version = "0.2.17" }
+glob = { version = "0.3.0" }
+ignore = { version = "0.4.18" }
+itertools = { version = "0.10.5" }
+log = { version = "0.4.17" }
+notify = { version = "5.0.0" }
+path-absolutize = { version = "3.0.14", features = ["once_cell_cache"] }
+quick-junit = { version = "0.3.2" }
+rayon = { version = "1.5.3" }
+regex = { version = "1.6.0" }
+rustc-hash = { version = "1.1.0" }
+serde = { version = "1.0.147", features = ["derive"] }
+serde_json = { version = "1.0.87" }
+similar = { version = "2.2.1" }
+textwrap = { version = "0.16.0" }
+update-informer = { version = "0.6.0", default-features = false, features = ["pypi"], optional = true }
+walkdir = { version = "2.3.2" }
+
+[dev-dependencies]
+assert_cmd = { version = "2.0.4" }
+strum = { version = "0.24.1" }
+ureq = { version = "2.5.0", features = [] }
+
+[features]
+default = ["update-informer"]
+update-informer = ["dep:update-informer"]
+
+[package.metadata.maturin]
+name = "ruff"
+# Setting the name here is necessary for maturin to include the package in its builds.

ruff_cli/src/cache.rs

@@ -0,0 +1,124 @@
+use std::collections::hash_map::DefaultHasher;
+use std::fs;
+use std::hash::{Hash, Hasher};
+use std::io::Write;
+use std::path::Path;
+
+use anyhow::Result;
+use filetime::FileTime;
+use log::error;
+use path_absolutize::Absolutize;
+use ruff::message::Message;
+use ruff::settings::{flags, Settings};
+use serde::{Deserialize, Serialize};
+
+const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
+
+#[derive(Serialize, Deserialize)]
+struct CacheMetadata {
+    mtime: i64,
+}
+
+#[derive(Serialize)]
+struct CheckResultRef<'a> {
+    metadata: &'a CacheMetadata,
+    messages: &'a [Message],
+}
+
+#[derive(Deserialize)]
+struct CheckResult {
+    metadata: CacheMetadata,
+    messages: Vec<Message>,
+}
+
+fn content_dir() -> &'static Path {
+    Path::new("content")
+}
+
+fn cache_key<P: AsRef<Path>>(path: P, settings: &Settings, autofix: flags::Autofix) -> u64 {
+    let mut hasher = DefaultHasher::new();
+    CARGO_PKG_VERSION.hash(&mut hasher);
+    path.as_ref().absolutize().unwrap().hash(&mut hasher);
+    settings.hash(&mut hasher);
+    autofix.hash(&mut hasher);
+    hasher.finish()
+}
+
+#[allow(dead_code)]
+/// Initialize the cache at the specified `Path`.
+pub fn init(path: &Path) -> Result<()> {
+    // Create the cache directories.
+    fs::create_dir_all(path.join(content_dir()))?;
+
+    // Add the CACHEDIR.TAG.
+    if !cachedir::is_tagged(path)? {
+        cachedir::add_tag(path)?;
+    }
+
+    // Add the .gitignore.
+    let gitignore_path = path.join(".gitignore");
+    if !gitignore_path.exists() {
+        let mut file = fs::File::create(gitignore_path)?;
+        file.write_all(b"*")?;
+    }
+
+    Ok(())
+}
+
+fn write_sync(cache_dir: &Path, key: u64, value: &[u8]) -> Result<(), std::io::Error> {
+    fs::write(
+        cache_dir.join(content_dir()).join(format!("{key:x}")),
+        value,
+    )
+}
+
+fn read_sync(cache_dir: &Path, key: u64) -> Result<Vec<u8>, std::io::Error> {
+    fs::read(cache_dir.join(content_dir()).join(format!("{key:x}")))
+}
+
+/// Get a value from the cache.
+pub fn get<P: AsRef<Path>>(
+    path: P,
+    metadata: &fs::Metadata,
+    settings: &Settings,
+    autofix: flags::Autofix,
+) -> Option<Vec<Message>> {
+    let encoded = read_sync(&settings.cache_dir, cache_key(path, settings, autofix)).ok()?;
+    let (mtime, messages) = match bincode::deserialize::<CheckResult>(&encoded[..]) {
+        Ok(CheckResult {
+            metadata: CacheMetadata { mtime },
+            messages,
+        }) => (mtime, messages),
+        Err(e) => {
+            error!("Failed to deserialize encoded cache entry: {e:?}");
+            return None;
+        }
+    };
+    if FileTime::from_last_modification_time(metadata).unix_seconds() != mtime {
+        return None;
+    }
+    Some(messages)
+}
+
+/// Set a value in the cache.
+pub fn set<P: AsRef<Path>>(
+    path: P,
+    metadata: &fs::Metadata,
+    settings: &Settings,
+    autofix: flags::Autofix,
+    messages: &[Message],
+) {
+    let check_result = CheckResultRef {
+        metadata: &CacheMetadata {
+            mtime: FileTime::from_last_modification_time(metadata).unix_seconds(),
+        },
+        messages,
+    };
+    if let Err(e) = write_sync(
+        &settings.cache_dir,
+        cache_key(path, settings, autofix),
+        &bincode::serialize(&check_result).unwrap(),
+    ) {
+        error!("Failed to write to cache: {e:?}");
+    }
+}

ruff_cli/src/cli.rs

@@ -2,18 +2,21 @@ use std::path::{Path, PathBuf};
 
 use clap::{command, Parser};
 use regex::Regex;
-use rustc_hash::FxHashMap;
-
-use crate::logging::LogLevel;
-use crate::registry::{RuleCode, RuleCodePrefix};
-use crate::resolver::ConfigProcessor;
-use crate::settings::types::{
+use ruff::fs;
+use ruff::logging::LogLevel;
+use ruff::registry::{RuleCode, RuleCodePrefix};
+use ruff::resolver::ConfigProcessor;
+use ruff::settings::types::{
     FilePattern, PatternPrefixPair, PerFileIgnore, PythonVersion, SerializationFormat,
 };
-use crate::{fs, mccabe};
+use rustc_hash::FxHashMap;
 
 #[derive(Debug, Parser)]
-#[command(author, about = "Ruff: An extremely fast Python linter.")]
+#[command(
+    author,
+    name = "ruff",
+    about = "Ruff: An extremely fast Python linter."
+)]
 #[command(version)]
 #[allow(clippy::struct_excessive_bools)]
 pub struct Cli {
@@ -134,9 +137,6 @@ pub struct Cli {
     /// formatting.
     #[arg(long)]
     pub line_length: Option<usize>,
-    /// Maximum McCabe complexity allowed for a given function.
-    #[arg(long)]
-    pub max_complexity: Option<usize>,
     /// Enable automatic additions of `noqa` directives to failing lines.
     #[arg(
         long,
@@ -263,7 +263,6 @@ impl Cli {
                 fixable: self.fixable,
                 ignore: self.ignore,
                 line_length: self.line_length,
-                max_complexity: self.max_complexity,
                 per_file_ignores: self.per_file_ignores,
                 respect_gitignore: resolve_bool_arg(
                     self.respect_gitignore,
@@ -329,7 +328,6 @@ pub struct Overrides {
     pub fixable: Option<Vec<RuleCodePrefix>>,
     pub ignore: Option<Vec<RuleCodePrefix>>,
     pub line_length: Option<usize>,
-    pub max_complexity: Option<usize>,
     pub per_file_ignores: Option<Vec<PatternPrefixPair>>,
     pub respect_gitignore: Option<bool>,
     pub select: Option<Vec<RuleCodePrefix>>,
@@ -346,7 +344,7 @@ pub struct Overrides {
 }
 
 impl ConfigProcessor for &Overrides {
-    fn process_config(&self, config: &mut crate::settings::configuration::Configuration) {
+    fn process_config(&self, config: &mut ruff::settings::configuration::Configuration) {
         if let Some(cache_dir) = &self.cache_dir {
             config.cache_dir = Some(cache_dir.clone());
         }
@@ -380,11 +378,6 @@ impl ConfigProcessor for &Overrides {
         if let Some(line_length) = &self.line_length {
             config.line_length = Some(*line_length);
         }
-        if let Some(max_complexity) = &self.max_complexity {
-            config.mccabe = Some(mccabe::settings::Options {
-                max_complexity: Some(*max_complexity),
-            });
-        }
         if let Some(per_file_ignores) = &self.per_file_ignores {
             config.per_file_ignores = Some(collect_per_file_ignores(per_file_ignores.clone()));
         }

ruff_cli/src/commands.rs

@@ -11,22 +11,22 @@ use log::{debug, error};
 use path_absolutize::path_dedot;
 #[cfg(not(target_family = "wasm"))]
 use rayon::prelude::*;
-use rustpython_ast::Location;
+use ruff::cache::CACHE_DIR_NAME;
+use ruff::linter::add_noqa_to_path;
+use ruff::logging::LogLevel;
+use ruff::message::{Location, Message};
+use ruff::registry::RuleCode;
+use ruff::resolver::{FileDiscovery, PyprojectDiscovery};
+use ruff::settings::flags;
+use ruff::settings::types::SerializationFormat;
+use ruff::{fix, fs, packaging, resolver, warn_user_once, IOError};
 use serde::Serialize;
 use walkdir::WalkDir;
 
-use crate::cache::CACHE_DIR_NAME;
+use crate::cache;
 use crate::cli::Overrides;
 use crate::diagnostics::{lint_path, lint_stdin, Diagnostics};
 use crate::iterators::par_iter;
-use crate::linter::add_noqa_to_path;
-use crate::logging::LogLevel;
-use crate::message::Message;
-use crate::registry::RuleCode;
-use crate::resolver::{FileDiscovery, PyprojectDiscovery};
-use crate::settings::flags;
-use crate::settings::types::SerializationFormat;
-use crate::{cache, fix, fs, packaging, resolver, violations, warn_user_once};
 
 /// Run the linter over a collection of files.
 pub fn run(
@@ -83,6 +83,8 @@ pub fn run(
             .flatten()
             .map(ignore::DirEntry::path)
             .collect::<Vec<_>>(),
+        &resolver,
+        pyproject_strategy,
     );
 
     let start = Instant::now();
@@ -114,7 +116,7 @@ pub fn run(
                     let settings = resolver.resolve(path, pyproject_strategy);
                     if settings.enabled.contains(&RuleCode::E902) {
                         Diagnostics::new(vec![Message {
-                            kind: violations::IOError(message).into(),
+                            kind: IOError(message).into(),
                             location: Location::default(),
                             end_location: Location::default(),
                             fix: None,
@@ -169,7 +171,7 @@ pub fn run_stdin(
     };
     let package_root = filename
         .and_then(Path::parent)
-        .and_then(packaging::detect_package_root);
+        .and_then(|path| packaging::detect_package_root(path, &settings.namespace_packages));
     let stdin = read_from_stdin()?;
     let mut diagnostics = lint_stdin(filename, package_root, &stdin, settings, autofix)?;
     diagnostics.messages.sort_unstable();
@@ -288,7 +290,7 @@ struct Explanation<'a> {
 }
 
 /// Explain a `RuleCode` to the user.
-pub fn explain(code: &RuleCode, format: &SerializationFormat) -> Result<()> {
+pub fn explain(code: &RuleCode, format: SerializationFormat) -> Result<()> {
     match format {
         SerializationFormat::Text | SerializationFormat::Grouped => {
             println!(

ruff_cli/src/diagnostics.rs

@@ -7,12 +7,13 @@ use std::path::Path;
 
 use anyhow::Result;
 use log::debug;
+use ruff::linter::{lint_fix, lint_only};
+use ruff::message::Message;
+use ruff::settings::{flags, Settings};
+use ruff::{fix, fs};
 use similar::TextDiff;
 
-use crate::linter::{lint_fix, lint_only};
-use crate::message::Message;
-use crate::settings::{flags, Settings};
-use crate::{cache, fix, fs};
+use crate::cache;
 
 #[derive(Debug, Default)]
 pub struct Diagnostics {

ruff_cli/src/lib.rs

@@ -0,0 +1,14 @@
+//! This library only exists to enable the Ruff internal tooling (`ruff_dev`)
+//! to automatically update the `ruff --help` output in the `README.md`.
+//!
+//! For the actual Ruff library, see [`ruff`].
+#![allow(clippy::must_use_candidate, dead_code)]
+
+mod cli;
+
+use clap::CommandFactory;
+
+/// Returns the output of `ruff --help`.
+pub fn help() -> String {
+    cli::Cli::command().render_help().to_string()
+}

ruff_cli/src/main.rs

@@ -1,25 +1,40 @@
+#![allow(
+    clippy::match_same_arms,
+    clippy::missing_errors_doc,
+    clippy::module_name_repetitions,
+    clippy::too_many_lines
+)]
+#![forbid(unsafe_code)]
+
 use std::io::{self};
 use std::path::{Path, PathBuf};
 use std::process::ExitCode;
 use std::sync::mpsc::channel;
 
-use ::ruff::cli::{extract_log_level, Cli, Overrides};
 use ::ruff::logging::{set_up_logging, LogLevel};
-use ::ruff::printer::{Printer, Violations};
 use ::ruff::resolver::{
     resolve_settings_with_processor, ConfigProcessor, FileDiscovery, PyprojectDiscovery, Relativity,
 };
 use ::ruff::settings::configuration::Configuration;
 use ::ruff::settings::types::SerializationFormat;
 use ::ruff::settings::{pyproject, Settings};
-#[cfg(feature = "update-informer")]
-use ::ruff::updates;
-use ::ruff::{commands, fix, warn_user_once};
+use ::ruff::{fix, fs, warn_user_once};
 use anyhow::Result;
 use clap::{CommandFactory, Parser};
+use cli::{extract_log_level, Cli, Overrides};
 use colored::Colorize;
 use notify::{recommended_watcher, RecursiveMode, Watcher};
 use path_absolutize::path_dedot;
+use printer::{Printer, Violations};
+
+mod cache;
+mod cli;
+mod commands;
+mod diagnostics;
+mod iterators;
+mod printer;
+#[cfg(all(feature = "update-informer"))]
+pub mod updates;
 
 /// Resolve the relevant settings strategy and defaults for the current
 /// invocation.
@@ -72,7 +87,7 @@ fn resolve(
     }
 }
 
-pub(crate) fn inner_main() -> Result<ExitCode> {
+pub fn main() -> Result<ExitCode> {
     // Extract command-line arguments.
     let (cli, overrides) = Cli::parse().partition();
     let log_level = extract_log_level(&cli);
@@ -130,7 +145,7 @@ pub(crate) fn inner_main() -> Result<ExitCode> {
     };
 
     if let Some(code) = cli.explain {
-        commands::explain(&code, &format)?;
+        commands::explain(&code, format)?;
         return Ok(ExitCode::SUCCESS);
     }
     if cli.show_settings {
@@ -196,7 +211,7 @@ pub(crate) fn inner_main() -> Result<ExitCode> {
             cache.into(),
             fix::FixMode::None,
         )?;
-        printer.write_continuously(&messages)?;
+        printer.write_continuously(&messages);
 
         // Configure the file watcher.
         let (tx, rx) = channel();
@@ -226,7 +241,7 @@ pub(crate) fn inner_main() -> Result<ExitCode> {
                             cache.into(),
                             fix::FixMode::None,
                         )?;
-                        printer.write_continuously(&messages)?;
+                        printer.write_continuously(&messages);
                     }
                 }
                 Err(err) => return Err(err.into()),
@@ -244,7 +259,7 @@ pub(crate) fn inner_main() -> Result<ExitCode> {
         // Generate lint violations.
         let diagnostics = if is_stdin {
             commands::run_stdin(
-                cli.stdin_filename.as_deref(),
+                cli.stdin_filename.map(fs::normalize_path).as_deref(),
                 &pyproject_strategy,
                 &file_strategy,
                 &overrides,

ruff_cli/src/printer.rs

@@ -6,17 +6,16 @@ use annotate_snippets::snippet::{Annotation, AnnotationType, Slice, Snippet, Sou
 use anyhow::Result;
 use colored::Colorize;
 use itertools::iterate;
-use rustpython_parser::ast::Location;
+use ruff::fs::relativize_path;
+use ruff::logging::LogLevel;
+use ruff::message::{Location, Message};
+use ruff::registry::RuleCode;
+use ruff::settings::types::SerializationFormat;
+use ruff::{fix, notify_user};
 use serde::Serialize;
 use serde_json::json;
 
 use crate::diagnostics::Diagnostics;
-use crate::fs::relativize_path;
-use crate::logging::LogLevel;
-use crate::message::Message;
-use crate::registry::RuleCode;
-use crate::settings::types::SerializationFormat;
-use crate::{fix, notify_user};
 
 /// Enum to control whether lint violations are shown to the user.
 pub enum Violations {
@@ -282,9 +281,9 @@ impl<'a> Printer<'a> {
         Ok(())
     }
 
-    pub fn write_continuously(&self, diagnostics: &Diagnostics) -> Result<()> {
+    pub fn write_continuously(&self, diagnostics: &Diagnostics) {
         if matches!(self.log_level, LogLevel::Silent) {
-            return Ok(());
+            return;
         }
 
         if self.log_level >= &LogLevel::Default {
@@ -302,10 +301,9 @@ impl<'a> Printer<'a> {
                 print_message(message);
             }
         }
-
-        Ok(())
     }
 
+    #[allow(clippy::unused_self)]
     pub fn clear_screen(&self) -> Result<()> {
         #[cfg(not(target_family = "wasm"))]
         clearscreen::clear()?;

ruff_cli/tests/black_compatibility_test.rs

@@ -9,7 +9,7 @@ use std::time::Duration;
 use std::{fs, process, str};
 
 use anyhow::{anyhow, Context, Result};
-use assert_cmd::{crate_name, Command};
+use assert_cmd::Command;
 use itertools::Itertools;
 use log::info;
 use ruff::logging::{set_up_logging, LogLevel};
@@ -24,6 +24,8 @@ struct Blackd {
     client: ureq::Agent,
 }
 
+const BIN_NAME: &str = "ruff";
+
 impl Blackd {
     pub fn new() -> Result<Self> {
         // Get free TCP port to run on
@@ -104,7 +106,7 @@ fn run_test(path: &Path, blackd: &Blackd, ruff_args: &[&str]) -> Result<()> {
     let input = fs::read(path)?;
 
     // Step 1: Run `ruff` on the input.
-    let step_1 = &Command::cargo_bin(crate_name!())?
+    let step_1 = &Command::cargo_bin(BIN_NAME)?
         .args(ruff_args)
         .write_stdin(input)
         .assert()
@@ -121,7 +123,7 @@ fn run_test(path: &Path, blackd: &Blackd, ruff_args: &[&str]) -> Result<()> {
     let step_2_output = blackd.check(&step_1_output)?;
 
     // Step 3: Re-run `ruff` on the input.
-    let step_3 = &Command::cargo_bin(crate_name!())?
+    let step_3 = &Command::cargo_bin(BIN_NAME)?
         .args(ruff_args)
         .write_stdin(step_2_output.clone())
         .assert();
@@ -178,7 +180,7 @@ fn test_ruff_black_compatibility() -> Result<()> {
         // problem. Ruff would add a `# noqa: W292`  after the first run, black introduces a
         // newline, and ruff removes the `# noqa: W292` again.
         .filter(|origin| *origin != RuleOrigin::Ruff)
-        .map(|origin| origin.codes().iter().map(AsRef::as_ref).join(","))
+        .map(|origin| origin.prefixes().as_list(","))
         .join(",");
     let ruff_args = [
         "-",

ruff_cli/tests/integration_test.rs

@@ -3,11 +3,14 @@
 use std::str;
 
 use anyhow::Result;
-use assert_cmd::{crate_name, Command};
+use assert_cmd::Command;
+use path_absolutize::path_dedot;
+
+const BIN_NAME: &str = "ruff";
 
 #[test]
 fn test_stdin_success() -> Result<()> {
-    let mut cmd = Command::cargo_bin(crate_name!())?;
+    let mut cmd = Command::cargo_bin(BIN_NAME)?;
     cmd.args(["-", "--format", "text"])
         .write_stdin("")
         .assert()
@@ -17,7 +20,7 @@ fn test_stdin_success() -> Result<()> {
 
 #[test]
 fn test_stdin_error() -> Result<()> {
-    let mut cmd = Command::cargo_bin(crate_name!())?;
+    let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
         .args(["-", "--format", "text"])
         .write_stdin("import os\n")
@@ -33,7 +36,7 @@ fn test_stdin_error() -> Result<()> {
 
 #[test]
 fn test_stdin_filename() -> Result<()> {
-    let mut cmd = Command::cargo_bin(crate_name!())?;
+    let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
         .args(["-", "--format", "text", "--stdin-filename", "F401.py"])
         .write_stdin("import os\n")
@@ -49,7 +52,7 @@ fn test_stdin_filename() -> Result<()> {
 
 #[test]
 fn test_stdin_json() -> Result<()> {
-    let mut cmd = Command::cargo_bin(crate_name!())?;
+    let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
         .args(["-", "--format", "json", "--stdin-filename", "F401.py"])
         .write_stdin("import os\n")
@@ -57,41 +60,44 @@ fn test_stdin_json() -> Result<()> {
         .failure();
     assert_eq!(
         str::from_utf8(&output.get_output().stdout)?,
-        r#"[
-  {
+        format!(
+            r#"[
+  {{
     "code": "F401",
     "message": "`os` imported but unused",
-    "fix": {
+    "fix": {{
       "content": "",
       "message": "Remove unused import: `os`",
-      "location": {
+      "location": {{
         "row": 1,
         "column": 0
-      },
-      "end_location": {
+      }},
+      "end_location": {{
         "row": 2,
         "column": 0
-      }
-    },
-    "location": {
+      }}
+    }},
+    "location": {{
       "row": 1,
       "column": 8
-    },
-    "end_location": {
+    }},
+    "end_location": {{
       "row": 1,
       "column": 10
-    },
-    "filename": "F401.py"
-  }
+    }},
+    "filename": "{}/F401.py"
+  }}
 ]
-"#
+"#,
+            path_dedot::CWD.to_str().unwrap()
+        )
     );
     Ok(())
 }
 
 #[test]
 fn test_stdin_autofix() -> Result<()> {
-    let mut cmd = Command::cargo_bin(crate_name!())?;
+    let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
         .args(["-", "--format", "text", "--fix"])
         .write_stdin("import os\nimport sys\n\nprint(sys.version)\n")
@@ -106,7 +112,7 @@ fn test_stdin_autofix() -> Result<()> {
 
 #[test]
 fn test_stdin_autofix_when_not_fixable_should_still_print_contents() -> Result<()> {
-    let mut cmd = Command::cargo_bin(crate_name!())?;
+    let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
         .args(["-", "--format", "text", "--fix"])
         .write_stdin("import os\nimport sys\n\nif (1, 2):\n     print(sys.version)\n")
@@ -121,7 +127,7 @@ fn test_stdin_autofix_when_not_fixable_should_still_print_contents() -> Result<(
 
 #[test]
 fn test_stdin_autofix_when_no_issues_should_still_print_contents() -> Result<()> {
-    let mut cmd = Command::cargo_bin(crate_name!())?;
+    let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
         .args(["-", "--format", "text", "--fix"])
         .write_stdin("import sys\n\nprint(sys.version)\n")
@@ -136,7 +142,7 @@ fn test_stdin_autofix_when_no_issues_should_still_print_contents() -> Result<()>
 
 #[test]
 fn test_show_source() -> Result<()> {
-    let mut cmd = Command::cargo_bin(crate_name!())?;
+    let mut cmd = Command::cargo_bin(BIN_NAME)?;
     let output = cmd
         .args(["-", "--format", "text", "--show-source"])
         .write_stdin("l = 1")

ruff_dev/Cargo.toml

@@ -1,12 +1,8 @@
 [package]
 name = "ruff_dev"
-version = "0.0.220"
+version = "0.0.222"
 edition = "2021"
 
-[lib]
-name = "ruff_dev"
-doctest = false
-
 [dependencies]
 anyhow = { version = "1.0.66" }
 clap = { version = "4.0.1", features = ["derive"] }
@@ -14,9 +10,10 @@ itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
 once_cell = { version = "1.16.0" }
 ruff = { path = ".." }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
+ruff_cli = { path = "../ruff_cli" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "acbc517b55406c76da83d7b2711941d8d3f65b87" }
 schemars = { version = "0.8.11" }
 serde_json = {version="1.0.91"}
 strum = { version = "0.24.1", features = ["strum_macros"] }

ruff_dev/src/generate_cli_help.rs

@@ -1,8 +1,7 @@
 //! Generate CLI help.
 
 use anyhow::Result;
-use clap::{Args, CommandFactory};
-use ruff::cli::Cli as MainCli;
+use clap::Args;
 
 use crate::utils::replace_readme_section;
 
@@ -21,8 +20,7 @@ fn trim_lines(s: &str) -> String {
 }
 
 pub fn main(cli: &Cli) -> Result<()> {
-    let mut cmd = MainCli::command();
-    let output = trim_lines(cmd.render_help().to_string().trim());
+    let output = trim_lines(ruff_cli::help().trim());
 
     if cli.dry_run {
         print!("{output}");

ruff_dev/src/generate_rules_table.rs

@@ -2,8 +2,7 @@
 
 use anyhow::Result;
 use clap::Args;
-use itertools::Itertools;
-use ruff::registry::{RuleCode, RuleOrigin};
+use ruff::registry::{Prefixes, RuleCodePrefix, RuleOrigin};
 use strum::IntoEnumIterator;
 
 use crate::utils::replace_readme_section;
@@ -21,12 +20,33 @@ pub struct Cli {
     pub(crate) dry_run: bool,
 }
 
+fn generate_table(table_out: &mut String, prefix: &RuleCodePrefix) {
+    table_out.push_str("| Code | Name | Message | Fix |");
+    table_out.push('\n');
+    table_out.push_str("| ---- | ---- | ------- | --- |");
+    table_out.push('\n');
+    for rule_code in prefix.codes() {
+        let kind = rule_code.kind();
+        let fix_token = if kind.fixable() { "🛠" } else { "" };
+        table_out.push_str(&format!(
+            "| {} | {} | {} | {} |",
+            kind.code().as_ref(),
+            kind.as_ref(),
+            kind.summary().replace('|', r"\|"),
+            fix_token
+        ));
+        table_out.push('\n');
+    }
+    table_out.push('\n');
+}
+
 pub fn main(cli: &Cli) -> Result<()> {
     // Generate the table string.
     let mut table_out = String::new();
     let mut toc_out = String::new();
     for origin in RuleOrigin::iter() {
-        let codes_csv: String = origin.codes().iter().map(AsRef::as_ref).join(", ");
+        let prefixes = origin.prefixes();
+        let codes_csv: String = prefixes.as_list(", ");
         table_out.push_str(&format!("### {} ({codes_csv})", origin.title()));
         table_out.push('\n');
         table_out.push('\n');
@@ -50,26 +70,16 @@ pub fn main(cli: &Cli) -> Result<()> {
             table_out.push('\n');
         }
 
-        table_out.push_str("| Code | Name | Message | Fix |");
-        table_out.push('\n');
-        table_out.push_str("| ---- | ---- | ------- | --- |");
-        table_out.push('\n');
-
-        for rule_code in RuleCode::iter() {
-            if rule_code.origin() == origin {
-                let kind = rule_code.kind();
-                let fix_token = if kind.fixable() { "🛠" } else { "" };
-                table_out.push_str(&format!(
-                    "| {} | {} | {} | {} |",
-                    kind.code().as_ref(),
-                    kind.as_ref(),
-                    kind.summary().replace('|', r"\|"),
-                    fix_token
-                ));
-                table_out.push('\n');
+        match prefixes {
+            Prefixes::Single(prefix) => generate_table(&mut table_out, &prefix),
+            Prefixes::Multiple(entries) => {
+                for (prefix, category) in entries {
+                    table_out.push_str(&format!("#### {category} ({})", prefix.as_ref()));
+                    table_out.push('\n');
+                    generate_table(&mut table_out, &prefix);
+                }
             }
         }
-        table_out.push('\n');
     }
 
     if cli.dry_run {

ruff_dev/src/lib.rs

@@ -1,24 +0,0 @@
-#![allow(
-    clippy::collapsible_else_if,
-    clippy::collapsible_if,
-    clippy::implicit_hasher,
-    clippy::match_same_arms,
-    clippy::missing_errors_doc,
-    clippy::missing_panics_doc,
-    clippy::module_name_repetitions,
-    clippy::must_use_candidate,
-    clippy::similar_names,
-    clippy::too_many_lines
-)]
-#![forbid(unsafe_code)]
-
-pub mod generate_all;
-pub mod generate_cli_help;
-pub mod generate_json_schema;
-pub mod generate_options;
-pub mod generate_rules_table;
-pub mod print_ast;
-pub mod print_cst;
-pub mod print_tokens;
-pub mod round_trip;
-mod utils;

ruff_dev/src/main.rs

@@ -1,3 +1,6 @@
+//! This crate implements an internal CLI for developers of Ruff.
+//!
+//! Within the ruff repository you can run it with `cargo dev`.
 #![allow(
     clippy::collapsible_else_if,
     clippy::collapsible_if,
@@ -12,12 +15,19 @@
 )]
 #![forbid(unsafe_code)]
 
+mod generate_all;
+mod generate_cli_help;
+mod generate_json_schema;
+mod generate_options;
+mod generate_rules_table;
+mod print_ast;
+mod print_cst;
+mod print_tokens;
+mod round_trip;
+mod utils;
+
 use anyhow::Result;
 use clap::{Parser, Subcommand};
-use ruff_dev::{
-    generate_all, generate_cli_help, generate_json_schema, generate_options, generate_rules_table,
-    print_ast, print_cst, print_tokens, round_trip,
-};
 
 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]

ruff_dev/src/round_trip.rs

@@ -5,8 +5,7 @@ use std::path::PathBuf;
 
 use anyhow::Result;
 use clap::Args;
-use ruff::source_code::{Generator, Locator, Stylist};
-use rustpython_parser::parser;
+use ruff::source_code::round_trip;
 
 #[derive(Args)]
 pub struct Cli {
@@ -17,11 +16,6 @@ pub struct Cli {
 
 pub fn main(cli: &Cli) -> Result<()> {
     let contents = fs::read_to_string(&cli.file)?;
-    let python_ast = parser::parse_program(&contents, &cli.file.to_string_lossy())?;
-    let locator = Locator::new(&contents);
-    let stylist = Stylist::from_contents(&contents, &locator);
-    let mut generator: Generator = (&stylist).into();
-    generator.unparse_suite(&python_ast);
-    println!("{}", generator.generate());
+    println!("{}", round_trip(&contents, &cli.file.to_string_lossy())?);
     Ok(())
 }

ruff_macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_macros"
-version = "0.0.220"
+version = "0.0.222"
 edition = "2021"
 
 [lib]

ruff_macros/src/lib.rs

@@ -1,3 +1,4 @@
+//! This crate implements internal macros for the `ruff` library.
 #![allow(
     clippy::collapsible_else_if,
     clippy::collapsible_if,

src/ast/comparable.rs

@@ -1,5 +1,5 @@
-//! An equivalent object hierarchy to the `Expr` hierarchy, but with the ability
-//! to compare expressions for equality (via `Eq` and `Hash`).
+//! An equivalent object hierarchy to the [`Expr`] hierarchy, but with the
+//! ability to compare expressions for equality (via [`Eq`] and [`Hash`]).
 
 use num_bigint::BigInt;
 use rustpython_ast::{

src/ast/function_type.rs

@@ -1,10 +1,8 @@
-use rustc_hash::{FxHashMap, FxHashSet};
 use rustpython_ast::Expr;
 
-use crate::ast::helpers::{
-    collect_call_paths, dealias_call_path, match_call_path, to_module_and_member,
-};
+use crate::ast::helpers::to_call_path;
 use crate::ast::types::{Scope, ScopeKind};
+use crate::checkers::ast::Checker;
 
 const CLASS_METHODS: [&str; 3] = ["__new__", "__init_subclass__", "__class_getitem__"];
 const METACLASS_BASES: [(&str, &str); 2] = [("", "type"), ("abc", "ABCMeta")];
@@ -18,11 +16,10 @@ pub enum FunctionType {
 
 /// Classify a function based on its scope, name, and decorators.
 pub fn classify(
+    checker: &Checker,
     scope: &Scope,
     name: &str,
     decorator_list: &[Expr],
-    from_imports: &FxHashMap<&str, FxHashSet<&str>>,
-    import_aliases: &FxHashMap<&str, &str>,
     classmethod_decorators: &[String],
     staticmethod_decorators: &[String],
 ) -> FunctionType {
@@ -33,17 +30,18 @@ pub fn classify(
     if CLASS_METHODS.contains(&name)
         || scope.bases.iter().any(|expr| {
             // The class itself extends a known metaclass, so all methods are class methods.
-            let call_path = dealias_call_path(collect_call_paths(expr), import_aliases);
-            METACLASS_BASES
-                .iter()
-                .any(|(module, member)| match_call_path(&call_path, module, member, from_imports))
+            checker.resolve_call_path(expr).map_or(false, |call_path| {
+                METACLASS_BASES
+                    .iter()
+                    .any(|(module, member)| call_path == [*module, *member])
+            })
         })
         || decorator_list.iter().any(|expr| {
             // The method is decorated with a class method decorator (like `@classmethod`).
-            let call_path = dealias_call_path(collect_call_paths(expr), import_aliases);
-            classmethod_decorators.iter().any(|decorator| {
-                let (module, member) = to_module_and_member(decorator);
-                match_call_path(&call_path, module, member, from_imports)
+            checker.resolve_call_path(expr).map_or(false, |call_path| {
+                classmethod_decorators
+                    .iter()
+                    .any(|decorator| call_path == to_call_path(decorator))
             })
         })
     {
@@ -51,10 +49,10 @@ pub fn classify(
     } else if decorator_list.iter().any(|expr| {
         // The method is decorated with a static method decorator (like
         // `@staticmethod`).
-        let call_path = dealias_call_path(collect_call_paths(expr), import_aliases);
-        staticmethod_decorators.iter().any(|decorator| {
-            let (module, member) = to_module_and_member(decorator);
-            match_call_path(&call_path, module, member, from_imports)
+        checker.resolve_call_path(expr).map_or(false, |call_path| {
+            staticmethod_decorators
+                .iter()
+                .any(|decorator| call_path == to_call_path(decorator))
         })
     }) {
         FunctionType::StaticMethod

src/ast/helpers.rs

@@ -12,6 +12,7 @@ use rustpython_parser::lexer::Tok;
 use rustpython_parser::token::StringKind;
 
 use crate::ast::types::{Binding, BindingKind, Range};
+use crate::checkers::ast::Checker;
 use crate::source_code::{Generator, Locator, Stylist};
 
 /// Create an `Expr` with default location from an `ExprKind`.
@@ -54,150 +55,42 @@ fn collect_call_path_inner<'a>(expr: &'a Expr, parts: &mut Vec<&'a str>) {
     }
 }
 
-/// Convert an `Expr` to its call path (like `List`, or `typing.List`).
-pub fn compose_call_path(expr: &Expr) -> Option<String> {
-    let segments = collect_call_paths(expr);
-    if segments.is_empty() {
-        None
-    } else {
-        Some(segments.join("."))
-    }
-}
-
 /// Convert an `Expr` to its call path segments (like ["typing", "List"]).
-pub fn collect_call_paths(expr: &Expr) -> Vec<&str> {
+pub fn collect_call_path(expr: &Expr) -> Vec<&str> {
     let mut segments = vec![];
     collect_call_path_inner(expr, &mut segments);
     segments
 }
 
-/// Rewrite any import aliases on a call path.
-pub fn dealias_call_path<'a>(
-    call_path: Vec<&'a str>,
-    import_aliases: &FxHashMap<&str, &'a str>,
-) -> Vec<&'a str> {
-    if let Some(head) = call_path.first() {
-        if let Some(origin) = import_aliases.get(head) {
-            let tail = &call_path[1..];
-            let mut call_path: Vec<&str> = vec![];
-            call_path.extend(origin.split('.'));
-            call_path.extend(tail);
-            call_path
-        } else {
-            call_path
-        }
+/// Convert an `Expr` to its call path (like `List`, or `typing.List`).
+pub fn compose_call_path(expr: &Expr) -> Option<String> {
+    let call_path = collect_call_path(expr);
+    if call_path.is_empty() {
+        None
     } else {
-        call_path
+        Some(format_call_path(&call_path))
     }
 }
 
-/// Return `true` if the `Expr` is a reference to `${module}.${target}`.
-///
-/// Useful for, e.g., ensuring that a `Union` reference represents
-/// `typing.Union`.
-pub fn match_module_member(
-    expr: &Expr,
-    module: &str,
-    member: &str,
-    from_imports: &FxHashMap<&str, FxHashSet<&str>>,
-    import_aliases: &FxHashMap<&str, &str>,
-) -> bool {
-    match_call_path(
-        &dealias_call_path(collect_call_paths(expr), import_aliases),
-        module,
-        member,
-        from_imports,
-    )
-}
-
-/// Return `true` if the `call_path` is a reference to `${module}.${target}`.
-///
-/// Optimized version of `match_module_member` for pre-computed call paths.
-pub fn match_call_path(
-    call_path: &[&str],
-    module: &str,
-    member: &str,
-    from_imports: &FxHashMap<&str, FxHashSet<&str>>,
-) -> bool {
-    // If we have no segments, we can't ever match.
-    let num_segments = call_path.len();
-    if num_segments == 0 {
-        return false;
-    }
-
-    // If the last segment doesn't match the member, we can't ever match.
-    if call_path[num_segments - 1] != member {
-        return false;
-    }
-
-    // We now only need the module path, so throw out the member name.
-    let call_path = &call_path[..num_segments - 1];
-    let num_segments = call_path.len();
-
-    // Case (1): It's a builtin (like `list`).
-    // Case (2a): We imported from the parent (`from typing.re import Match`,
-    // `Match`).
-    // Case (2b): We imported star from the parent (`from typing.re import *`,
-    // `Match`).
-    if num_segments == 0 {
-        module.is_empty()
-            || from_imports.get(module).map_or(false, |imports| {
-                imports.contains(member) || imports.contains("*")
-            })
+/// Format a call path for display.
+pub fn format_call_path(call_path: &[&str]) -> String {
+    if call_path
+        .first()
+        .expect("Unable to format empty call path")
+        .is_empty()
+    {
+        call_path[1..].join(".")
     } else {
-        let components: Vec<&str> = module.split('.').collect();
-
-        // Case (3a): it's a fully qualified call path (`import typing`,
-        // `typing.re.Match`). Case (3b): it's a fully qualified call path (`import
-        // typing.re`, `typing.re.Match`).
-        if components == call_path {
-            return true;
-        }
-
-        // Case (4): We imported from the grandparent (`from typing import re`,
-        // `re.Match`)
-        let num_matches = (0..components.len())
-            .take(num_segments)
-            .take_while(|i| components[components.len() - 1 - i] == call_path[num_segments - 1 - i])
-            .count();
-        if num_matches > 0 {
-            let cut = components.len() - num_matches;
-            // TODO(charlie): Rewrite to avoid this allocation.
-            let module = components[..cut].join(".");
-            let member = components[cut];
-            if from_imports
-                .get(&module.as_str())
-                .map_or(false, |imports| imports.contains(member))
-            {
-                return true;
-            }
-        }
-
-        false
+        call_path.join(".")
     }
 }
 
 /// Return `true` if the `Expr` contains a reference to `${module}.${target}`.
-pub fn contains_call_path(
-    expr: &Expr,
-    module: &str,
-    member: &str,
-    import_aliases: &FxHashMap<&str, &str>,
-    from_imports: &FxHashMap<&str, FxHashSet<&str>>,
-) -> bool {
+pub fn contains_call_path(checker: &Checker, expr: &Expr, target: &[&str]) -> bool {
     any_over_expr(expr, &|expr| {
-        let call_path = collect_call_paths(expr);
-        if !call_path.is_empty() {
-            if match_call_path(
-                &dealias_call_path(call_path, import_aliases),
-                module,
-                member,
-                from_imports,
-            ) {
-                return true;
-            }
-        }
-        false
+        checker
+            .resolve_call_path(expr)
+            .map_or(false, |call_path| call_path == target)
     })
 }
 
@@ -304,7 +197,7 @@ where
 
 static DUNDER_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"__[^\s]+__").unwrap());
 
-/// Return `true` if the `Stmt` is an assignment to a dunder (like `__all__`).
+/// Return `true` if the [`Stmt`] is an assignment to a dunder (like `__all__`).
 pub fn is_assignment_to_a_dunder(stmt: &Stmt) -> bool {
     // Check whether it's an assignment to a dunder, with or without a type
     // annotation. This is what pycodestyle (as of 2.9.1) does.
@@ -326,7 +219,7 @@ pub fn is_assignment_to_a_dunder(stmt: &Stmt) -> bool {
     }
 }
 
-/// Return `true` if the `Expr` is a singleton (`None`, `True`, `False`, or
+/// Return `true` if the [`Expr`] is a singleton (`None`, `True`, `False`, or
 /// `...`).
 pub fn is_singleton(expr: &Expr) -> bool {
     matches!(
@@ -338,7 +231,7 @@ pub fn is_singleton(expr: &Expr) -> bool {
     )
 }
 
-/// Return `true` if the `Expr` is a constant or tuple of constants.
+/// Return `true` if the [`Expr`] is a constant or tuple of constants.
 pub fn is_constant(expr: &Expr) -> bool {
     match &expr.node {
         ExprKind::Constant { .. } => true,
@@ -347,13 +240,13 @@ pub fn is_constant(expr: &Expr) -> bool {
     }
 }
 
-/// Return `true` if the `Expr` is a non-singleton constant.
+/// Return `true` if the [`Expr`] is a non-singleton constant.
 pub fn is_constant_non_singleton(expr: &Expr) -> bool {
     is_constant(expr) && !is_singleton(expr)
 }
 
-/// Return the `Keyword` with the given name, if it's present in the list of
-/// `Keyword` arguments.
+/// Return the [`Keyword`] with the given name, if it's present in the list of
+/// [`Keyword`] arguments.
 pub fn find_keyword<'a>(keywords: &'a [Keyword], keyword_name: &str) -> Option<&'a Keyword> {
     keywords.iter().find(|keyword| {
         let KeywordData { arg, .. } = &keyword.node;
@@ -361,7 +254,7 @@ pub fn find_keyword<'a>(keywords: &'a [Keyword], keyword_name: &str) -> Option<&
     })
 }
 
-/// Return `true` if an `Expr` is `None`.
+/// Return `true` if an [`Expr`] is `None`.
 pub fn is_const_none(expr: &Expr) -> bool {
     matches!(
         &expr.node,
@@ -389,13 +282,13 @@ pub fn extract_handler_names(handlers: &[Excepthandler]) -> Vec<Vec<&str>> {
                 if let Some(type_) = type_ {
                     if let ExprKind::Tuple { elts, .. } = &type_.node {
                         for type_ in elts {
-                            let call_path = collect_call_paths(type_);
+                            let call_path = collect_call_path(type_);
                             if !call_path.is_empty() {
                                 handler_names.push(call_path);
                             }
                         }
                     } else {
-                        let call_path = collect_call_paths(type_);
+                        let call_path = collect_call_path(type_);
                         if !call_path.is_empty() {
                             handler_names.push(call_path);
                         }
@@ -458,12 +351,37 @@ pub fn format_import_from(level: Option<&usize>, module: Option<&str>) -> String
     module_name
 }
 
+/// Format the member reference name for a relative import.
+pub fn format_import_from_member(
+    level: Option<&usize>,
+    module: Option<&str>,
+    member: &str,
+) -> String {
+    let mut full_name = String::with_capacity(
+        level.map_or(0, |level| *level)
+            + module.as_ref().map_or(0, |module| module.len())
+            + 1
+            + member.len(),
+    );
+    if let Some(level) = level {
+        for _ in 0..*level {
+            full_name.push('.');
+        }
+    }
+    if let Some(module) = module {
+        full_name.push_str(module);
+        full_name.push('.');
+    }
+    full_name.push_str(member);
+    full_name
+}
+
 /// Split a target string (like `typing.List`) into (`typing`, `List`).
-pub fn to_module_and_member(target: &str) -> (&str, &str) {
-    if let Some(index) = target.rfind('.') {
-        (&target[..index], &target[index + 1..])
+pub fn to_call_path(target: &str) -> Vec<&str> {
+    if target.contains('.') {
+        target.split('.').collect()
     } else {
-        ("", target)
+        vec!["", target]
     }
 }
 
@@ -704,6 +622,19 @@ pub fn preceded_by_continuation(stmt: &Stmt, locator: &Locator) -> bool {
     false
 }
 
+/// Return the `Range` of the first `Tok::Colon` token in a `Range`.
+pub fn first_colon_range(range: Range, locator: &Locator) -> Option<Range> {
+    let contents = locator.slice_source_code_range(&range);
+    let range = lexer::make_tokenizer_located(&contents, range.location)
+        .flatten()
+        .find(|(_, kind, _)| matches!(kind, Tok::Colon))
+        .map(|(location, _, end_location)| Range {
+            location,
+            end_location,
+        });
+    range
+}
+
 /// Return `true` if a `Stmt` appears to be part of a multi-statement line, with
 /// other statements preceding it.
 pub fn preceded_by_multi_statement_line(stmt: &Stmt, locator: &Locator) -> bool {
@@ -778,6 +709,7 @@ impl<'a> SimpleCallArgs<'a> {
     }
 
     /// Get the number of positional and keyword arguments used.
+    #[allow(clippy::len_without_is_empty)]
     pub fn len(&self) -> usize {
         self.args.len() + self.kwargs.len()
     }
@@ -786,159 +718,15 @@ impl<'a> SimpleCallArgs<'a> {
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use rustc_hash::{FxHashMap, FxHashSet};
     use rustpython_ast::Location;
     use rustpython_parser::parser;
 
     use crate::ast::helpers::{
-        else_range, identifier_range, match_module_member, match_trailing_content,
+        else_range, first_colon_range, identifier_range, match_trailing_content,
     };
     use crate::ast::types::Range;
     use crate::source_code::Locator;
 
-    #[test]
-    fn builtin() -> Result<()> {
-        let expr = parser::parse_expression("list", "<filename>")?;
-        assert!(match_module_member(
-            &expr,
-            "",
-            "list",
-            &FxHashMap::default(),
-            &FxHashMap::default(),
-        ));
-        Ok(())
-    }
-
-    #[test]
-    fn fully_qualified() -> Result<()> {
-        let expr = parser::parse_expression("typing.re.Match", "<filename>")?;
-        assert!(match_module_member(
-            &expr,
-            "typing.re",
-            "Match",
-            &FxHashMap::default(),
-            &FxHashMap::default(),
-        ));
-        Ok(())
-    }
-
-    #[test]
-    fn unimported() -> Result<()> {
-        let expr = parser::parse_expression("Match", "<filename>")?;
-        assert!(!match_module_member(
-            &expr,
-            "typing.re",
-            "Match",
-            &FxHashMap::default(),
-            &FxHashMap::default(),
-        ));
-        let expr = parser::parse_expression("re.Match", "<filename>")?;
-        assert!(!match_module_member(
-            &expr,
-            "typing.re",
-            "Match",
-            &FxHashMap::default(),
-            &FxHashMap::default(),
-        ));
-        Ok(())
-    }
-
-    #[test]
-    fn from_star() -> Result<()> {
-        let expr = parser::parse_expression("Match", "<filename>")?;
-        assert!(match_module_member(
-            &expr,
-            "typing.re",
-            "Match",
-            &FxHashMap::from_iter([("typing.re", FxHashSet::from_iter(["*"]))]),
-            &FxHashMap::default()
-        ));
-        Ok(())
-    }
-
-    #[test]
-    fn from_parent() -> Result<()> {
-        let expr = parser::parse_expression("Match", "<filename>")?;
-        assert!(match_module_member(
-            &expr,
-            "typing.re",
-            "Match",
-            &FxHashMap::from_iter([("typing.re", FxHashSet::from_iter(["Match"]))]),
-            &FxHashMap::default()
-        ));
-        Ok(())
-    }
-
-    #[test]
-    fn from_grandparent() -> Result<()> {
-        let expr = parser::parse_expression("re.Match", "<filename>")?;
-        assert!(match_module_member(
-            &expr,
-            "typing.re",
-            "Match",
-            &FxHashMap::from_iter([("typing", FxHashSet::from_iter(["re"]))]),
-            &FxHashMap::default()
-        ));
-
-        let expr = parser::parse_expression("match.Match", "<filename>")?;
-        assert!(match_module_member(
-            &expr,
-            "typing.re.match",
-            "Match",
-            &FxHashMap::from_iter([("typing.re", FxHashSet::from_iter(["match"]))]),
-            &FxHashMap::default()
-        ));
-
-        let expr = parser::parse_expression("re.match.Match", "<filename>")?;
-        assert!(match_module_member(
-            &expr,
-            "typing.re.match",
-            "Match",
-            &FxHashMap::from_iter([("typing", FxHashSet::from_iter(["re"]))]),
-            &FxHashMap::default()
-        ));
-        Ok(())
-    }
-
-    #[test]
-    fn from_alias() -> Result<()> {
-        let expr = parser::parse_expression("IMatch", "<filename>")?;
-        assert!(match_module_member(
-            &expr,
-            "typing.re",
-            "Match",
-            &FxHashMap::from_iter([("typing.re", FxHashSet::from_iter(["Match"]))]),
-            &FxHashMap::from_iter([("IMatch", "Match")]),
-        ));
-        Ok(())
-    }
-
-    #[test]
-    fn from_aliased_parent() -> Result<()> {
-        let expr = parser::parse_expression("t.Match", "<filename>")?;
-        assert!(match_module_member(
-            &expr,
-            "typing.re",
-            "Match",
-            &FxHashMap::default(),
-            &FxHashMap::from_iter([("t", "typing.re")]),
-        ));
-        Ok(())
-    }
-
-    #[test]
-    fn from_aliased_grandparent() -> Result<()> {
-        let expr = parser::parse_expression("t.re.Match", "<filename>")?;
-        assert!(match_module_member(
-            &expr,
-            "typing.re",
-            "Match",
-            &FxHashMap::default(),
-            &FxHashMap::from_iter([("t", "typing")]),
-        ));
-        Ok(())
-    }
-
     #[test]
     fn trailing_content() -> Result<()> {
         let contents = "x = 1";
@@ -1066,4 +854,19 @@ else:
         assert_eq!(range.end_location.column(), 4);
         Ok(())
     }
+
+    #[test]
+    fn test_first_colon_range() {
+        let contents = "with a: pass";
+        let locator = Locator::new(contents);
+        let range = first_colon_range(
+            Range::new(Location::new(1, 0), Location::new(1, contents.len())),
+            &locator,
+        )
+        .unwrap();
+        assert_eq!(range.location.row(), 1);
+        assert_eq!(range.location.column(), 6);
+        assert_eq!(range.end_location.row(), 1);
+        assert_eq!(range.end_location.column(), 7);
+    }
 }

src/ast/operations.rs

@@ -96,7 +96,7 @@ impl<'a> Visitor<'a> for GlobalVisitor<'a> {
     }
 }
 
-/// Extract a map from global name to its last-defining `Stmt`.
+/// Extract a map from global name to its last-defining [`Stmt`].
 pub fn extract_globals(body: &[Stmt]) -> FxHashMap<&str, &Stmt> {
     let mut visitor = GlobalVisitor::default();
     for stmt in body {
@@ -197,12 +197,12 @@ pub fn is_unpacking_assignment(parent: &Stmt, child: &Expr) -> bool {
 
 pub type LocatedCmpop<U = ()> = Located<Cmpop, U>;
 
-/// Extract all `Cmpop` operators from a source code snippet, with appropriate
+/// Extract all [`Cmpop`] operators from a source code snippet, with appropriate
 /// ranges.
 ///
-/// `RustPython` doesn't include line and column information on `Cmpop` nodes.
+/// `RustPython` doesn't include line and column information on [`Cmpop`] nodes.
 /// `CPython` doesn't either. This method iterates over the token stream and
-/// re-identifies `Cmpop` nodes, annotating them with valid ranges.
+/// re-identifies [`Cmpop`] nodes, annotating them with valid ranges.
 pub fn locate_cmpops(contents: &str) -> Vec<LocatedCmpop> {
     let mut tok_iter = lexer::make_tokenizer(contents).flatten().peekable();
     let mut ops: Vec<LocatedCmpop> = vec![];

src/ast/types.rs

@@ -104,7 +104,7 @@ impl<'a> Scope<'a> {
 }
 
 #[derive(Clone, Debug)]
-pub enum BindingKind {
+pub enum BindingKind<'a> {
     Annotation,
     Argument,
     Assignment,
@@ -118,16 +118,16 @@ pub enum BindingKind {
     Export(Vec<String>),
     FutureImportation,
     StarImportation(Option<usize>, Option<String>),
-    Importation(String, String),
-    FromImportation(String, String),
-    SubmoduleImportation(String, String),
+    Importation(&'a str, &'a str),
+    FromImportation(&'a str, String),
+    SubmoduleImportation(&'a str, &'a str),
 }
 
 #[derive(Clone, Debug)]
 pub struct Binding<'a> {
-    pub kind: BindingKind,
+    pub kind: BindingKind<'a>,
     pub range: Range,
-    /// The statement in which the `Binding` was defined.
+    /// The statement in which the [`Binding`] was defined.
     pub source: Option<RefEquality<'a, Stmt>>,
     /// Tuple of (scope index, range) indicating the scope and range at which
     /// the binding was last used.
@@ -168,19 +168,26 @@ impl<'a> Binding<'a> {
 
     pub fn redefines(&self, existing: &'a Binding) -> bool {
         match &self.kind {
-            BindingKind::Importation(_, full_name) | BindingKind::FromImportation(_, full_name) => {
-                if let BindingKind::SubmoduleImportation(_, existing_full_name) = &existing.kind {
-                    return full_name == existing_full_name;
+            BindingKind::Importation(.., full_name) => {
+                if let BindingKind::SubmoduleImportation(.., existing) = &existing.kind {
+                    return full_name == existing;
                 }
             }
-            BindingKind::SubmoduleImportation(_, full_name) => {
-                if let BindingKind::Importation(_, existing_full_name)
-                | BindingKind::FromImportation(_, existing_full_name)
-                | BindingKind::SubmoduleImportation(_, existing_full_name) = &existing.kind
-                {
-                    return full_name == existing_full_name;
+            BindingKind::FromImportation(.., full_name) => {
+                if let BindingKind::SubmoduleImportation(.., existing) = &existing.kind {
+                    return full_name == existing;
                 }
             }
+            BindingKind::SubmoduleImportation(.., full_name) => match &existing.kind {
+                BindingKind::Importation(.., existing)
+                | BindingKind::SubmoduleImportation(.., existing) => {
+                    return full_name == existing;
+                }
+                BindingKind::FromImportation(.., existing) => {
+                    return full_name == existing;
+                }
+                _ => {}
+            },
             BindingKind::Annotation => {
                 return false;
             }

src/autofix/helpers.rs

@@ -210,14 +210,17 @@ pub fn remove_unused_imports<'a>(
         Some(SmallStatement::Import(import_body)) => (&mut import_body.names, None),
         Some(SmallStatement::ImportFrom(import_body)) => {
             if let ImportNames::Aliases(names) = &mut import_body.names {
-                (names, import_body.module.as_ref())
+                (
+                    names,
+                    Some((&import_body.relative, import_body.module.as_ref())),
+                )
             } else if let ImportNames::Star(..) = &import_body.names {
                 // Special-case: if the import is a `from ... import *`, then we delete the
                 // entire statement.
                 let mut found_star = false;
                 for unused_import in unused_imports {
                     let full_name = match import_body.module.as_ref() {
-                        Some(module_name) => format!("{}.*", compose_module_path(module_name),),
+                        Some(module_name) => format!("{}.*", compose_module_path(module_name)),
                         None => "*".to_string(),
                     };
                     if unused_import == full_name {
@@ -246,11 +249,25 @@ pub fn remove_unused_imports<'a>(
     for unused_import in unused_imports {
         let alias_index = aliases.iter().position(|alias| {
             let full_name = match import_module {
-                Some(module_name) => format!(
-                    "{}.{}",
-                    compose_module_path(module_name),
-                    compose_module_path(&alias.name)
-                ),
+                Some((relative, module)) => {
+                    let module = module.map(compose_module_path);
+                    let member = compose_module_path(&alias.name);
+                    let mut full_name = String::with_capacity(
+                        relative.len()
+                            + module.as_ref().map_or(0, std::string::String::len)
+                            + member.len()
+                            + 1,
+                    );
+                    for _ in 0..relative.len() {
+                        full_name.push('.');
+                    }
+                    if let Some(module) = module {
+                        full_name.push_str(&module);
+                        full_name.push('.');
+                    }
+                    full_name.push_str(&member);
+                    full_name
+                }
                 None => compose_module_path(&alias.name),
             };
             full_name == unused_import

src/cache.rs

@@ -1,134 +1,9 @@
-#![cfg_attr(target_family = "wasm", allow(dead_code))]
-use std::collections::hash_map::DefaultHasher;
-use std::fs;
-use std::hash::{Hash, Hasher};
-use std::io::Write;
 use std::path::{Path, PathBuf};
 
-use anyhow::Result;
-use filetime::FileTime;
-use log::error;
-use path_absolutize::Absolutize;
-use serde::{Deserialize, Serialize};
-
-use crate::message::Message;
-use crate::settings::{flags, Settings};
-
 pub const CACHE_DIR_NAME: &str = ".ruff_cache";
 
-const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
-
-#[derive(Serialize, Deserialize)]
-struct CacheMetadata {
-    mtime: i64,
-}
-
-#[derive(Serialize)]
-struct CheckResultRef<'a> {
-    metadata: &'a CacheMetadata,
-    messages: &'a [Message],
-}
-
-#[derive(Deserialize)]
-struct CheckResult {
-    metadata: CacheMetadata,
-    messages: Vec<Message>,
-}
-
 /// Return the cache directory for a given project root. Defers to the
 /// `RUFF_CACHE_DIR` environment variable, if set.
 pub fn cache_dir(project_root: &Path) -> PathBuf {
     project_root.join(CACHE_DIR_NAME)
 }
-
-fn content_dir() -> &'static Path {
-    Path::new("content")
-}
-
-fn cache_key<P: AsRef<Path>>(path: P, settings: &Settings, autofix: flags::Autofix) -> u64 {
-    let mut hasher = DefaultHasher::new();
-    CARGO_PKG_VERSION.hash(&mut hasher);
-    path.as_ref().absolutize().unwrap().hash(&mut hasher);
-    settings.hash(&mut hasher);
-    autofix.hash(&mut hasher);
-    hasher.finish()
-}
-
-#[allow(dead_code)]
-/// Initialize the cache at the specified `Path`.
-pub fn init(path: &Path) -> Result<()> {
-    // Create the cache directories.
-    fs::create_dir_all(path.join(content_dir()))?;
-
-    // Add the CACHEDIR.TAG.
-    if !cachedir::is_tagged(path)? {
-        cachedir::add_tag(path)?;
-    }
-
-    // Add the .gitignore.
-    let gitignore_path = path.join(".gitignore");
-    if !gitignore_path.exists() {
-        let mut file = fs::File::create(gitignore_path)?;
-        file.write_all(b"*")?;
-    }
-
-    Ok(())
-}
-
-fn write_sync(cache_dir: &Path, key: u64, value: &[u8]) -> Result<(), std::io::Error> {
-    fs::write(
-        cache_dir.join(content_dir()).join(format!("{key:x}")),
-        value,
-    )
-}
-
-fn read_sync(cache_dir: &Path, key: u64) -> Result<Vec<u8>, std::io::Error> {
-    fs::read(cache_dir.join(content_dir()).join(format!("{key:x}")))
-}
-
-/// Get a value from the cache.
-pub fn get<P: AsRef<Path>>(
-    path: P,
-    metadata: &fs::Metadata,
-    settings: &Settings,
-    autofix: flags::Autofix,
-) -> Option<Vec<Message>> {
-    let encoded = read_sync(&settings.cache_dir, cache_key(path, settings, autofix)).ok()?;
-    let (mtime, messages) = match bincode::deserialize::<CheckResult>(&encoded[..]) {
-        Ok(CheckResult {
-            metadata: CacheMetadata { mtime },
-            messages,
-        }) => (mtime, messages),
-        Err(e) => {
-            error!("Failed to deserialize encoded cache entry: {e:?}");
-            return None;
-        }
-    };
-    if FileTime::from_last_modification_time(metadata).unix_seconds() != mtime {
-        return None;
-    }
-    Some(messages)
-}
-
-/// Set a value in the cache.
-pub fn set<P: AsRef<Path>>(
-    path: P,
-    metadata: &fs::Metadata,
-    settings: &Settings,
-    autofix: flags::Autofix,
-    messages: &[Message],
-) {
-    let check_result = CheckResultRef {
-        metadata: &CacheMetadata {
-            mtime: FileTime::from_last_modification_time(metadata).unix_seconds(),
-        },
-        messages,
-    };
-    if let Err(e) = write_sync(
-        &settings.cache_dir,
-        cache_key(path, settings, autofix),
-        &bincode::serialize(&check_result).unwrap(),
-    ) {
-        error!("Failed to write to cache: {e:?}");
-    }
-}

src/checkers/ast.rs

@@ -14,9 +14,7 @@ use rustpython_parser::ast::{
 };
 use rustpython_parser::parser;
 
-use crate::ast::helpers::{
-    binding_range, collect_call_paths, dealias_call_path, extract_handler_names, match_call_path,
-};
+use crate::ast::helpers::{binding_range, collect_call_path, extract_handler_names};
 use crate::ast::operations::extract_all_names;
 use crate::ast::relocate::relocate_expr;
 use crate::ast::types::{
@@ -31,20 +29,20 @@ use crate::python::future::ALL_FEATURE_NAMES;
 use crate::python::typing;
 use crate::python::typing::SubscriptKind;
 use crate::registry::{Diagnostic, RuleCode};
+use crate::rules::{
+    flake8_2020, flake8_annotations, flake8_bandit, flake8_blind_except, flake8_boolean_trap,
+    flake8_bugbear, flake8_builtins, flake8_comprehensions, flake8_datetimez, flake8_debugger,
+    flake8_errmsg, flake8_implicit_str_concat, flake8_import_conventions, flake8_pie, flake8_print,
+    flake8_pytest_style, flake8_return, flake8_simplify, flake8_tidy_imports,
+    flake8_unused_arguments, mccabe, pandas_vet, pep8_naming, pycodestyle, pydocstyle, pyflakes,
+    pygrep_hooks, pylint, pyupgrade, ruff,
+};
 use crate::settings::types::PythonVersion;
 use crate::settings::{flags, Settings};
 use crate::source_code::{Locator, Stylist};
 use crate::violations::DeferralKeyword;
 use crate::visibility::{module_visibility, transition_scope, Modifier, Visibility, VisibleScope};
-use crate::{
-    autofix, docstrings, flake8_2020, flake8_annotations, flake8_bandit, flake8_blind_except,
-    flake8_boolean_trap, flake8_bugbear, flake8_builtins, flake8_comprehensions, flake8_datetimez,
-    flake8_debugger, flake8_errmsg, flake8_implicit_str_concat, flake8_import_conventions,
-    flake8_pie, flake8_print, flake8_pytest_style, flake8_return, flake8_simplify,
-    flake8_tidy_imports, flake8_unused_arguments, mccabe, noqa, pandas_vet, pep8_naming,
-    pycodestyle, pydocstyle, pyflakes, pygrep_hooks, pylint, pyupgrade, ruff, violations,
-    visibility,
-};
+use crate::{autofix, docstrings, noqa, violations, visibility};
 
 const GLOBAL_SCOPE_INDEX: usize = 0;
 
@@ -63,13 +61,10 @@ pub struct Checker<'a> {
     // Computed diagnostics.
     pub(crate) diagnostics: Vec<Diagnostic>,
     // Function and class definition tracking (e.g., for docstring enforcement).
-    definitions: Vec<(Definition<'a>, Visibility)>,
+    definitions: Vec<(Definition<'a>, Visibility, DeferralContext<'a>)>,
     // Edit tracking.
     // TODO(charlie): Instead of exposing deletions, wrap in a public API.
     pub(crate) deletions: FxHashSet<RefEquality<'a, Stmt>>,
-    // Import tracking.
-    pub(crate) from_imports: FxHashMap<&'a str, FxHashSet<&'a str>>,
-    pub(crate) import_aliases: FxHashMap<&'a str, &'a str>,
     // Retain all scopes and parent nodes, along with a stack of indexes to track which are active
     // at various points in time.
     pub(crate) parents: Vec<RefEquality<'a, Stmt>>,
@@ -123,8 +118,6 @@ impl<'a> Checker<'a> {
             diagnostics: vec![],
             definitions: vec![],
             deletions: FxHashSet::default(),
-            from_imports: FxHashMap::default(),
-            import_aliases: FxHashMap::default(),
             parents: vec![],
             depths: FxHashMap::default(),
             child_to_parent: FxHashMap::default(),
@@ -167,28 +160,28 @@ impl<'a> Checker<'a> {
 
     /// Return `true` if the `Expr` is a reference to `typing.${target}`.
     pub fn match_typing_expr(&self, expr: &Expr, target: &str) -> bool {
-        let call_path = dealias_call_path(collect_call_paths(expr), &self.import_aliases);
-        self.match_typing_call_path(&call_path, target)
+        self.resolve_call_path(expr).map_or(false, |call_path| {
+            self.match_typing_call_path(&call_path, target)
+        })
     }
 
     /// Return `true` if the call path is a reference to `typing.${target}`.
     pub fn match_typing_call_path(&self, call_path: &[&str], target: &str) -> bool {
-        if match_call_path(call_path, "typing", target, &self.from_imports) {
+        if call_path == ["typing", target] {
             return true;
         }
 
         if typing::TYPING_EXTENSIONS.contains(target) {
-            if match_call_path(call_path, "typing_extensions", target, &self.from_imports) {
+            if call_path == ["typing_extensions", target] {
                 return true;
             }
         }
 
-        if self
-            .settings
-            .typing_modules
-            .iter()
-            .any(|module| match_call_path(call_path, module, target, &self.from_imports))
-        {
+        if self.settings.typing_modules.iter().any(|module| {
+            let mut module = module.split('.').collect::<Vec<_>>();
+            module.push(target);
+            call_path == module.as_slice()
+        }) {
             return true;
         }
 
@@ -209,6 +202,54 @@ impl<'a> Checker<'a> {
         })
     }
 
+    pub fn resolve_call_path<'b>(&'a self, value: &'b Expr) -> Option<Vec<&'a str>>
+    where
+        'b: 'a,
+    {
+        let call_path = collect_call_path(value);
+        if let Some(head) = call_path.first() {
+            if let Some(binding) = self.find_binding(head) {
+                match &binding.kind {
+                    BindingKind::Importation(.., name) => {
+                        // Ignore relative imports.
+                        if name.starts_with('.') {
+                            return None;
+                        }
+                        let mut source_path: Vec<&str> = name.split('.').collect();
+                        source_path.extend(call_path.iter().skip(1));
+                        return Some(source_path);
+                    }
+                    BindingKind::SubmoduleImportation(name, ..) => {
+                        // Ignore relative imports.
+                        if name.starts_with('.') {
+                            return None;
+                        }
+                        let mut source_path: Vec<&str> = name.split('.').collect();
+                        source_path.extend(call_path.iter().skip(1));
+                        return Some(source_path);
+                    }
+                    BindingKind::FromImportation(.., name) => {
+                        // Ignore relative imports.
+                        if name.starts_with('.') {
+                            return None;
+                        }
+                        let mut source_path: Vec<&str> = name.split('.').collect();
+                        source_path.extend(call_path.iter().skip(1));
+                        return Some(source_path);
+                    }
+                    BindingKind::Builtin => {
+                        let mut source_path: Vec<&str> = Vec::with_capacity(call_path.len() + 1);
+                        source_path.push("");
+                        source_path.extend(call_path);
+                        return Some(source_path);
+                    }
+                    _ => {}
+                }
+            }
+        }
+        None
+    }
+
     /// Return `true` if a `RuleCode` is disabled by a `noqa` directive.
     pub fn is_ignored(&self, code: &RuleCode, lineno: usize) -> bool {
         // TODO(charlie): `noqa` directives are mostly enforced in `check_lines.rs`.
@@ -415,13 +456,11 @@ where
                 if self.settings.enabled.contains(&RuleCode::N804) {
                     if let Some(diagnostic) =
                         pep8_naming::rules::invalid_first_argument_name_for_class_method(
+                            self,
                             self.current_scope(),
                             name,
                             decorator_list,
                             args,
-                            &self.from_imports,
-                            &self.import_aliases,
-                            &self.settings.pep8_naming,
                         )
                     {
                         self.diagnostics.push(diagnostic);
@@ -431,13 +470,11 @@ where
                 if self.settings.enabled.contains(&RuleCode::N805) {
                     if let Some(diagnostic) =
                         pep8_naming::rules::invalid_first_argument_name_for_method(
+                            self,
                             self.current_scope(),
                             name,
                             decorator_list,
                             args,
-                            &self.from_imports,
-                            &self.import_aliases,
-                            &self.settings.pep8_naming,
                         )
                     {
                         self.diagnostics.push(diagnostic);
@@ -706,10 +743,7 @@ where
                         self.add_binding(
                             name,
                             Binding {
-                                kind: BindingKind::SubmoduleImportation(
-                                    name.to_string(),
-                                    full_name.to_string(),
-                                ),
+                                kind: BindingKind::SubmoduleImportation(name, full_name),
                                 used: None,
                                 range: Range::from_located(alias),
                                 source: Some(self.current_stmt().clone()),
@@ -728,10 +762,7 @@ where
                         self.add_binding(
                             name,
                             Binding {
-                                kind: BindingKind::Importation(
-                                    name.to_string(),
-                                    full_name.to_string(),
-                                ),
+                                kind: BindingKind::Importation(name, full_name),
                                 // Treat explicit re-export as usage (e.g., `import applications
                                 // as applications`).
                                 used: if alias
@@ -788,12 +819,6 @@ where
                     }
 
                     if let Some(asname) = &alias.node.asname {
-                        for alias in names {
-                            if let Some(asname) = &alias.node.asname {
-                                self.import_aliases.insert(asname, &alias.node.name);
-                            }
-                        }
-
                         let name = alias.node.name.split('.').last().unwrap();
                         if self.settings.enabled.contains(&RuleCode::N811) {
                             if let Some(diagnostic) =
@@ -890,25 +915,6 @@ where
                 module,
                 level,
             } => {
-                // Track `import from` statements, to ensure that we can correctly attribute
-                // references like `from typing import Union`.
-                if self.settings.enabled.contains(&RuleCode::UP023) {
-                    pyupgrade::rules::replace_c_element_tree(self, stmt);
-                }
-                if level.map(|level| level == 0).unwrap_or(true) {
-                    if let Some(module) = module {
-                        self.from_imports
-                            .entry(module)
-                            .or_insert_with(FxHashSet::default)
-                            .extend(names.iter().map(|alias| alias.node.name.as_str()));
-                    }
-                    for alias in names {
-                        if let Some(asname) = &alias.node.asname {
-                            self.import_aliases.insert(asname, &alias.node.name);
-                        }
-                    }
-                }
-
                 if self.settings.enabled.contains(&RuleCode::E402) {
                     if self.seen_import_boundary && stmt.location.column() == 0 {
                         self.diagnostics.push(Diagnostic::new(
@@ -926,6 +932,9 @@ where
                 if self.settings.enabled.contains(&RuleCode::UP026) {
                     pyupgrade::rules::rewrite_mock_import(self, stmt);
                 }
+                if self.settings.enabled.contains(&RuleCode::UP023) {
+                    pyupgrade::rules::replace_c_element_tree(self, stmt);
+                }
                 if self.settings.enabled.contains(&RuleCode::UP029) {
                     if let Some(module) = module.as_deref() {
                         pyupgrade::rules::unnecessary_builtin_import(self, stmt, module, names);
@@ -1057,15 +1066,16 @@ where
                         // be "foo.bar". Given `from foo import bar as baz`, `name` would be "baz"
                         // and `full_name` would be "foo.bar".
                         let name = alias.node.asname.as_ref().unwrap_or(&alias.node.name);
-                        let full_name = match module {
-                            None => alias.node.name.to_string(),
-                            Some(parent) => format!("{parent}.{}", alias.node.name),
-                        };
+                        let full_name = helpers::format_import_from_member(
+                            level.as_ref(),
+                            module.as_deref(),
+                            &alias.node.name,
+                        );
                         let range = Range::from_located(alias);
                         self.add_binding(
                             name,
                             Binding {
-                                kind: BindingKind::FromImportation(name.to_string(), full_name),
+                                kind: BindingKind::FromImportation(name, full_name),
                                 // Treat explicit re-export as usage (e.g., `from .applications
                                 // import FastAPI as FastAPI`).
                                 used: if alias
@@ -1273,7 +1283,12 @@ where
                     flake8_pytest_style::rules::complex_raises(self, stmt, items, body);
                 }
                 if self.settings.enabled.contains(&RuleCode::SIM117) {
-                    flake8_simplify::rules::multiple_with_statements(self, stmt);
+                    flake8_simplify::rules::multiple_with_statements(
+                        self,
+                        stmt,
+                        body,
+                        self.current_stmt_parent().map(|parent| parent.0),
+                    );
                 }
             }
             StmtKind::While { body, orelse, .. } => {
@@ -1453,8 +1468,11 @@ where
                     pyupgrade::rules::rewrite_yield_from(self, stmt);
                 }
                 let scope = transition_scope(&self.visible_scope, stmt, &Documentable::Function);
-                self.definitions
-                    .push((definition, scope.visibility.clone()));
+                self.definitions.push((
+                    definition,
+                    scope.visibility.clone(),
+                    (self.scope_stack.clone(), self.parents.clone()),
+                ));
                 self.visible_scope = scope;
 
                 // If any global bindings don't already exist in the global scope, add it.
@@ -1511,8 +1529,11 @@ where
                     &Documentable::Class,
                 );
                 let scope = transition_scope(&self.visible_scope, stmt, &Documentable::Class);
-                self.definitions
-                    .push((definition, scope.visibility.clone()));
+                self.definitions.push((
+                    definition,
+                    scope.visibility.clone(),
+                    (self.scope_stack.clone(), self.parents.clone()),
+                ));
                 self.visible_scope = scope;
 
                 // If any global bindings don't already exist in the global scope, add it.
@@ -1708,13 +1729,9 @@ where
                                     && !self.settings.pyupgrade.keep_runtime_typing
                                     && self.annotations_future_enabled
                                     && self.in_annotation))
-                            && typing::is_pep585_builtin(
-                                expr,
-                                &self.from_imports,
-                                &self.import_aliases,
-                            )
+                            && typing::is_pep585_builtin(self, expr)
                         {
-                            pyupgrade::rules::use_pep585_annotation(self, expr, id);
+                            pyupgrade::rules::use_pep585_annotation(self, expr);
                         }
 
                         self.handle_node_load(expr);
@@ -1752,9 +1769,9 @@ where
                         || (self.settings.target_version >= PythonVersion::Py37
                             && self.annotations_future_enabled
                             && self.in_annotation))
-                    && typing::is_pep585_builtin(expr, &self.from_imports, &self.import_aliases)
+                    && typing::is_pep585_builtin(self, expr)
                 {
-                    pyupgrade::rules::use_pep585_annotation(self, expr, attr);
+                    pyupgrade::rules::use_pep585_annotation(self, expr);
                 }
 
                 if self.settings.enabled.contains(&RuleCode::UP016) {
@@ -1822,12 +1839,7 @@ where
                 }
 
                 if self.settings.enabled.contains(&RuleCode::TID251) {
-                    flake8_tidy_imports::rules::banned_attribute_access(
-                        self,
-                        &dealias_call_path(collect_call_paths(expr), &self.import_aliases),
-                        expr,
-                        &self.settings.flake8_tidy_imports.banned_api,
-                    );
+                    flake8_tidy_imports::rules::banned_attribute_access(self, expr);
                 }
             }
             ExprKind::Call {
@@ -1976,96 +1988,36 @@ where
                     }
                 }
                 if self.settings.enabled.contains(&RuleCode::S103) {
-                    if let Some(diagnostic) = flake8_bandit::rules::bad_file_permissions(
-                        func,
-                        args,
-                        keywords,
-                        &self.from_imports,
-                        &self.import_aliases,
-                    ) {
-                        self.diagnostics.push(diagnostic);
-                    }
+                    flake8_bandit::rules::bad_file_permissions(self, func, args, keywords);
                 }
                 if self.settings.enabled.contains(&RuleCode::S501) {
-                    if let Some(diagnostic) = flake8_bandit::rules::request_with_no_cert_validation(
-                        func,
-                        args,
-                        keywords,
-                        &self.from_imports,
-                        &self.import_aliases,
-                    ) {
-                        self.diagnostics.push(diagnostic);
-                    }
+                    flake8_bandit::rules::request_with_no_cert_validation(
+                        self, func, args, keywords,
+                    );
                 }
                 if self.settings.enabled.contains(&RuleCode::S506) {
-                    if let Some(diagnostic) = flake8_bandit::rules::unsafe_yaml_load(
-                        func,
-                        args,
-                        keywords,
-                        &self.from_imports,
-                        &self.import_aliases,
-                    ) {
-                        self.diagnostics.push(diagnostic);
-                    }
+                    flake8_bandit::rules::unsafe_yaml_load(self, func, args, keywords);
                 }
                 if self.settings.enabled.contains(&RuleCode::S508) {
-                    if let Some(diagnostic) = flake8_bandit::rules::snmp_insecure_version(
-                        func,
-                        args,
-                        keywords,
-                        &self.from_imports,
-                        &self.import_aliases,
-                    ) {
-                        self.diagnostics.push(diagnostic);
-                    }
+                    flake8_bandit::rules::snmp_insecure_version(self, func, args, keywords);
                 }
                 if self.settings.enabled.contains(&RuleCode::S509) {
-                    if let Some(diagnostic) = flake8_bandit::rules::snmp_weak_cryptography(
-                        func,
-                        args,
-                        keywords,
-                        &self.from_imports,
-                        &self.import_aliases,
-                    ) {
-                        self.diagnostics.push(diagnostic);
-                    }
+                    flake8_bandit::rules::snmp_weak_cryptography(self, func, args, keywords);
                 }
                 if self.settings.enabled.contains(&RuleCode::S701) {
-                    if let Some(diagnostic) = flake8_bandit::rules::jinja2_autoescape_false(
-                        func,
-                        args,
-                        keywords,
-                        &self.from_imports,
-                        &self.import_aliases,
-                    ) {
-                        self.diagnostics.push(diagnostic);
-                    }
+                    flake8_bandit::rules::jinja2_autoescape_false(self, func, args, keywords);
                 }
                 if self.settings.enabled.contains(&RuleCode::S106) {
                     self.diagnostics
                         .extend(flake8_bandit::rules::hardcoded_password_func_arg(keywords));
                 }
                 if self.settings.enabled.contains(&RuleCode::S324) {
-                    if let Some(diagnostic) = flake8_bandit::rules::hashlib_insecure_hash_functions(
-                        func,
-                        args,
-                        keywords,
-                        &self.from_imports,
-                        &self.import_aliases,
-                    ) {
-                        self.diagnostics.push(diagnostic);
-                    }
+                    flake8_bandit::rules::hashlib_insecure_hash_functions(
+                        self, func, args, keywords,
+                    );
                 }
                 if self.settings.enabled.contains(&RuleCode::S113) {
-                    if let Some(diagnostic) = flake8_bandit::rules::request_without_timeout(
-                        func,
-                        args,
-                        keywords,
-                        &self.from_imports,
-                        &self.import_aliases,
-                    ) {
-                        self.diagnostics.push(diagnostic);
-                    }
+                    flake8_bandit::rules::request_without_timeout(self, func, args, keywords);
                 }
 
                 // flake8-comprehensions
@@ -2157,14 +2109,7 @@ where
 
                 // flake8-debugger
                 if self.settings.enabled.contains(&RuleCode::T100) {
-                    if let Some(diagnostic) = flake8_debugger::rules::debugger_call(
-                        expr,
-                        func,
-                        &self.from_imports,
-                        &self.import_aliases,
-                    ) {
-                        self.diagnostics.push(diagnostic);
-                    }
+                    flake8_debugger::rules::debugger_call(self, expr, func);
                 }
 
                 // pandas-vet
@@ -2191,7 +2136,7 @@ where
                                             if let BindingKind::Importation(.., module) =
                                                 &binding.kind
                                             {
-                                                module != "pandas"
+                                                module != &"pandas"
                                             } else {
                                                 matches!(
                                                     binding.kind,
@@ -2590,6 +2535,14 @@ where
                     );
                 }
 
+                if self.settings.enabled.contains(&RuleCode::PLR0133) {
+                    pylint::rules::constant_comparison(self, left, ops, comparators);
+                }
+
+                if self.settings.enabled.contains(&RuleCode::PLR2004) {
+                    pylint::rules::magic_value_comparison(self, left, comparators);
+                }
+
                 if self.settings.enabled.contains(&RuleCode::SIM118) {
                     flake8_simplify::rules::key_in_dict_compare(self, expr, left, ops, comparators);
                 }
@@ -2739,15 +2692,19 @@ where
                 args,
                 keywords,
             } => {
-                let call_path = dealias_call_path(collect_call_paths(func), &self.import_aliases);
-                if self.match_typing_call_path(&call_path, "ForwardRef") {
+                let call_path = self.resolve_call_path(func);
+                if call_path.as_ref().map_or(false, |call_path| {
+                    self.match_typing_call_path(call_path, "ForwardRef")
+                }) {
                     self.visit_expr(func);
                     for expr in args {
                         self.in_type_definition = true;
                         self.visit_expr(expr);
                         self.in_type_definition = prev_in_type_definition;
                     }
-                } else if self.match_typing_call_path(&call_path, "cast") {
+                } else if call_path.as_ref().map_or(false, |call_path| {
+                    self.match_typing_call_path(call_path, "cast")
+                }) {
                     self.visit_expr(func);
                     if !args.is_empty() {
                         self.in_type_definition = true;
@@ -2757,14 +2714,18 @@ where
                     for expr in args.iter().skip(1) {
                         self.visit_expr(expr);
                     }
-                } else if self.match_typing_call_path(&call_path, "NewType") {
+                } else if call_path.as_ref().map_or(false, |call_path| {
+                    self.match_typing_call_path(call_path, "NewType")
+                }) {
                     self.visit_expr(func);
                     for expr in args.iter().skip(1) {
                         self.in_type_definition = true;
                         self.visit_expr(expr);
                         self.in_type_definition = prev_in_type_definition;
                     }
-                } else if self.match_typing_call_path(&call_path, "TypeVar") {
+                } else if call_path.as_ref().map_or(false, |call_path| {
+                    self.match_typing_call_path(call_path, "TypeVar")
+                }) {
                     self.visit_expr(func);
                     for expr in args.iter().skip(1) {
                         self.in_type_definition = true;
@@ -2785,7 +2746,9 @@ where
                             }
                         }
                     }
-                } else if self.match_typing_call_path(&call_path, "NamedTuple") {
+                } else if call_path.as_ref().map_or(false, |call_path| {
+                    self.match_typing_call_path(call_path, "NamedTuple")
+                }) {
                     self.visit_expr(func);
 
                     // Ex) NamedTuple("a", [("a", int)])
@@ -2821,7 +2784,9 @@ where
                         self.visit_expr(value);
                         self.in_type_definition = prev_in_type_definition;
                     }
-                } else if self.match_typing_call_path(&call_path, "TypedDict") {
+                } else if call_path.as_ref().map_or(false, |call_path| {
+                    self.match_typing_call_path(call_path, "TypedDict")
+                }) {
                     self.visit_expr(func);
 
                     // Ex) TypedDict("a", {"a": int})
@@ -2847,12 +2812,11 @@ where
                         self.visit_expr(value);
                         self.in_type_definition = prev_in_type_definition;
                     }
-                } else if ["Arg", "DefaultArg", "NamedArg", "DefaultNamedArg"]
-                    .iter()
-                    .any(|target| {
-                        match_call_path(&call_path, "mypy_extensions", target, &self.from_imports)
-                    })
-                {
+                } else if call_path.as_ref().map_or(false, |call_path| {
+                    ["Arg", "DefaultArg", "NamedArg", "DefaultNamedArg"]
+                        .iter()
+                        .any(|target| *call_path == ["mypy_extensions", target])
+                }) {
                     self.visit_expr(func);
 
                     // Ex) DefaultNamedArg(bool | None, name="some_prop_name")
@@ -2886,13 +2850,7 @@ where
                     self.in_subscript = true;
                     visitor::walk_expr(self, expr);
                 } else {
-                    match typing::match_annotated_subscript(
-                        value,
-                        &self.from_imports,
-                        &self.import_aliases,
-                        self.settings.typing_modules.iter().map(String::as_str),
-                        |member| self.is_builtin(member),
-                    ) {
+                    match typing::match_annotated_subscript(self, value) {
                         Some(subscript) => {
                             match subscript {
                                 // Ex) Optional[int]
@@ -3419,23 +3377,37 @@ impl<'a> Checker<'a> {
                     //   import pyarrow as pa
                     //   import pyarrow.csv
                     //   print(pa.csv.read_csv("test.csv"))
-                    if let BindingKind::Importation(name, full_name)
-                    | BindingKind::FromImportation(name, full_name)
-                    | BindingKind::SubmoduleImportation(name, full_name) =
-                        &self.bindings[*index].kind
-                    {
-                        let has_alias = full_name
-                            .split('.')
-                            .last()
-                            .map(|segment| segment != name)
-                            .unwrap_or_default();
-                        if has_alias {
-                            // Mark the sub-importation as used.
-                            if let Some(index) = scope.values.get(full_name.as_str()) {
-                                self.bindings[*index].used =
-                                    Some((scope_id, Range::from_located(expr)));
+                    match &self.bindings[*index].kind {
+                        BindingKind::Importation(name, full_name)
+                        | BindingKind::SubmoduleImportation(name, full_name) => {
+                            let has_alias = full_name
+                                .split('.')
+                                .last()
+                                .map(|segment| &segment != name)
+                                .unwrap_or_default();
+                            if has_alias {
+                                // Mark the sub-importation as used.
+                                if let Some(index) = scope.values.get(full_name) {
+                                    self.bindings[*index].used =
+                                        Some((scope_id, Range::from_located(expr)));
+                                }
                             }
                         }
+                        BindingKind::FromImportation(name, full_name) => {
+                            let has_alias = full_name
+                                .split('.')
+                                .last()
+                                .map(|segment| &segment != name)
+                                .unwrap_or_default();
+                            if has_alias {
+                                // Mark the sub-importation as used.
+                                if let Some(index) = scope.values.get(full_name.as_str()) {
+                                    self.bindings[*index].used =
+                                        Some((scope_id, Range::from_located(expr)));
+                                }
+                            }
+                        }
+                        _ => {}
                     }
 
                     return;
@@ -3689,6 +3661,7 @@ impl<'a> Checker<'a> {
                 docstring,
             },
             self.visible_scope.visibility.clone(),
+            (self.scope_stack.clone(), self.parents.clone()),
         ));
         docstring.is_some()
     }
@@ -3960,9 +3933,12 @@ impl<'a> Checker<'a> {
                 {
                     let binding = &self.bindings[*index];
 
-                    let (BindingKind::Importation(_, full_name)
-                    | BindingKind::SubmoduleImportation(_, full_name)
-                    | BindingKind::FromImportation(_, full_name)) = &binding.kind else { continue; };
+                    let full_name = match &binding.kind {
+                        BindingKind::Importation(.., full_name) => full_name,
+                        BindingKind::FromImportation(.., full_name) => full_name.as_str(),
+                        BindingKind::SubmoduleImportation(.., full_name) => full_name,
+                        _ => continue,
+                    };
 
                     // Skip used exports from `__all__`
                     if binding.used.is_some()
@@ -4142,7 +4118,10 @@ impl<'a> Checker<'a> {
 
         let mut overloaded_name: Option<String> = None;
         self.definitions.reverse();
-        while let Some((definition, visibility)) = self.definitions.pop() {
+        while let Some((definition, visibility, (scopes, parents))) = self.definitions.pop() {
+            self.scope_stack = scopes.clone();
+            self.parents = parents.clone();
+
             // flake8-annotations
             if enforce_annotations {
                 // TODO(charlie): This should be even stricter, in that an overload
@@ -4355,13 +4334,13 @@ pub fn check_ast(
     let mut allocator = vec![];
     checker.check_deferred_string_type_definitions(&mut allocator);
 
+    // Check docstrings.
+    checker.check_definitions();
+
     // Reset the scope to module-level, and check all consumed scopes.
     checker.scope_stack = vec![GLOBAL_SCOPE_INDEX];
     checker.pop_scope();
     checker.check_dead_scopes();
 
-    // Check docstrings.
-    checker.check_definitions();
-
     checker.diagnostics
 }

src/checkers/imports.rs

@@ -6,9 +6,9 @@ use rustpython_parser::ast::Suite;
 
 use crate::ast::visitor::Visitor;
 use crate::directives::IsortDirectives;
-use crate::isort;
-use crate::isort::track::{Block, ImportTracker};
 use crate::registry::{Diagnostic, RuleCode};
+use crate::rules::isort;
+use crate::rules::isort::track::{Block, ImportTracker};
 use crate::settings::{flags, Settings};
 use crate::source_code::{Locator, Stylist};
 

src/checkers/lines.rs

@@ -1,9 +1,11 @@
 //! Lint rules based on checking raw physical lines.
 
-use crate::pycodestyle::rules::{doc_line_too_long, line_too_long, no_newline_at_end_of_file};
-use crate::pygrep_hooks::rules::{blanket_noqa, blanket_type_ignore};
-use crate::pyupgrade::rules::unnecessary_coding_comment;
 use crate::registry::{Diagnostic, RuleCode};
+use crate::rules::pycodestyle::rules::{
+    doc_line_too_long, line_too_long, no_newline_at_end_of_file,
+};
+use crate::rules::pygrep_hooks::rules::{blanket_noqa, blanket_type_ignore};
+use crate::rules::pyupgrade::rules::unnecessary_coding_comment;
 use crate::settings::{flags, Settings};
 
 pub fn check_lines(

src/checkers/tokens.rs

@@ -4,10 +4,10 @@ use rustpython_parser::lexer::{LexResult, Tok};
 
 use crate::lex::docstring_detection::StateMachine;
 use crate::registry::{Diagnostic, RuleCode};
-use crate::ruff::rules::Context;
+use crate::rules::ruff::rules::Context;
+use crate::rules::{eradicate, flake8_implicit_str_concat, flake8_quotes, pycodestyle, ruff};
 use crate::settings::{flags, Settings};
 use crate::source_code::Locator;
-use crate::{eradicate, flake8_implicit_str_concat, flake8_quotes, pycodestyle, ruff};
 
 pub fn check_tokens(
     locator: &Locator,
@@ -105,7 +105,7 @@ pub fn check_tokens(
     // ISC001, ISC002
     if enforce_implicit_string_concatenation {
         diagnostics.extend(
-            flake8_implicit_str_concat::rules::implicit(tokens, locator)
+            flake8_implicit_str_concat::rules::implicit(tokens)
                 .into_iter()
                 .filter(|diagnostic| settings.enabled.contains(diagnostic.kind.code())),
         );

src/flake8_annotations/snapshots/ruff__flake8_annotations__tests__suppress_dummy_args.snap

@@ -1,6 +0,0 @@
----
-source: src/flake8_annotations/mod.rs
-expression: checks
----
-[]
-

src/flake8_bandit/rules/hashlib_insecure_hash_functions.rs

@@ -1,67 +0,0 @@
-use rustc_hash::{FxHashMap, FxHashSet};
-use rustpython_ast::{Constant, Expr, ExprKind, Keyword};
-
-use crate::ast::helpers::{match_module_member, SimpleCallArgs};
-use crate::ast::types::Range;
-use crate::flake8_bandit::helpers::string_literal;
-use crate::registry::Diagnostic;
-use crate::violations;
-
-const WEAK_HASHES: [&str; 4] = ["md4", "md5", "sha", "sha1"];
-
-fn is_used_for_security(call_args: &SimpleCallArgs) -> bool {
-    match call_args.get_argument("usedforsecurity", None) {
-        Some(expr) => !matches!(
-            &expr.node,
-            ExprKind::Constant {
-                value: Constant::Bool(false),
-                ..
-            }
-        ),
-        _ => true,
-    }
-}
-
-/// S324
-pub fn hashlib_insecure_hash_functions(
-    func: &Expr,
-    args: &[Expr],
-    keywords: &[Keyword],
-    from_imports: &FxHashMap<&str, FxHashSet<&str>>,
-    import_aliases: &FxHashMap<&str, &str>,
-) -> Option<Diagnostic> {
-    if match_module_member(func, "hashlib", "new", from_imports, import_aliases) {
-        let call_args = SimpleCallArgs::new(args, keywords);
-
-        if !is_used_for_security(&call_args) {
-            return None;
-        }
-
-        if let Some(name_arg) = call_args.get_argument("name", Some(0)) {
-            let hash_func_name = string_literal(name_arg)?;
-
-            if WEAK_HASHES.contains(&hash_func_name.to_lowercase().as_str()) {
-                return Some(Diagnostic::new(
-                    violations::HashlibInsecureHashFunction(hash_func_name.to_string()),
-                    Range::from_located(name_arg),
-                ));
-            }
-        }
-    } else {
-        for func_name in &WEAK_HASHES {
-            if match_module_member(func, "hashlib", func_name, from_imports, import_aliases) {
-                let call_args = SimpleCallArgs::new(args, keywords);
-
-                if !is_used_for_security(&call_args) {
-                    return None;
-                }
-
-                return Some(Diagnostic::new(
-                    violations::HashlibInsecureHashFunction((*func_name).to_string()),
-                    Range::from_located(func),
-                ));
-            }
-        }
-    }
-    None
-}

src/flake8_bandit/rules/request_with_no_cert_validation.rs

@@ -1,70 +0,0 @@
-use rustc_hash::{FxHashMap, FxHashSet};
-use rustpython_ast::{Expr, ExprKind, Keyword};
-use rustpython_parser::ast::Constant;
-
-use crate::ast::helpers::{collect_call_paths, dealias_call_path, match_call_path, SimpleCallArgs};
-use crate::ast::types::Range;
-use crate::registry::Diagnostic;
-use crate::violations;
-
-const REQUESTS_HTTP_VERBS: [&str; 7] = ["get", "options", "head", "post", "put", "patch", "delete"];
-const HTTPX_METHODS: [&str; 11] = [
-    "get",
-    "options",
-    "head",
-    "post",
-    "put",
-    "patch",
-    "delete",
-    "request",
-    "stream",
-    "Client",
-    "AsyncClient",
-];
-
-/// S501
-pub fn request_with_no_cert_validation(
-    func: &Expr,
-    args: &[Expr],
-    keywords: &[Keyword],
-    from_imports: &FxHashMap<&str, FxHashSet<&str>>,
-    import_aliases: &FxHashMap<&str, &str>,
-) -> Option<Diagnostic> {
-    let call_path = dealias_call_path(collect_call_paths(func), import_aliases);
-    let call_args = SimpleCallArgs::new(args, keywords);
-
-    for func_name in &REQUESTS_HTTP_VERBS {
-        if match_call_path(&call_path, "requests", func_name, from_imports) {
-            if let Some(verify_arg) = call_args.get_argument("verify", None) {
-                if let ExprKind::Constant {
-                    value: Constant::Bool(false),
-                    ..
-                } = &verify_arg.node
-                {
-                    return Some(Diagnostic::new(
-                        violations::RequestWithNoCertValidation("requests".to_string()),
-                        Range::from_located(verify_arg),
-                    ));
-                }
-            }
-        }
-    }
-
-    for func_name in &HTTPX_METHODS {
-        if match_call_path(&call_path, "httpx", func_name, from_imports) {
-            if let Some(verify_arg) = call_args.get_argument("verify", None) {
-                if let ExprKind::Constant {
-                    value: Constant::Bool(false),
-                    ..
-                } = &verify_arg.node
-                {
-                    return Some(Diagnostic::new(
-                        violations::RequestWithNoCertValidation("httpx".to_string()),
-                        Range::from_located(verify_arg),
-                    ));
-                }
-            }
-        }
-    }
-    None
-}

src/flake8_bandit/rules/request_without_timeout.rs

@@ -1,46 +0,0 @@
-use rustc_hash::{FxHashMap, FxHashSet};
-use rustpython_ast::{Expr, ExprKind, Keyword};
-use rustpython_parser::ast::Constant;
-
-use crate::ast::helpers::{collect_call_paths, dealias_call_path, match_call_path, SimpleCallArgs};
-use crate::ast::types::Range;
-use crate::registry::Diagnostic;
-use crate::violations;
-
-const HTTP_VERBS: [&str; 7] = ["get", "options", "head", "post", "put", "patch", "delete"];
-
-/// S113
-pub fn request_without_timeout(
-    func: &Expr,
-    args: &[Expr],
-    keywords: &[Keyword],
-    from_imports: &FxHashMap<&str, FxHashSet<&str>>,
-    import_aliases: &FxHashMap<&str, &str>,
-) -> Option<Diagnostic> {
-    let call_path = dealias_call_path(collect_call_paths(func), import_aliases);
-    for func_name in &HTTP_VERBS {
-        if match_call_path(&call_path, "requests", func_name, from_imports) {
-            let call_args = SimpleCallArgs::new(args, keywords);
-            if let Some(timeout_arg) = call_args.get_argument("timeout", None) {
-                if let Some(timeout) = match &timeout_arg.node {
-                    ExprKind::Constant {
-                        value: value @ Constant::None,
-                        ..
-                    } => Some(value.to_string()),
-                    _ => None,
-                } {
-                    return Some(Diagnostic::new(
-                        violations::RequestWithoutTimeout(Some(timeout)),
-                        Range::from_located(timeout_arg),
-                    ));
-                }
-            } else {
-                return Some(Diagnostic::new(
-                    violations::RequestWithoutTimeout(None),
-                    Range::from_located(func),
-                ));
-            }
-        }
-    }
-    None
-}

src/flake8_bandit/rules/snmp_weak_cryptography.rs

@@ -1,30 +0,0 @@
-use rustc_hash::{FxHashMap, FxHashSet};
-use rustpython_ast::{Expr, Keyword};
-
-use crate::ast::helpers::{collect_call_paths, dealias_call_path, match_call_path, SimpleCallArgs};
-use crate::ast::types::Range;
-use crate::registry::Diagnostic;
-use crate::violations;
-
-/// S509
-pub fn snmp_weak_cryptography(
-    func: &Expr,
-    args: &[Expr],
-    keywords: &[Keyword],
-    from_imports: &FxHashMap<&str, FxHashSet<&str>>,
-    import_aliases: &FxHashMap<&str, &str>,
-) -> Option<Diagnostic> {
-    let call_path = dealias_call_path(collect_call_paths(func), import_aliases);
-
-    if match_call_path(&call_path, "pysnmp.hlapi", "UsmUserData", from_imports) {
-        let call_args = SimpleCallArgs::new(args, keywords);
-
-        if call_args.len() < 3 {
-            return Some(Diagnostic::new(
-                violations::SnmpWeakCryptography,
-                Range::from_located(func),
-            ));
-        }
-    }
-    None
-}

src/flake8_bandit/rules/unsafe_yaml_load.rs

@@ -1,51 +0,0 @@
-use rustc_hash::{FxHashMap, FxHashSet};
-use rustpython_ast::{Expr, ExprKind, Keyword};
-
-use crate::ast::helpers::{match_module_member, SimpleCallArgs};
-use crate::ast::types::Range;
-use crate::registry::Diagnostic;
-use crate::violations;
-
-/// S506
-pub fn unsafe_yaml_load(
-    func: &Expr,
-    args: &[Expr],
-    keywords: &[Keyword],
-    from_imports: &FxHashMap<&str, FxHashSet<&str>>,
-    import_aliases: &FxHashMap<&str, &str>,
-) -> Option<Diagnostic> {
-    if match_module_member(func, "yaml", "load", from_imports, import_aliases) {
-        let call_args = SimpleCallArgs::new(args, keywords);
-        if let Some(loader_arg) = call_args.get_argument("Loader", Some(1)) {
-            if !match_module_member(
-                loader_arg,
-                "yaml",
-                "SafeLoader",
-                from_imports,
-                import_aliases,
-            ) && !match_module_member(
-                loader_arg,
-                "yaml",
-                "CSafeLoader",
-                from_imports,
-                import_aliases,
-            ) {
-                let loader = match &loader_arg.node {
-                    ExprKind::Attribute { attr, .. } => Some(attr.to_string()),
-                    ExprKind::Name { id, .. } => Some(id.to_string()),
-                    _ => None,
-                };
-                return Some(Diagnostic::new(
-                    violations::UnsafeYAMLLoad(loader),
-                    Range::from_located(loader_arg),
-                ));
-            }
-        } else {
-            return Some(Diagnostic::new(
-                violations::UnsafeYAMLLoad(None),
-                Range::from_located(func),
-            ));
-        }
-    }
-    None
-}

src/flake8_bugbear/rules/mutable_argument_default.rs

@@ -1,174 +0,0 @@
-use rustc_hash::{FxHashMap, FxHashSet};
-use rustpython_ast::{Arguments, Constant, Expr, ExprKind, Operator};
-
-use crate::ast::helpers::{collect_call_paths, dealias_call_path, match_call_path};
-use crate::ast::types::Range;
-use crate::checkers::ast::Checker;
-use crate::registry::Diagnostic;
-use crate::violations;
-
-const MUTABLE_FUNCS: &[(&str, &str)] = &[
-    ("", "dict"),
-    ("", "list"),
-    ("", "set"),
-    ("collections", "Counter"),
-    ("collections", "OrderedDict"),
-    ("collections", "defaultdict"),
-    ("collections", "deque"),
-];
-
-const IMMUTABLE_TYPES: &[(&str, &str)] = &[
-    ("", "bool"),
-    ("", "bytes"),
-    ("", "complex"),
-    ("", "float"),
-    ("", "frozenset"),
-    ("", "int"),
-    ("", "object"),
-    ("", "range"),
-    ("", "str"),
-    ("collections.abc", "Sized"),
-    ("typing", "LiteralString"),
-    ("typing", "Sized"),
-];
-
-const IMMUTABLE_GENERIC_TYPES: &[(&str, &str)] = &[
-    ("", "tuple"),
-    ("collections.abc", "ByteString"),
-    ("collections.abc", "Collection"),
-    ("collections.abc", "Container"),
-    ("collections.abc", "Iterable"),
-    ("collections.abc", "Mapping"),
-    ("collections.abc", "Reversible"),
-    ("collections.abc", "Sequence"),
-    ("collections.abc", "Set"),
-    ("typing", "AbstractSet"),
-    ("typing", "ByteString"),
-    ("typing", "Callable"),
-    ("typing", "Collection"),
-    ("typing", "Container"),
-    ("typing", "FrozenSet"),
-    ("typing", "Iterable"),
-    ("typing", "Literal"),
-    ("typing", "Mapping"),
-    ("typing", "Never"),
-    ("typing", "NoReturn"),
-    ("typing", "Reversible"),
-    ("typing", "Sequence"),
-    ("typing", "Tuple"),
-];
-
-pub fn is_mutable_func(
-    expr: &Expr,
-    from_imports: &FxHashMap<&str, FxHashSet<&str>>,
-    import_aliases: &FxHashMap<&str, &str>,
-) -> bool {
-    let call_path = dealias_call_path(collect_call_paths(expr), import_aliases);
-    MUTABLE_FUNCS
-        .iter()
-        .any(|(module, member)| match_call_path(&call_path, module, member, from_imports))
-}
-
-fn is_mutable_expr(
-    expr: &Expr,
-    from_imports: &FxHashMap<&str, FxHashSet<&str>>,
-    import_aliases: &FxHashMap<&str, &str>,
-) -> bool {
-    match &expr.node {
-        ExprKind::List { .. }
-        | ExprKind::Dict { .. }
-        | ExprKind::Set { .. }
-        | ExprKind::ListComp { .. }
-        | ExprKind::DictComp { .. }
-        | ExprKind::SetComp { .. } => true,
-        ExprKind::Call { func, .. } => is_mutable_func(func, from_imports, import_aliases),
-        _ => false,
-    }
-}
-
-fn is_immutable_annotation(
-    expr: &Expr,
-    from_imports: &FxHashMap<&str, FxHashSet<&str>>,
-    import_aliases: &FxHashMap<&str, &str>,
-) -> bool {
-    match &expr.node {
-        ExprKind::Name { .. } | ExprKind::Attribute { .. } => {
-            let call_path = dealias_call_path(collect_call_paths(expr), import_aliases);
-            IMMUTABLE_TYPES
-                .iter()
-                .chain(IMMUTABLE_GENERIC_TYPES)
-                .any(|(module, member)| match_call_path(&call_path, module, member, from_imports))
-        }
-        ExprKind::Subscript { value, slice, .. } => {
-            let call_path = dealias_call_path(collect_call_paths(value), import_aliases);
-            if IMMUTABLE_GENERIC_TYPES
-                .iter()
-                .any(|(module, member)| match_call_path(&call_path, module, member, from_imports))
-            {
-                true
-            } else if match_call_path(&call_path, "typing", "Union", from_imports) {
-                if let ExprKind::Tuple { elts, .. } = &slice.node {
-                    elts.iter()
-                        .all(|elt| is_immutable_annotation(elt, from_imports, import_aliases))
-                } else {
-                    false
-                }
-            } else if match_call_path(&call_path, "typing", "Optional", from_imports) {
-                is_immutable_annotation(slice, from_imports, import_aliases)
-            } else if match_call_path(&call_path, "typing", "Annotated", from_imports) {
-                if let ExprKind::Tuple { elts, .. } = &slice.node {
-                    elts.first().map_or(false, |elt| {
-                        is_immutable_annotation(elt, from_imports, import_aliases)
-                    })
-                } else {
-                    false
-                }
-            } else {
-                false
-            }
-        }
-        ExprKind::BinOp {
-            left,
-            op: Operator::BitOr,
-            right,
-        } => {
-            is_immutable_annotation(left, from_imports, import_aliases)
-                && is_immutable_annotation(right, from_imports, import_aliases)
-        }
-        ExprKind::Constant {
-            value: Constant::None,
-            ..
-        } => true,
-        _ => false,
-    }
-}
-
-/// B006
-pub fn mutable_argument_default(checker: &mut Checker, arguments: &Arguments) {
-    // Scan in reverse order to right-align zip()
-    for (arg, default) in arguments
-        .kwonlyargs
-        .iter()
-        .rev()
-        .zip(arguments.kw_defaults.iter().rev())
-        .chain(
-            arguments
-                .args
-                .iter()
-                .rev()
-                .chain(arguments.posonlyargs.iter().rev())
-                .zip(arguments.defaults.iter().rev()),
-        )
-    {
-        if is_mutable_expr(default, &checker.from_imports, &checker.import_aliases)
-            && arg.node.annotation.as_ref().map_or(true, |expr| {
-                !is_immutable_annotation(expr, &checker.from_imports, &checker.import_aliases)
-            })
-        {
-            checker.diagnostics.push(Diagnostic::new(
-                violations::MutableArgumentDefault,
-                Range::from_located(default),
-            ));
-        }
-    }
-}

src/flake8_comprehensions/snapshots/ruff__flake8_comprehensions__tests__C405_C405.py.snap

@@ -1,73 +0,0 @@
----
-source: src/flake8_comprehensions/mod.rs
-expression: checks
----
-- kind:
-    UnnecessaryLiteralSet: list
-  location:
-    row: 1
-    column: 5
-  end_location:
-    row: 1
-    column: 16
-  fix:
-    content: "{1, 2}"
-    location:
-      row: 1
-      column: 5
-    end_location:
-      row: 1
-      column: 16
-  parent: ~
-- kind:
-    UnnecessaryLiteralSet: tuple
-  location:
-    row: 2
-    column: 5
-  end_location:
-    row: 2
-    column: 16
-  fix:
-    content: "{1, 2}"
-    location:
-      row: 2
-      column: 5
-    end_location:
-      row: 2
-      column: 16
-  parent: ~
-- kind:
-    UnnecessaryLiteralSet: list
-  location:
-    row: 3
-    column: 5
-  end_location:
-    row: 3
-    column: 12
-  fix:
-    content: set()
-    location:
-      row: 3
-      column: 5
-    end_location:
-      row: 3
-      column: 12
-  parent: ~
-- kind:
-    UnnecessaryLiteralSet: tuple
-  location:
-    row: 4
-    column: 5
-  end_location:
-    row: 4
-    column: 12
-  fix:
-    content: set()
-    location:
-      row: 4
-      column: 5
-    end_location:
-      row: 4
-      column: 12
-  parent: ~
-

src/flake8_debugger/rules.rs

@@ -1,71 +0,0 @@
-use rustc_hash::{FxHashMap, FxHashSet};
-use rustpython_ast::{Expr, Stmt};
-
-use crate::ast::helpers::{collect_call_paths, dealias_call_path, match_call_path};
-use crate::ast::types::Range;
-use crate::flake8_debugger::types::DebuggerUsingType;
-use crate::registry::Diagnostic;
-use crate::violations;
-
-const DEBUGGERS: &[(&str, &str)] = &[
-    ("pdb", "set_trace"),
-    ("pudb", "set_trace"),
-    ("ipdb", "set_trace"),
-    ("ipdb", "sset_trace"),
-    ("IPython.terminal.embed", "InteractiveShellEmbed"),
-    ("IPython.frontend.terminal.embed", "InteractiveShellEmbed"),
-    ("celery.contrib.rdb", "set_trace"),
-    ("builtins", "breakpoint"),
-    ("", "breakpoint"),
-];
-
-/// Checks for the presence of a debugger call.
-pub fn debugger_call(
-    expr: &Expr,
-    func: &Expr,
-    from_imports: &FxHashMap<&str, FxHashSet<&str>>,
-    import_aliases: &FxHashMap<&str, &str>,
-) -> Option<Diagnostic> {
-    let call_path = dealias_call_path(collect_call_paths(func), import_aliases);
-    if DEBUGGERS
-        .iter()
-        .any(|(module, member)| match_call_path(&call_path, module, member, from_imports))
-    {
-        Some(Diagnostic::new(
-            violations::Debugger(DebuggerUsingType::Call(call_path.join("."))),
-            Range::from_located(expr),
-        ))
-    } else {
-        None
-    }
-}
-
-/// Checks for the presence of a debugger import.
-pub fn debugger_import(stmt: &Stmt, module: Option<&str>, name: &str) -> Option<Diagnostic> {
-    // Special-case: allow `import builtins`, which is far more general than (e.g.)
-    // `import celery.contrib.rdb`).
-    if module.is_none() && name == "builtins" {
-        return None;
-    }
-
-    if let Some(module) = module {
-        if let Some((module_name, member)) = DEBUGGERS
-            .iter()
-            .find(|(module_name, member)| module_name == &module && member == &name)
-        {
-            return Some(Diagnostic::new(
-                violations::Debugger(DebuggerUsingType::Import(format!("{module_name}.{member}"))),
-                Range::from_located(stmt),
-            ));
-        }
-    } else if DEBUGGERS
-        .iter()
-        .any(|(module_name, ..)| module_name == &name)
-    {
-        return Some(Diagnostic::new(
-            violations::Debugger(DebuggerUsingType::Import(name.to_string())),
-            Range::from_located(stmt),
-        ));
-    }
-    None
-}

src/flake8_quotes/snapshots/ruff__flake8_quotes__tests__doubles_doubles_noqa.py.snap

@@ -1,6 +0,0 @@
----
-source: src/flake8_quotes/mod.rs
-expression: checks
----
-[]
-

src/flake8_quotes/snapshots/ruff__flake8_quotes__tests__doubles_doubles_wrapped.py.snap

@@ -1,6 +0,0 @@
----
-source: src/flake8_quotes/mod.rs
-expression: checks
----
-[]
-

src/flake8_quotes/snapshots/ruff__flake8_quotes__tests__singles_singles_noqa.py.snap

@@ -1,6 +0,0 @@
----
-source: src/flake8_quotes/mod.rs
-expression: checks
----
-[]
-

src/flake8_quotes/snapshots/ruff__flake8_quotes__tests__singles_singles_wrapped.py.snap

@@ -1,6 +0,0 @@
----
-source: src/flake8_quotes/mod.rs
-expression: checks
----
-[]
-

src/flake8_simplify/rules/ast_with.rs

@@ -1,22 +0,0 @@
-use rustpython_ast::{Stmt, StmtKind};
-
-use crate::ast::types::Range;
-use crate::checkers::ast::Checker;
-use crate::registry::Diagnostic;
-use crate::violations;
-
-/// SIM117
-pub fn multiple_with_statements(checker: &mut Checker, stmt: &Stmt) {
-    let StmtKind::With { body, .. } = &stmt.node else {
-        return;
-    };
-    if body.len() != 1 {
-        return;
-    }
-    if matches!(body[0].node, StmtKind::With { .. }) {
-        checker.diagnostics.push(Diagnostic::new(
-            violations::MultipleWithStatements,
-            Range::from_located(stmt),
-        ));
-    }
-}

src/flake8_simplify/snapshots/ruff__flake8_simplify__tests__SIM117_SIM117.py.snap

@@ -1,15 +0,0 @@
----
-source: src/flake8_simplify/mod.rs
-expression: checks
----
-- kind:
-    MultipleWithStatements: ~
-  location:
-    row: 1
-    column: 0
-  end_location:
-    row: 3
-    column: 22
-  fix: ~
-  parent: ~
-

src/flake8_tidy_imports/snapshots/ruff__flake8_tidy_imports__tests__banned_api_false_positives.snap

@@ -1,41 +0,0 @@
----
-source: src/flake8_tidy_imports/mod.rs
-expression: checks
----
-- kind:
-    BannedApi:
-      name: typing.TypedDict
-      message: Use typing_extensions.TypedDict instead.
-  location:
-    row: 2
-    column: 7
-  end_location:
-    row: 2
-    column: 23
-  fix: ~
-  parent: ~
-- kind:
-    BannedApi:
-      name: typing.TypedDict
-      message: Use typing_extensions.TypedDict instead.
-  location:
-    row: 7
-    column: 0
-  end_location:
-    row: 7
-    column: 16
-  fix: ~
-  parent: ~
-- kind:
-    BannedApi:
-      name: typing.TypedDict
-      message: Use typing_extensions.TypedDict instead.
-  location:
-    row: 11
-    column: 4
-  end_location:
-    row: 11
-    column: 20
-  fix: ~
-  parent: ~
-

src/flake8_to_ruff/black.rs

@@ -3,9 +3,10 @@
 use std::path::Path;
 
 use anyhow::Result;
-use ruff::settings::types::PythonVersion;
 use serde::{Deserialize, Serialize};
 
+use crate::settings::types::PythonVersion;
+
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
 pub struct Black {
     #[serde(alias = "line-length", alias = "line_length")]

src/flake8_to_ruff/converter.rs

@@ -2,24 +2,26 @@ use std::collections::{BTreeSet, HashMap};
 
 use anyhow::Result;
 use colored::Colorize;
-use ruff::flake8_pytest_style::types::{
+
+use super::black::Black;
+use super::plugin::Plugin;
+use super::{parser, plugin};
+use crate::registry::RuleCodePrefix;
+use crate::rules::flake8_pytest_style::types::{
     ParametrizeNameType, ParametrizeValuesRowType, ParametrizeValuesType,
 };
-use ruff::flake8_quotes::settings::Quote;
-use ruff::flake8_tidy_imports::settings::Strictness;
-use ruff::pydocstyle::settings::Convention;
-use ruff::registry::RuleCodePrefix;
-use ruff::settings::options::Options;
-use ruff::settings::pyproject::Pyproject;
-use ruff::{
+use crate::rules::flake8_quotes::settings::Quote;
+use crate::rules::flake8_tidy_imports::settings::Strictness;
+use crate::rules::pydocstyle::settings::Convention;
+use crate::rules::{
     flake8_annotations, flake8_bugbear, flake8_errmsg, flake8_pytest_style, flake8_quotes,
-    flake8_tidy_imports, mccabe, pep8_naming, pydocstyle, warn_user,
+    flake8_tidy_imports, mccabe, pep8_naming, pydocstyle,
 };
+use crate::settings::options::Options;
+use crate::settings::pyproject::Pyproject;
+use crate::warn_user;
 
-use crate::black::Black;
-use crate::plugin::Plugin;
-use crate::{parser, plugin};
-
+#[allow(clippy::unnecessary_wraps)]
 pub fn convert(
     config: &HashMap<String, HashMap<String, Option<String>>>,
     black: Option<&Black>,
@@ -388,14 +390,14 @@ mod tests {
     use std::collections::HashMap;
 
     use anyhow::Result;
-    use ruff::pydocstyle::settings::Convention;
-    use ruff::registry::RuleCodePrefix;
-    use ruff::settings::options::Options;
-    use ruff::settings::pyproject::Pyproject;
-    use ruff::{flake8_quotes, pydocstyle};
 
-    use crate::converter::convert;
-    use crate::plugin::Plugin;
+    use super::super::plugin::Plugin;
+    use super::convert;
+    use crate::registry::RuleCodePrefix;
+    use crate::rules::pydocstyle::settings::Convention;
+    use crate::rules::{flake8_quotes, pydocstyle};
+    use crate::settings::options::Options;
+    use crate::settings::pyproject::Pyproject;
 
     #[test]
     fn it_converts_empty() -> Result<()> {
@@ -423,6 +425,7 @@ mod tests {
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: None,
+            namespace_packages: None,
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
@@ -488,6 +491,7 @@ mod tests {
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: Some(100),
+            namespace_packages: None,
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
@@ -553,6 +557,7 @@ mod tests {
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: Some(100),
+            namespace_packages: None,
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
@@ -618,6 +623,7 @@ mod tests {
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: None,
+            namespace_packages: None,
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
@@ -683,6 +689,7 @@ mod tests {
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: None,
+            namespace_packages: None,
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
@@ -756,6 +763,7 @@ mod tests {
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: None,
+            namespace_packages: None,
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,
@@ -824,6 +832,7 @@ mod tests {
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: None,
+            namespace_packages: None,
             per_file_ignores: None,
             required_version: None,
             respect_gitignore: None,

src/flake8_to_ruff/mod.rs

@@ -0,0 +1,8 @@
+mod black;
+mod converter;
+mod parser;
+mod plugin;
+
+pub use black::parse_black_options;
+pub use converter::convert;
+pub use plugin::Plugin;

src/flake8_to_ruff/parser.rs

@@ -4,11 +4,12 @@ use anyhow::{bail, Result};
 use colored::Colorize;
 use once_cell::sync::Lazy;
 use regex::Regex;
-use ruff::registry::{RuleCodePrefix, PREFIX_REDIRECTS};
-use ruff::settings::types::PatternPrefixPair;
-use ruff::warn_user;
 use rustc_hash::FxHashMap;
 
+use crate::registry::{RuleCodePrefix, PREFIX_REDIRECTS};
+use crate::settings::types::PatternPrefixPair;
+use crate::warn_user;
+
 static COMMA_SEPARATED_LIST_RE: Lazy<Regex> = Lazy::new(|| Regex::new(r"[,\s]").unwrap());
 
 /// Parse a comma-separated list of `RuleCodePrefix` values (e.g.,
@@ -203,10 +204,10 @@ pub fn collect_per_file_ignores(
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use ruff::registry::RuleCodePrefix;
-    use ruff::settings::types::PatternPrefixPair;
 
-    use crate::parser::{parse_files_to_codes_mapping, parse_prefix_codes, parse_strings};
+    use super::{parse_files_to_codes_mapping, parse_prefix_codes, parse_strings};
+    use crate::registry::RuleCodePrefix;
+    use crate::settings::types::PatternPrefixPair;
 
     #[test]
     fn it_parses_prefix_codes() {

src/flake8_to_ruff/plugin.rs

@@ -3,7 +3,8 @@ use std::fmt;
 use std::str::FromStr;
 
 use anyhow::anyhow;
-use ruff::registry::RuleCodePrefix;
+
+use crate::registry::RuleCodePrefix;
 
 #[derive(Clone, Ord, PartialOrd, Eq, PartialEq)]
 pub enum Plugin {
@@ -298,7 +299,7 @@ pub fn resolve_select(plugins: &[Plugin]) -> BTreeSet<RuleCodePrefix> {
 mod tests {
     use std::collections::HashMap;
 
-    use crate::plugin::{infer_plugins_from_options, Plugin};
+    use super::{infer_plugins_from_options, Plugin};
 
     #[test]
     fn it_infers_plugins() {

src/fs.rs

@@ -66,7 +66,7 @@ pub fn relativize_path(path: &Path) -> Cow<str> {
 }
 
 /// Read a file's contents from disk.
-pub(crate) fn read_file<P: AsRef<Path>>(path: P) -> Result<String> {
+pub fn read_file<P: AsRef<Path>>(path: P) -> Result<String> {
     let file = File::open(path)?;
     let mut buf_reader = BufReader::new(file);
     let mut contents = String::new();

src/isort/snapshots/ruff__isort__tests__no_reorder_within_section.py.snap

@@ -1,6 +0,0 @@
----
-source: src/isort/mod.rs
-expression: checks
----
-[]
-

src/isort/snapshots/ruff__isort__tests__required_import_empty.py.snap

@@ -1,6 +0,0 @@
----
-source: src/isort/mod.rs
-expression: diagnostics
----
-[]
-

src/isort/snapshots/ruff__isort__tests__required_imports_docstring_only.py.snap

@@ -1,6 +0,0 @@
----
-source: src/isort/mod.rs
-expression: diagnostics
----
-[]
-

src/isort/snapshots/ruff__isort__tests__required_imports_empty.py.snap

@@ -1,6 +0,0 @@
----
-source: src/isort/mod.rs
-expression: diagnostics
----
-[]
-

src/isort/snapshots/ruff__isort__tests__skip_file.py.snap

@@ -1,6 +0,0 @@
----
-source: src/isort/mod.rs
-expression: checks
----
-[]
-

src/isort/snapshots/ruff__isort__tests__split.py.snap

@@ -1,6 +0,0 @@
----
-source: src/isort/mod.rs
-expression: checks
----
-[]
-

src/isort/snapshots/ruff__isort__tests__straight_required_import_docstring_only.py.snap

@@ -1,6 +0,0 @@
----
-source: src/isort/mod.rs
-expression: diagnostics
----
-[]
-

src/isort/snapshots/ruff__isort__tests__straight_required_import_empty.py.snap

@@ -1,6 +0,0 @@
----
-source: src/isort/mod.rs
-expression: diagnostics
----
-[]
-

src/isort/snapshots/ruff__isort__tests__type_comments.py.snap

@@ -1,6 +0,0 @@
----
-source: src/isort/mod.rs
-expression: checks
----
-[]
-

src/lex/docstring_detection.rs

@@ -43,7 +43,10 @@ impl StateMachine {
     }
 
     pub fn consume(&mut self, tok: &Tok) -> bool {
-        if matches!(tok, Tok::Newline | Tok::Indent | Tok::Dedent) {
+        if matches!(
+            tok,
+            Tok::NonLogicalNewline | Tok::Newline | Tok::Indent | Tok::Dedent | Tok::Comment(..)
+        ) {
             return false;
         }
 

src/lib.rs

@@ -1,3 +1,9 @@
+//! This is the library for the [Ruff] Python linter.
+//!
+//! **The API is currently completely unstable**
+//! and subject to change drastically.
+//!
+//! [Ruff]: https://github.com/charliermarsh/ruff
 #![allow(
     clippy::collapsible_else_if,
     clippy::collapsible_if,
@@ -12,61 +18,28 @@
 )]
 #![forbid(unsafe_code)]
 
+extern crate core;
+
 mod ast;
 mod autofix;
-mod cache;
+pub mod cache;
 mod checkers;
-pub mod cli;
 mod cst;
-mod diagnostics;
 mod directives;
 mod doc_lines;
 mod docstrings;
-mod eradicate;
 pub mod fix;
-mod flake8_2020;
-pub mod flake8_annotations;
-pub mod flake8_bandit;
-mod flake8_blind_except;
-pub mod flake8_boolean_trap;
-pub mod flake8_bugbear;
-mod flake8_builtins;
-mod flake8_comprehensions;
-mod flake8_datetimez;
-mod flake8_debugger;
-pub mod flake8_errmsg;
-mod flake8_implicit_str_concat;
-mod flake8_import_conventions;
-pub mod flake8_pie;
-mod flake8_print;
-pub mod flake8_pytest_style;
-pub mod flake8_quotes;
-mod flake8_return;
-mod flake8_simplify;
-pub mod flake8_tidy_imports;
-mod flake8_unused_arguments;
+pub mod flake8_to_ruff;
 pub mod fs;
-mod isort;
-pub mod iterators;
 mod lex;
 pub mod linter;
 pub mod logging;
-pub mod mccabe;
 pub mod message;
 mod noqa;
-mod pandas_vet;
-pub mod pep8_naming;
-pub mod printer;
-mod pycodestyle;
-pub mod pydocstyle;
-mod pyflakes;
-mod pygrep_hooks;
-mod pylint;
 mod python;
-mod pyupgrade;
 pub mod registry;
 pub mod resolver;
-mod ruff;
+mod rules;
 mod rustpython_helpers;
 pub mod settings;
 pub mod source_code;
@@ -76,14 +49,12 @@ mod violations;
 mod visibility;
 
 use cfg_if::cfg_if;
+pub use violations::IOError;
 
 cfg_if! {
     if #[cfg(not(target_family = "wasm"))] {
-        pub mod commands;
-        mod packaging;
+        pub mod packaging;
 
-        #[cfg(all(feature = "update-informer"))]
-        pub mod updates;
 
         mod lib_native;
         pub use lib_native::check;

src/lib_native.rs

@@ -51,7 +51,7 @@ pub fn check(path: &Path, contents: &str, autofix: bool) -> Result<Vec<Diagnosti
     // Generate diagnostics.
     let diagnostics = check_path(
         path,
-        packaging::detect_package_root(path),
+        packaging::detect_package_root(path, &settings.namespace_packages),
         contents,
         tokens,
         &locator,

src/lib_wasm.rs

@@ -5,19 +5,20 @@ use rustpython_parser::lexer::LexResult;
 use serde::Serialize;
 use wasm_bindgen::prelude::*;
 
+use crate::directives;
 use crate::linter::check_path;
 use crate::registry::{RuleCode, RuleCodePrefix};
+use crate::rules::{
+    flake8_annotations, flake8_bandit, flake8_bugbear, flake8_errmsg, flake8_import_conventions,
+    flake8_pytest_style, flake8_quotes, flake8_tidy_imports, flake8_unused_arguments, isort,
+    mccabe, pep8_naming, pycodestyle, pydocstyle, pyupgrade,
+};
 use crate::rustpython_helpers::tokenize;
 use crate::settings::configuration::Configuration;
 use crate::settings::options::Options;
 use crate::settings::types::PythonVersion;
 use crate::settings::{flags, Settings};
 use crate::source_code::{Locator, Stylist};
-use crate::{
-    directives, flake8_annotations, flake8_bandit, flake8_bugbear, flake8_errmsg,
-    flake8_import_conventions, flake8_pytest_style, flake8_quotes, flake8_tidy_imports,
-    flake8_unused_arguments, isort, mccabe, pep8_naming, pycodestyle, pydocstyle, pyupgrade,
-};
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
@@ -105,14 +106,15 @@ pub fn defaultSettings() -> Result<JsValue, JsValue> {
         force_exclude: None,
         format: None,
         ignore_init_module_imports: None,
+        namespace_packages: None,
         per_file_ignores: None,
         required_version: None,
         respect_gitignore: None,
         show_source: None,
         src: None,
-        unfixable: None,
-        typing_modules: None,
         task_tags: None,
+        typing_modules: None,
+        unfixable: None,
         update_check: None,
         // Use default options for all plugins.
         flake8_annotations: Some(flake8_annotations::settings::Settings::default().into()),

src/linter.rs

@@ -26,7 +26,7 @@ const CARGO_PKG_REPOSITORY: &str = env!("CARGO_PKG_REPOSITORY");
 /// Generate `Diagnostic`s from the source code contents at the
 /// given `Path`.
 #[allow(clippy::too_many_arguments)]
-pub(crate) fn check_path(
+pub fn check_path(
     path: &Path,
     package: Option<&Path>,
     contents: &str,

src/main.rs

@@ -1,42 +0,0 @@
-#![allow(
-    clippy::collapsible_else_if,
-    clippy::collapsible_if,
-    clippy::implicit_hasher,
-    clippy::match_same_arms,
-    clippy::missing_errors_doc,
-    clippy::missing_panics_doc,
-    clippy::module_name_repetitions,
-    clippy::must_use_candidate,
-    clippy::similar_names,
-    clippy::too_many_lines
-)]
-#![forbid(unsafe_code)]
-
-use std::process::ExitCode;
-
-use cfg_if::cfg_if;
-use colored::Colorize;
-
-cfg_if! {
-    if #[cfg(not(target_family = "wasm"))] {
-        mod main_native;
-        use main_native::inner_main;
-    } else {
-        use anyhow::Result;
-
-        #[allow(clippy::unnecessary_wraps)]
-        fn inner_main() -> Result<ExitCode> {
-            Ok(ExitCode::FAILURE)
-        }
-    }
-}
-
-fn main() -> ExitCode {
-    match inner_main() {
-        Ok(code) => code,
-        Err(err) => {
-            eprintln!("{} {err:?}", "error".red().bold());
-            ExitCode::FAILURE
-        }
-    }
-}

src/mccabe/snapshots/ruff__mccabe__tests__max_complexity_10.snap

@@ -1,6 +0,0 @@
----
-source: src/mccabe/mod.rs
-expression: checks
----
-[]
-

src/message.rs

@@ -1,6 +1,6 @@
 use std::cmp::Ordering;
 
-use rustpython_parser::ast::Location;
+pub use rustpython_parser::ast::Location;
 use serde::{Deserialize, Serialize};
 
 use crate::ast::types::Range;

src/packaging.rs

@@ -1,9 +1,11 @@
 //! Detect Python package roots and file associations.
 
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 use rustc_hash::FxHashMap;
 
+use crate::resolver::{PyprojectDiscovery, Resolver};
+
 // If we have a Python package layout like:
 // - root/
 //   - foo/
@@ -27,15 +29,21 @@ use rustc_hash::FxHashMap;
 
 /// Return `true` if the directory at the given `Path` appears to be a Python
 /// package.
-pub fn is_package(path: &Path) -> bool {
+pub fn is_package(path: &Path, namespace_packages: &[PathBuf]) -> bool {
     path.join("__init__.py").is_file()
+        || namespace_packages
+            .iter()
+            .any(|namespace_package| namespace_package == path)
 }
 
 /// Return the package root for the given Python file.
-pub fn detect_package_root(path: &Path) -> Option<&Path> {
+pub fn detect_package_root<'a>(
+    path: &'a Path,
+    namespace_packages: &'a [PathBuf],
+) -> Option<&'a Path> {
     let mut current = None;
     for parent in path.ancestors() {
-        if !is_package(parent) {
+        if !is_package(parent, namespace_packages) {
             return current;
         }
         current = Some(parent);
@@ -46,21 +54,23 @@ pub fn detect_package_root(path: &Path) -> Option<&Path> {
 /// A wrapper around `is_package` to cache filesystem lookups.
 fn is_package_with_cache<'a>(
     path: &'a Path,
+    namespace_packages: &'a [PathBuf],
     package_cache: &mut FxHashMap<&'a Path, bool>,
 ) -> bool {
     *package_cache
         .entry(path)
-        .or_insert_with(|| is_package(path))
+        .or_insert_with(|| is_package(path, namespace_packages))
 }
 
 /// A wrapper around `detect_package_root` to cache filesystem lookups.
 fn detect_package_root_with_cache<'a>(
     path: &'a Path,
+    namespace_packages: &'a [PathBuf],
     package_cache: &mut FxHashMap<&'a Path, bool>,
 ) -> Option<&'a Path> {
     let mut current = None;
     for parent in path.ancestors() {
-        if !is_package_with_cache(parent, package_cache) {
+        if !is_package_with_cache(parent, namespace_packages, package_cache) {
             return current;
         }
         current = Some(parent);
@@ -69,7 +79,11 @@ fn detect_package_root_with_cache<'a>(
 }
 
 /// Return a mapping from Python file to its package root.
-pub fn detect_package_roots<'a>(files: &[&'a Path]) -> FxHashMap<&'a Path, Option<&'a Path>> {
+pub fn detect_package_roots<'a>(
+    files: &[&'a Path],
+    resolver: &'a Resolver,
+    pyproject_strategy: &'a PyprojectDiscovery,
+) -> FxHashMap<&'a Path, Option<&'a Path>> {
     // Pre-populate the module cache, since the list of files could (but isn't
     // required to) contain some `__init__.py` files.
     let mut package_cache: FxHashMap<&Path, bool> = FxHashMap::default();
@@ -84,13 +98,16 @@ pub fn detect_package_roots<'a>(files: &[&'a Path]) -> FxHashMap<&'a Path, Optio
     // Search for the package root for each file.
     let mut package_roots: FxHashMap<&Path, Option<&Path>> = FxHashMap::default();
     for file in files {
+        let namespace_packages = &resolver
+            .resolve(file, pyproject_strategy)
+            .namespace_packages;
         if let Some(package) = file.parent() {
             if package_roots.contains_key(package) {
                 continue;
             }
             package_roots.insert(
                 package,
-                detect_package_root_with_cache(package, &mut package_cache),
+                detect_package_root_with_cache(package, namespace_packages, &mut package_cache),
             );
         }
     }
@@ -111,6 +128,7 @@ mod tests {
                 PathBuf::from(env!("CARGO_MANIFEST_DIR"))
                     .join("resources/test/package/src/package")
                     .as_path(),
+                &[],
             ),
             Some(
                 PathBuf::from(env!("CARGO_MANIFEST_DIR"))
@@ -124,6 +142,7 @@ mod tests {
                 PathBuf::from(env!("CARGO_MANIFEST_DIR"))
                     .join("resources/test/project/python_modules/core/core")
                     .as_path(),
+                &[],
             ),
             Some(
                 PathBuf::from(env!("CARGO_MANIFEST_DIR"))
@@ -137,6 +156,7 @@ mod tests {
                 PathBuf::from(env!("CARGO_MANIFEST_DIR"))
                     .join("resources/test/project/examples/docs/docs/concepts")
                     .as_path(),
+                &[],
             ),
             Some(
                 PathBuf::from(env!("CARGO_MANIFEST_DIR"))
@@ -150,6 +170,7 @@ mod tests {
                 PathBuf::from(env!("CARGO_MANIFEST_DIR"))
                     .join("setup.py")
                     .as_path(),
+                &[],
             ),
             None,
         );

src/pycodestyle/snapshots/ruff__pycodestyle__tests__W292_W292_1.py.snap

@@ -1,6 +0,0 @@
----
-source: src/pycodestyle/mod.rs
-expression: checks
----
-[]
-

src/pycodestyle/snapshots/ruff__pycodestyle__tests__W292_W292_2.py.snap

@@ -1,6 +0,0 @@
----
-source: src/pycodestyle/mod.rs
-expression: checks
----
-[]
-

src/pycodestyle/snapshots/ruff__pycodestyle__tests__W292_W292_3.py.snap

@@ -1,6 +0,0 @@
----
-source: src/pycodestyle/mod.rs
-expression: checks
----
-[]
-

src/pycodestyle/snapshots/ruff__pycodestyle__tests__task_tags_true.snap

@@ -1,6 +0,0 @@
----
-source: src/pycodestyle/mod.rs
-expression: checks
----
-[]
-

src/pydocstyle/snapshots/ruff__pydocstyle__tests__D104_D.py.snap

@@ -1,6 +0,0 @@
----
-source: src/pydocstyle/mod.rs
-expression: checks
----
-[]
-