Explain check_docs_formatted.py error message (#6125)

## Summary

This is an error message only change to lead an implementor of a new
rule that has an unformatted or invalid bad example to the
right code.

## Test Plan

n/a

CONTRIBUTING.md

@@ -122,9 +122,9 @@ At time of writing, the repository includes the following crates:
     intermediate representation. The backend for `ruff_python_formatter`.
 - `crates/ruff_index`: library crate inspired by `rustc_index`.
 - `crates/ruff_macros`: proc macro crate containing macros used by Ruff.
-- `crates/ruff_python_ast`: library crate containing Python-specific AST types and utilities. Note
-    that the AST schema itself is defined in the
-    [rustpython-ast](https://github.com/astral-sh/RustPython-Parser) crate.
+- `crates/ruff_python_ast`: library crate containing Python-specific AST types and utilities.
+- `crates/ruff_python_codegen`: library crate containing utilities for generating Python source code.
+- `crates/ruff_python_codegen`: library crate containing utilities for generating Python source code.
 - `crates/ruff_python_formatter`: library crate implementing the Python formatter. Emits an
     intermediate representation for each node, which `ruff_formatter` prints based on the configured
     line length.
@@ -135,8 +135,7 @@ At time of writing, the repository includes the following crates:
     the names of all built-in exceptions and which standard library types are immutable.
 - `crates/ruff_python_trivia`: library crate containing Python-specific trivia utilities (e.g.,
     for analyzing indentation, newlines, etc.).
-- `crates/ruff_rustpython`: library crate containing `RustPython`-specific utilities.
-- `crates/ruff_textwrap`: library crate to indent and dedent Python source code.
+- `crates/ruff_python_parser`: library crate containing the Python parser.
 - `crates/ruff_wasm`: library crate for exposing Ruff as a WebAssembly module. Powers the
     [Ruff Playground](https://play.ruff.rs/).
 
@@ -224,9 +223,12 @@ Once you've completed the code for the rule itself, you can define tests with th
     For example, if you're adding a new rule named `E402`, you would run:
 
     ```shell
-    cargo run -p ruff_cli -- check crates/ruff/resources/test/fixtures/pycodestyle/E402.py --no-cache
+    cargo run -p ruff_cli -- check crates/ruff/resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402
     ```
 
+    **Note:** Only a subset of rules are enabled by default. When testing a new rule, ensure that
+    you activate it by adding `--select ${rule_code}` to the command.
+
 1. Add the test to the relevant `crates/ruff/src/rules/[linter]/mod.rs` file. If you're contributing
     a rule to a pre-existing set, you should be able to find a similar example to pattern-match
     against. If you're adding a new linter, you'll need to create a new `mod.rs` file (see,
@@ -313,7 +315,7 @@ even patch releases may contain [non-backwards-compatible changes](https://semve
 1. Run the release workflow with the version number (without starting `v`) as input. Make sure
     main has your merged PR as last commit
 1. The release workflow will do the following:
-    1. Build all the assets. If this fails (even though we tested in step 4), we haven’t tagged or
+    1. Build all the assets. If this fails (even though we tested in step 4), we haven't tagged or
         uploaded anything, you can restart after pushing a fix.
     1. Upload to PyPI.
     1. Create and push the Git tag (as extracted from `pyproject.toml`). We create the Git tag only
@@ -726,9 +728,9 @@ diagnostics, then our current compilation pipeline proceeds as follows:
 
 1. **File discovery**: Given paths like `foo/`, locate all Python files in any specified subdirectories, taking into account our hierarchical settings system and any `exclude` options.
 
-1. **Package resolution**: Determine the “package root” for every file by traversing over its parent directories and looking for `__init__.py` files.
+1. **Package resolution**: Determine the "package root" for every file by traversing over its parent directories and looking for `__init__.py` files.
 
-1. **Cache initialization**: For every “package root”, initialize an empty cache.
+1. **Cache initialization**: For every "package root", initialize an empty cache.
 
 1. **Analysis**: For every file, in parallel:
 
@@ -736,7 +738,7 @@ diagnostics, then our current compilation pipeline proceeds as follows:
 
     1. **Tokenization**: Run the lexer over the file to generate a token stream.
 
-    1. **Indexing**: Extract metadata from the token stream, such as: comment ranges, `# noqa` locations, `# isort: off` locations, “doc lines”, etc.
+    1. **Indexing**: Extract metadata from the token stream, such as: comment ranges, `# noqa` locations, `# isort: off` locations, "doc lines", etc.
 
     1. **Token-based rule evaluation**: Run any lint rules that are based on the contents of the token stream (e.g., commented-out code).
 
@@ -746,9 +748,9 @@ diagnostics, then our current compilation pipeline proceeds as follows:
 
     1. **Parsing**: Run the parser over the token stream to produce an AST. (This consumes the token stream, so anything that relies on the token stream needs to happen before parsing.)
 
-    1. **AST-based rule evaluation**: Run any lint rules that are based on the AST. This includes the vast majority of lint rules. As part of this step, we also build the semantic model for the current file as we traverse over the AST. Some lint rules are evaluated eagerly, as we iterate over the AST, while others are evaluated in a deferred manner (e.g., unused imports, since we can’t determine whether an import is unused until we’ve finished analyzing the entire file), after we’ve finished the initial traversal.
+    1. **AST-based rule evaluation**: Run any lint rules that are based on the AST. This includes the vast majority of lint rules. As part of this step, we also build the semantic model for the current file as we traverse over the AST. Some lint rules are evaluated eagerly, as we iterate over the AST, while others are evaluated in a deferred manner (e.g., unused imports, since we can't determine whether an import is unused until we've finished analyzing the entire file), after we've finished the initial traversal.
 
-    1. **Import-based rule evaluation**: Run any lint rules that are based on the module’s imports (e.g., import sorting). These could, in theory, be included in the AST-based rule evaluation phase — they’re just separated for simplicity.
+    1. **Import-based rule evaluation**: Run any lint rules that are based on the module's imports (e.g., import sorting). These could, in theory, be included in the AST-based rule evaluation phase — they're just separated for simplicity.
 
     1. **Physical line-based rule evaluation**: Run any lint rules that are based on physical lines (e.g., line-length).
 
@@ -757,3 +759,116 @@ diagnostics, then our current compilation pipeline proceeds as follows:
     1. **Cache write**: Write the generated diagnostics to the package cache using the file as a key.
 
 1. **Reporting**: Print diagnostics in the specified format (text, JSON, etc.), to the specified output channel (stdout, a file, etc.).
+
+### Import Categorization
+
+To understand Ruff's import categorization system, we first need to define two concepts:
+
+- "Project root": The directory containing the `pyproject.toml`, `ruff.toml`, or `.ruff.toml` file,
+    discovered by identifying the "closest" such directory for each Python file. (If you're running
+    via `ruff --config /path/to/pyproject.toml`, then the current working directory is used as the
+    "project root".)
+- "Package root": The top-most directory defining the Python package that includes a given Python
+    file. To find the package root for a given Python file, traverse up its parent directories until
+    you reach a parent directory that doesn't contain an `__init__.py` file (and isn't marked as
+    a [namespace package](https://beta.ruff.rs/docs/settings/#namespace-packages)); take the directory
+    just before that, i.e., the first directory in the package.
+
+For example, given:
+
+```text
+my_project
+├── pyproject.toml
+└── src
+    └── foo
+        ├── __init__.py
+        └── bar
+            ├── __init__.py
+            └── baz.py
+```
+
+Then when analyzing `baz.py`, the project root would be the top-level directory (`./my_project`),
+and the package root would be `./my_project/src/foo`.
+
+#### Project root
+
+The project root does not have a significant impact beyond that all relative paths within the loaded
+configuration file are resolved relative to the project root.
+
+For example, to indicate that `bar` above is a namespace package (it isn't, but let's run with it),
+the `pyproject.toml` would list `namespace-packages = ["./src/bar"]`, which would resolve
+to `my_project/src/bar`.
+
+The same logic applies when providing a configuration file via `--config`. In that case, the
+_current working directory_ is used as the project root, and so all paths in that configuration file
+are resolved relative to the current working directory. (As a general rule, we want to avoid relying
+on the current working directory as much as possible, to ensure that Ruff exhibits the same behavior
+regardless of where and how you invoke it — but that's hard to avoid in this case.)
+
+Additionally, if a `pyproject.toml` file _extends_ another configuration file, Ruff will still use
+the directory containing that `pyproject.toml` file as the project root. For example, if
+`./my_project/pyproject.toml` contains:
+
+```toml
+[tool.ruff]
+extend = "/path/to/pyproject.toml"
+```
+
+Then Ruff will use `./my_project` as the project root, even though the configuration file extends
+`/path/to/pyproject.toml`. As such, if the configuration file at `/path/to/pyproject.toml` contains
+any relative paths, they will be resolved relative to `./my_project`.
+
+If a project uses nested configuration files, then Ruff would detect multiple project roots, one for
+each configuration file.
+
+#### Package root
+
+The package root is used to determine a file's "module path". Consider, again, `baz.py`. In that
+case, `./my_project/src/foo` was identified as the package root, so the module path for `baz.py`
+would resolve to  `foo.bar.baz` — as computed by taking the relative path from the package root
+(inclusive of the root itself). The module path can be thought of as "the path you would use to
+import the module" (e.g., `import foo.bar.baz`).
+
+The package root and module path are used to, e.g., convert relative to absolute imports, and for
+import categorization, as described below.
+
+#### Import categorization
+
+When sorting and formatting import blocks, Ruff categorizes every import into one of five
+categories:
+
+1. **"Future"**: the import is a `__future__` import. That's easy: just look at the name of the
+    imported module!
+1. **"Standard library"**: the import comes from the Python standard library (e.g., `import os`).
+    This is easy too: we include a list of all known standard library modules in Ruff itself, so it's
+    a simple lookup.
+1. **"Local folder"**: the import is a relative import (e.g., `from .foo import bar`). This is easy
+    too: just check if the import includes a `level` (i.e., a dot-prefix).
+1. **"First party"**: the import is part of the current project. (More on this below.)
+1. **"Third party"**: everything else.
+
+The real challenge lies in determining whether an import is first-party — everything else is either
+trivial, or (as in the case of third-party) merely defined as "not first-party".
+
+There are three ways in which an import can be categorized as "first-party":
+
+1. **Explicit settings**: the import is marked as such via the `known-first-party` setting. (This
+    should generally be seen as an escape hatch.)
+1. **Same-package**: the imported module is in the same package as the current file. This gets back
+    to the importance of the "package root" and the file's "module path". Imagine that we're
+    analyzing `baz.py` above. If `baz.py` contains any imports that appear to come from the `foo`
+    package (e.g., `from foo import bar` or `import foo.bar`), they'll be classified as first-party
+    automatically. This check is as simple as comparing the first segment of the current file's
+    module path to the first segment of the import.
+1. **Source roots**: Ruff supports a `[src](https://beta.ruff.rs/docs/settings/#src)` setting, which
+    sets the directories to scan when identifying first-party imports. The algorithm is
+    straightforward: given an import, like `import foo`, iterate over the directories enumerated in
+    the `src` setting and, for each directory, check for the existence of a subdirectory `foo` or a
+    file `foo.py`.
+
+By default, `src` is set to the project root. In the above example, we'd want to set
+`src = ["./src"]` to ensure that we locate `./my_project/src/foo` and thus categorize `import foo`
+as first-party in `baz.py`. In practice, for this limited example, setting `src = ["./src"]` is
+unnecessary, as all imports within `./my_project/src/foo` would be categorized as first-party via
+the same-package heuristic; but your project contains multiple packages, you'll want to set `src`
+explicitly.

Cargo.lock

@@ -133,6 +133,15 @@ dependencies = [
  "os_str_bytes",
 ]
 
+[[package]]
+name = "ascii-canvas"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6"
+dependencies = [
+ "term",
+]
+
 [[package]]
 name = "assert_cmd"
 version = "2.0.11"
@@ -169,6 +178,21 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -609,6 +633,16 @@ dependencies = [
  "dirs-sys 0.4.1",
 ]
 
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if",
+ "dirs-sys-next",
+]
+
 [[package]]
 name = "dirs-sys"
 version = "0.3.7"
@@ -632,6 +666,17 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
 [[package]]
 name = "doc-comment"
 version = "0.3.3"
@@ -656,6 +701,15 @@ version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
+[[package]]
+name = "ena"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "encode_unicode"
 version = "0.3.6"
@@ -732,6 +786,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
 [[package]]
 name = "flake8-to-ruff"
 version = "0.0.280"
@@ -1099,6 +1159,28 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "lalrpop"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8"
+dependencies = [
+ "ascii-canvas",
+ "bit-set",
+ "diff",
+ "ena",
+ "is-terminal",
+ "itertools",
+ "lalrpop-util",
+ "petgraph",
+ "regex",
+ "regex-syntax 0.7.3",
+ "string_cache",
+ "term",
+ "tiny-keccak",
+ "unicode-xid",
+]
+
 [[package]]
 name = "lalrpop-util"
 version = "0.20.0"
@@ -1199,6 +1281,16 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
 
+[[package]]
+name = "lock_api"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
 [[package]]
 name = "log"
 version = "0.4.19"
@@ -1277,6 +1369,12 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c"
 
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+
 [[package]]
 name = "nextest-workspace-hack"
 version = "0.1.0"
@@ -1421,6 +1519,29 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.3.5",
+ "smallvec",
+ "windows-targets 0.48.1",
+]
+
 [[package]]
 name = "paste"
 version = "1.0.13"
@@ -1512,13 +1633,23 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
+[[package]]
+name = "petgraph"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
+dependencies = [
+ "fixedbitset",
+ "indexmap 1.9.3",
+]
+
 [[package]]
 name = "phf"
 version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
 dependencies = [
- "phf_shared",
+ "phf_shared 0.11.2",
 ]
 
 [[package]]
@@ -1528,7 +1659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
 dependencies = [
  "phf_generator",
- "phf_shared",
+ "phf_shared 0.11.2",
 ]
 
 [[package]]
@@ -1537,10 +1668,19 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
 dependencies = [
- "phf_shared",
+ "phf_shared 0.11.2",
  "rand",
 ]
 
+[[package]]
+name = "phf_shared"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+dependencies = [
+ "siphasher",
+]
+
 [[package]]
 name = "phf_shared"
 version = "0.11.2"
@@ -1601,6 +1741,18 @@ version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794"
 
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
 [[package]]
 name = "predicates"
 version = "3.0.3"
@@ -1725,6 +1877,18 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
  "rand_core",
 ]
 
@@ -1733,6 +1897,9 @@ name = "rand_core"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
 
 [[package]]
 name = "rayon"
@@ -1907,17 +2074,14 @@ dependencies = [
  "ruff_python_ast",
  "ruff_python_codegen",
  "ruff_python_index",
+ "ruff_python_literal",
  "ruff_python_parser",
- "ruff_python_resolver",
  "ruff_python_semantic",
  "ruff_python_stdlib",
  "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
  "rustc-hash",
- "rustpython-ast",
- "rustpython-format",
- "rustpython-parser",
  "schemars",
  "semver",
  "serde",
@@ -1948,8 +2112,7 @@ dependencies = [
  "ruff",
  "ruff_python_ast",
  "ruff_python_formatter",
- "rustpython-ast",
- "rustpython-parser",
+ "ruff_python_parser",
  "serde",
  "serde_json",
  "tikv-jemallocator",
@@ -2040,13 +2203,13 @@ dependencies = [
  "ruff_cli",
  "ruff_diagnostics",
  "ruff_formatter",
+ "ruff_python_ast",
  "ruff_python_codegen",
  "ruff_python_formatter",
+ "ruff_python_literal",
+ "ruff_python_parser",
  "ruff_python_stdlib",
  "ruff_python_trivia",
- "rustpython-ast",
- "rustpython-format",
- "rustpython-parser",
  "schemars",
  "serde",
  "serde_json",
@@ -2112,12 +2275,11 @@ dependencies = [
  "num-bigint",
  "num-traits",
  "once_cell",
+ "ruff_python_parser",
  "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
  "rustc-hash",
- "rustpython-ast",
- "rustpython-parser",
  "serde",
  "smallvec",
 ]
@@ -2128,10 +2290,9 @@ version = "0.0.0"
 dependencies = [
  "once_cell",
  "ruff_python_ast",
+ "ruff_python_literal",
+ "ruff_python_parser",
  "ruff_source_file",
- "rustpython-ast",
- "rustpython-literal",
- "rustpython-parser",
 ]
 
 [[package]]
@@ -2149,12 +2310,11 @@ dependencies = [
  "ruff_formatter",
  "ruff_python_ast",
  "ruff_python_index",
+ "ruff_python_parser",
  "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
  "rustc-hash",
- "rustpython-ast",
- "rustpython-parser",
  "serde",
  "serde_json",
  "similar",
@@ -2167,11 +2327,26 @@ name = "ruff_python_index"
 version = "0.0.0"
 dependencies = [
  "itertools",
+ "ruff_python_ast",
+ "ruff_python_parser",
  "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
- "rustpython-ast",
- "rustpython-parser",
+]
+
+[[package]]
+name = "ruff_python_literal"
+version = "0.0.0"
+dependencies = [
+ "bitflags 2.3.3",
+ "hexf-parse",
+ "is-macro",
+ "itertools",
+ "lexical-parse-float",
+ "num-bigint",
+ "num-traits",
+ "rand",
+ "unic-ucd-category",
 ]
 
 [[package]]
@@ -2179,11 +2354,21 @@ name = "ruff_python_parser"
 version = "0.0.0"
 dependencies = [
  "anyhow",
+ "insta",
  "is-macro",
+ "itertools",
+ "lalrpop",
+ "lalrpop-util",
+ "num-bigint",
+ "num-traits",
  "ruff_python_ast",
  "ruff_text_size",
- "rustpython-ast",
- "rustpython-parser",
+ "rustc-hash",
+ "static_assertions",
+ "tiny-keccak",
+ "unic-emoji-char",
+ "unic-ucd-ident",
+ "unicode_names2",
 ]
 
 [[package]]
@@ -2209,8 +2394,6 @@ dependencies = [
  "ruff_source_file",
  "ruff_text_size",
  "rustc-hash",
- "rustpython-ast",
- "rustpython-parser",
  "smallvec",
 ]
 
@@ -2224,10 +2407,10 @@ version = "0.0.0"
 dependencies = [
  "insta",
  "memchr",
+ "ruff_python_ast",
+ "ruff_python_parser",
  "ruff_source_file",
  "ruff_text_size",
- "rustpython-ast",
- "rustpython-parser",
  "smallvec",
  "unic-ucd-ident",
 ]
@@ -2242,7 +2425,7 @@ dependencies = [
  "regex",
  "ruff_python_ast",
  "ruff_python_parser",
- "rustpython-ast",
+ "ruff_text_size",
  "shlex",
  "tracing",
  "tracing-subscriber",
@@ -2262,10 +2445,11 @@ dependencies = [
 [[package]]
 name = "ruff_text_size"
 version = "0.0.0"
-source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=593b46be5e0336fe01917f8ef400bd12d81df8c1#593b46be5e0336fe01917f8ef400bd12d81df8c1"
 dependencies = [
  "schemars",
  "serde",
+ "serde_test",
+ "static_assertions",
 ]
 
 [[package]]
@@ -2284,7 +2468,6 @@ dependencies = [
  "ruff_python_index",
  "ruff_python_parser",
  "ruff_source_file",
- "rustpython-parser",
  "serde",
  "serde-wasm-bindgen",
  "wasm-bindgen",
@@ -2356,71 +2539,6 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "rustpython-ast"
-version = "0.2.0"
-source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=593b46be5e0336fe01917f8ef400bd12d81df8c1#593b46be5e0336fe01917f8ef400bd12d81df8c1"
-dependencies = [
- "is-macro",
- "num-bigint",
- "rustpython-parser-core",
- "static_assertions",
-]
-
-[[package]]
-name = "rustpython-format"
-version = "0.2.0"
-source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=593b46be5e0336fe01917f8ef400bd12d81df8c1#593b46be5e0336fe01917f8ef400bd12d81df8c1"
-dependencies = [
- "bitflags 2.3.3",
- "itertools",
- "num-bigint",
- "num-traits",
- "rustpython-literal",
-]
-
-[[package]]
-name = "rustpython-literal"
-version = "0.2.0"
-source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=593b46be5e0336fe01917f8ef400bd12d81df8c1#593b46be5e0336fe01917f8ef400bd12d81df8c1"
-dependencies = [
- "hexf-parse",
- "is-macro",
- "lexical-parse-float",
- "num-traits",
- "unic-ucd-category",
-]
-
-[[package]]
-name = "rustpython-parser"
-version = "0.2.0"
-source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=593b46be5e0336fe01917f8ef400bd12d81df8c1#593b46be5e0336fe01917f8ef400bd12d81df8c1"
-dependencies = [
- "anyhow",
- "is-macro",
- "itertools",
- "lalrpop-util",
- "num-bigint",
- "num-traits",
- "rustc-hash",
- "rustpython-ast",
- "rustpython-parser-core",
- "static_assertions",
- "tiny-keccak",
- "unic-emoji-char",
- "unic-ucd-ident",
- "unicode_names2",
-]
-
-[[package]]
-name = "rustpython-parser-core"
-version = "0.2.0"
-source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=593b46be5e0336fe01917f8ef400bd12d81df8c1#593b46be5e0336fe01917f8ef400bd12d81df8c1"
-dependencies = [
- "is-macro",
- "ruff_text_size",
-]
-
 [[package]]
 name = "rustversion"
 version = "1.0.13"
@@ -2556,6 +2674,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_test"
+version = "1.0.176"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a2f49ace1498612d14f7e0b8245519584db8299541dfe31a06374a828d620ab"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_with"
 version = "3.0.0"
@@ -2638,6 +2765,19 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "string_cache"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
+dependencies = [
+ "new_debug_unreachable",
+ "once_cell",
+ "parking_lot",
+ "phf_shared 0.10.0",
+ "precomputed-hash",
+]
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -2711,6 +2851,17 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "term"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
+dependencies = [
+ "dirs-next",
+ "rustversion",
+ "winapi",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.2.0"
@@ -3090,6 +3241,12 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+
 [[package]]
 name = "unicode_names2"
 version = "0.6.0"

Cargo.toml

@@ -51,12 +51,6 @@ wsl = { version = "0.1.0" }
 # v1.0.1
 libcst = { git = "https://github.com/Instagram/LibCST.git", rev = "3cacca1a1029f05707e50703b49fe3dd860aa839", default-features = false }
 
-ruff_text_size = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "593b46be5e0336fe01917f8ef400bd12d81df8c1" }
-rustpython-ast = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "593b46be5e0336fe01917f8ef400bd12d81df8c1" }
-rustpython-format = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "593b46be5e0336fe01917f8ef400bd12d81df8c1" }
-rustpython-literal = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "593b46be5e0336fe01917f8ef400bd12d81df8c1" }
-rustpython-parser = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "593b46be5e0336fe01917f8ef400bd12d81df8c1" }
-
 [profile.release]
 lto = "fat"
 codegen-units = 1
@@ -69,7 +63,7 @@ opt-level = 3
 
 # Reduce complexity of a parser function that would trigger a locals limit in a wasm tool.
 # https://github.com/bytecodealliance/wasm-tools/blob/b5c3d98e40590512a3b12470ef358d5c7b983b15/crates/wasmparser/src/limits.rs#L29
-[profile.dev.package.rustpython-parser]
+[profile.dev.package.ruff_python_parser]
 opt-level = 1
 
 # Use the `--profile release-debug` flag to show symbols in release mode.

crates/ruff/Cargo.toml

@@ -22,13 +22,13 @@ ruff_macros = { path = "../ruff_macros" }
 ruff_python_ast = { path = "../ruff_python_ast", features = ["serde"] }
 ruff_python_codegen = { path = "../ruff_python_codegen" }
 ruff_python_index = { path = "../ruff_python_index" }
-ruff_python_parser = { path = "../ruff_python_parser" }
-ruff_python_resolver = { path = "../ruff_python_resolver" }
+ruff_python_literal = { path = "../ruff_python_literal" }
 ruff_python_semantic = { path = "../ruff_python_semantic" }
 ruff_python_stdlib = { path = "../ruff_python_stdlib" }
 ruff_python_trivia = { path = "../ruff_python_trivia" }
-ruff_source_file = { path = "../ruff_source_file" }
-ruff_text_size = { workspace = true }
+ruff_python_parser = { path = "../ruff_python_parser" }
+ruff_source_file = { path = "../ruff_source_file", features = ["serde"] }
+ruff_text_size = { path = "../ruff_text_size" }
 
 annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { workspace = true }
@@ -62,9 +62,8 @@ quick-junit = { version = "0.3.2" }
 regex = { workspace = true }
 result-like = { version = "0.4.6" }
 rustc-hash = { workspace = true }
-rustpython-format = { workspace = true }
-rustpython-parser = { workspace = true }
-rustpython-ast = { workspace = true }
+
+
 schemars = { workspace = true, optional = true }
 semver = { version = "1.0.16" }
 serde = { workspace = true }

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

@@ -0,0 +1,12 @@
+import typing
+from typing import TypeVar
+
+_T = typing.TypeVar("_T")
+_P = TypeVar("_P")
+
+# OK
+_UsedTypeVar = TypeVar("_UsedTypeVar")
+def func(arg: _UsedTypeVar) -> _UsedTypeVar: ...
+
+_A, _B = TypeVar("_A"), TypeVar("_B")
+_C = _D = TypeVar("_C")

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

@@ -0,0 +1,12 @@
+import typing
+from typing import TypeVar
+
+_T = typing.TypeVar("_T")
+_P = TypeVar("_P")
+
+# OK
+_UsedTypeVar = TypeVar("_UsedTypeVar")
+def func(arg: _UsedTypeVar) -> _UsedTypeVar: ...
+
+_A, _B = TypeVar("_A"), TypeVar("_B")
+_C = _D = TypeVar("_C")

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

@@ -0,0 +1,18 @@
+import typing
+from typing import Protocol
+
+
+class _Foo(Protocol):
+    bar: int
+
+
+class _Bar(typing.Protocol):
+    bar: int
+
+
+# OK
+class _UsedPrivateProtocol(Protocol):
+    bar: int
+
+
+def uses__UsedPrivateProtocol(arg: _UsedPrivateProtocol) -> None: ...

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

@@ -0,0 +1,18 @@
+import typing
+from typing import Protocol
+
+
+class _Foo(object, Protocol):
+    bar: int
+
+
+class _Bar(typing.Protocol):
+    bar: int
+
+
+# OK
+class _UsedPrivateProtocol(Protocol):
+    bar: int
+
+
+def uses__UsedPrivateProtocol(arg: _UsedPrivateProtocol) -> None: ...

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

@@ -0,0 +1,11 @@
+import os
+import glob
+from glob import glob as search
+
+
+extensions_dir = "./extensions"
+
+# PTH207
+glob.glob(os.path.join(extensions_dir, "ops", "autograd", "*.cpp"))
+list(glob.iglob(os.path.join(extensions_dir, "ops", "autograd", "*.cpp")))
+search("*.png")

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

@@ -0,0 +1,4 @@
+print('Hello world')
+
+#!/usr/bin/python
+# -*- coding: utf-8 -*-

crates/ruff/src/autofix/codemods.rs

@@ -4,7 +4,7 @@ use anyhow::{bail, Result};
 use libcst_native::{
     Codegen, CodegenState, ImportNames, ParenthesizableWhitespace, SmallStatement, Statement,
 };
-use rustpython_ast::{Ranged, Stmt};
+use ruff_python_ast::{Ranged, Stmt};
 
 use ruff_python_codegen::Stylist;
 use ruff_source_file::Locator;

crates/ruff/src/autofix/edits.rs

@@ -1,8 +1,8 @@
 //! Interface for generating autofix edits from higher-level actions (e.g., "remove an argument").
 use anyhow::{bail, Result};
+use ruff_python_ast::{self as ast, ExceptHandler, Expr, Keyword, Ranged, Stmt};
+use ruff_python_parser::{lexer, Mode};
 use ruff_text_size::{TextLen, TextRange, TextSize};
-use rustpython_ast::{self as ast, ExceptHandler, Expr, Keyword, Ranged, Stmt};
-use rustpython_parser::{lexer, Mode};
 
 use ruff_diagnostics::Edit;
 use ruff_python_codegen::Stylist;
@@ -294,9 +294,9 @@ fn next_stmt_break(semicolon: TextSize, locator: &Locator) -> TextSize {
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
+    use ruff_python_ast::{Ranged, Suite};
+    use ruff_python_parser::Parse;
     use ruff_text_size::TextSize;
-    use rustpython_ast::{Ranged, Suite};
-    use rustpython_parser::Parse;
 
     use ruff_source_file::Locator;
 

crates/ruff/src/checkers/ast/analyze/argument.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Arg, Ranged};
+use ruff_python_ast::{Arg, Ranged};
 
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;

crates/ruff/src/checkers/ast/analyze/arguments.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::Arguments;
+use ruff_python_ast::Arguments;
 
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;

crates/ruff/src/checkers/ast/analyze/bindings.rs

@@ -10,7 +10,9 @@ pub(crate) fn bindings(checker: &mut Checker) {
         Rule::InvalidAllObject,
         Rule::UnaliasedCollectionsAbcSetImport,
         Rule::UnconventionalImportAlias,
+        Rule::UnusedPrivateTypeVar,
         Rule::UnusedVariable,
+        Rule::UnusedPrivateProtocol,
     ]) {
         return;
     }
@@ -63,6 +65,20 @@ pub(crate) fn bindings(checker: &mut Checker) {
                     checker.diagnostics.push(diagnostic);
                 }
             }
+            if checker.enabled(Rule::UnusedPrivateTypeVar) {
+                if let Some(diagnostic) =
+                    flake8_pyi::rules::unused_private_type_var(checker, binding)
+                {
+                    checker.diagnostics.push(diagnostic);
+                }
+            }
+            if checker.enabled(Rule::UnusedPrivateProtocol) {
+                if let Some(diagnostic) =
+                    flake8_pyi::rules::unused_private_protocol(checker, binding)
+                {
+                    checker.diagnostics.push(diagnostic);
+                }
+            }
         }
     }
 }

crates/ruff/src/checkers/ast/analyze/comprehension.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::Comprehension;
+use ruff_python_ast::Comprehension;
 
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;

crates/ruff/src/checkers/ast/analyze/deferred_for_loops.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, Stmt};
+use ruff_python_ast::{self as ast, Stmt};
 
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;

crates/ruff/src/checkers/ast/analyze/definitions.rs

@@ -1,6 +1,6 @@
 use ruff_python_ast::str::raw_contents_range;
+use ruff_python_ast::Ranged;
 use ruff_text_size::TextRange;
-use rustpython_ast::Ranged;
 
 use ruff_python_semantic::{BindingKind, ContextualizedDefinition, Export};
 

crates/ruff/src/checkers/ast/analyze/except_handler.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, ExceptHandler, Ranged};
+use ruff_python_ast::{self as ast, ExceptHandler, Ranged};
 
 use crate::checkers::ast::Checker;
 use crate::registry::Rule;

crates/ruff/src/checkers/ast/analyze/expression.rs

@@ -1,5 +1,5 @@
-use rustpython_ast::{self as ast, Constant, Expr, ExprContext, Operator, Ranged};
-use rustpython_format::cformat::{CFormatError, CFormatErrorType};
+use ruff_python_ast::{self as ast, Constant, Expr, ExprContext, Operator, Ranged};
+use ruff_python_literal::cformat::{CFormatError, CFormatErrorType};
 
 use ruff_diagnostics::Diagnostic;
 
@@ -849,6 +849,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 Rule::OsPathGetatime,
                 Rule::OsPathGetmtime,
                 Rule::OsPathGetctime,
+                Rule::Glob,
             ]) {
                 flake8_use_pathlib::rules::replaceable_by_pathlib(checker, func);
             }

crates/ruff/src/checkers/ast/analyze/module.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::Suite;
+use ruff_python_ast::Suite;
 
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;

crates/ruff/src/checkers/ast/analyze/statement.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, Expr, Ranged, Stmt};
+use ruff_python_ast::{self as ast, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::Diagnostic;
 use ruff_python_ast::helpers;

crates/ruff/src/checkers/ast/analyze/suite.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::Stmt;
+use ruff_python_ast::Stmt;
 
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;

crates/ruff/src/checkers/ast/deferred.rs

@@ -1,5 +1,5 @@
+use ruff_python_ast::Expr;
 use ruff_text_size::TextRange;
-use rustpython_ast::Expr;
 
 use ruff_python_semantic::{ScopeId, Snapshot};
 

crates/ruff/src/checkers/ast/mod.rs

@@ -30,11 +30,11 @@ use std::path::Path;
 
 use itertools::Itertools;
 use log::error;
-use ruff_text_size::{TextRange, TextSize};
-use rustpython_ast::{
+use ruff_python_ast::{
     self as ast, Arg, ArgWithDefault, Arguments, Comprehension, Constant, ElifElseClause,
     ExceptHandler, Expr, ExprContext, Keyword, Pattern, Ranged, Stmt, Suite, UnaryOp,
 };
+use ruff_text_size::{TextRange, TextSize};
 
 use ruff_diagnostics::{Diagnostic, IsolationLevel};
 use ruff_python_ast::all::{extract_all_names, DunderAllFlags};
@@ -70,6 +70,8 @@ mod deferred;
 pub(crate) struct Checker<'a> {
     /// The [`Path`] to the file under analysis.
     path: &'a Path,
+    /// The [`Path`] to the package containing the current file.
+    package: Option<&'a Path>,
     /// The module representation of the current file (e.g., `foo.bar`).
     module_path: Option<&'a [String]>,
     /// Whether the current file is a stub (`.pyi`) file.
@@ -109,6 +111,7 @@ impl<'a> Checker<'a> {
         noqa_line_for: &'a NoqaMapping,
         noqa: flags::Noqa,
         path: &'a Path,
+        package: Option<&'a Path>,
         module: Module<'a>,
         locator: &'a Locator,
         stylist: &'a Stylist,
@@ -120,6 +123,7 @@ impl<'a> Checker<'a> {
             noqa_line_for,
             noqa,
             path,
+            package,
             module_path: module.path(),
             is_stub: is_python_stub_file(path),
             locator,
@@ -233,6 +237,11 @@ impl<'a> Checker<'a> {
         self.path
     }
 
+    /// The [`Path`] to the package containing the current file.
+    pub(crate) const fn package(&self) -> Option<&'a Path> {
+        self.package
+    }
+
     /// Returns whether the given rule should be checked.
     #[inline]
     pub(crate) const fn enabled(&self, rule: Rule) -> bool {
@@ -1465,6 +1474,11 @@ impl<'a> Checker<'a> {
         // Create the `Binding`.
         let binding_id = self.semantic.push_binding(range, kind, flags);
 
+        // If the name is private, mark is as such.
+        if name.starts_with('_') {
+            self.semantic.bindings[binding_id].flags |= BindingFlags::PRIVATE_DECLARATION;
+        }
+
         // If there's an existing binding in this scope, copy its references.
         if let Some(shadowed_id) = self.semantic.scopes[scope_id].get(name) {
             // If this is an annotation, and we already have an existing value in the same scope,
@@ -1845,6 +1859,7 @@ pub(crate) fn check_ast(
         noqa_line_for,
         noqa,
         path,
+        package,
         module,
         locator,
         stylist,

crates/ruff/src/checkers/imports.rs

@@ -2,7 +2,7 @@
 use std::borrow::Cow;
 use std::path::Path;
 
-use rustpython_ast::{self as ast, Ranged, Stmt, Suite};
+use ruff_python_ast::{self as ast, Ranged, Stmt, Suite};
 
 use ruff_diagnostics::Diagnostic;
 use ruff_python_ast::helpers::to_module_path;
@@ -103,9 +103,9 @@ pub(crate) fn check_imports(
     if settings.rules.enabled(Rule::UnsortedImports) {
         for block in &blocks {
             if !block.imports.is_empty() {
-                if let Some(diagnostic) =
-                    isort::rules::organize_imports(block, locator, stylist, indexer, settings, path)
-                {
+                if let Some(diagnostic) = isort::rules::organize_imports(
+                    block, locator, stylist, indexer, settings, package,
+                ) {
                     diagnostics.push(diagnostic);
                 }
             }

crates/ruff/src/checkers/logical_lines.rs

@@ -1,9 +1,9 @@
+use ruff_python_parser::lexer::LexResult;
 use ruff_text_size::TextRange;
-use rustpython_parser::lexer::LexResult;
 
 use ruff_diagnostics::{Diagnostic, DiagnosticKind};
 use ruff_python_codegen::Stylist;
-use ruff_python_parser::token_kind::TokenKind;
+use ruff_python_parser::TokenKind;
 use ruff_source_file::Locator;
 
 use crate::registry::{AsRule, Rule};

crates/ruff/src/checkers/noqa.rs

@@ -3,8 +3,8 @@
 use std::path::Path;
 
 use itertools::Itertools;
+use ruff_python_ast::Ranged;
 use ruff_text_size::{TextLen, TextRange, TextSize};
-use rustpython_ast::Ranged;
 
 use ruff_diagnostics::{Diagnostic, Edit, Fix};
 use ruff_source_file::Locator;

crates/ruff/src/checkers/physical_lines.rs

@@ -13,7 +13,6 @@ use crate::rules::pycodestyle::rules::{
     tab_indentation, trailing_whitespace,
 };
 use crate::rules::pylint;
-use crate::rules::pyupgrade::rules::unnecessary_coding_comment;
 use crate::settings::Settings;
 
 pub(crate) fn check_physical_lines(
@@ -28,7 +27,6 @@ pub(crate) fn check_physical_lines(
     let enforce_doc_line_too_long = settings.rules.enabled(Rule::DocLineTooLong);
     let enforce_line_too_long = settings.rules.enabled(Rule::LineTooLong);
     let enforce_no_newline_at_end_of_file = settings.rules.enabled(Rule::MissingNewlineAtEndOfFile);
-    let enforce_unnecessary_coding_comment = settings.rules.enabled(Rule::UTF8EncodingDeclaration);
     let enforce_mixed_spaces_and_tabs = settings.rules.enabled(Rule::MixedSpacesAndTabs);
     let enforce_bidirectional_unicode = settings.rules.enabled(Rule::BidirectionalUnicode);
     let enforce_trailing_whitespace = settings.rules.enabled(Rule::TrailingWhitespace);
@@ -37,27 +35,9 @@ pub(crate) fn check_physical_lines(
     let enforce_tab_indentation = settings.rules.enabled(Rule::TabIndentation);
     let enforce_copyright_notice = settings.rules.enabled(Rule::MissingCopyrightNotice);
 
-    let fix_unnecessary_coding_comment = settings.rules.should_fix(Rule::UTF8EncodingDeclaration);
-
-    let mut commented_lines_iter = indexer.comment_ranges().iter().peekable();
     let mut doc_lines_iter = doc_lines.iter().peekable();
 
-    for (index, line) in locator.contents().universal_newlines().enumerate() {
-        while commented_lines_iter
-            .next_if(|comment_range| line.range().contains_range(**comment_range))
-            .is_some()
-        {
-            if enforce_unnecessary_coding_comment {
-                if index < 2 {
-                    if let Some(diagnostic) =
-                        unnecessary_coding_comment(&line, fix_unnecessary_coding_comment)
-                    {
-                        diagnostics.push(diagnostic);
-                    }
-                }
-            }
-        }
-
+    for line in locator.contents().universal_newlines() {
         while doc_lines_iter
             .next_if(|doc_line_start| line.range().contains_inclusive(**doc_line_start))
             .is_some()
@@ -119,8 +99,8 @@ pub(crate) fn check_physical_lines(
 
 #[cfg(test)]
 mod tests {
-    use rustpython_parser::lexer::lex;
-    use rustpython_parser::Mode;
+    use ruff_python_parser::lexer::lex;
+    use ruff_python_parser::Mode;
 
     use ruff_python_codegen::Stylist;
     use ruff_python_index::Indexer;

crates/ruff/src/checkers/tokens.rs

@@ -2,8 +2,8 @@
 
 use std::path::Path;
 
-use rustpython_parser::lexer::LexResult;
-use rustpython_parser::Tok;
+use ruff_python_parser::lexer::LexResult;
+use ruff_python_parser::Tok;
 
 use ruff_diagnostics::Diagnostic;
 use ruff_python_index::Indexer;
@@ -69,6 +69,10 @@ pub(crate) fn check_tokens(
         eradicate::rules::commented_out_code(&mut diagnostics, locator, indexer, settings);
     }
 
+    if settings.rules.enabled(Rule::UTF8EncodingDeclaration) {
+        pyupgrade::rules::unnecessary_coding_comment(&mut diagnostics, locator, indexer, settings);
+    }
+
     if settings.rules.enabled(Rule::InvalidEscapeSequence) {
         for (tok, range) in tokens.iter().flatten() {
             if tok.is_string() {

crates/ruff/src/codes.rs

@@ -632,6 +632,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Pyi, "015") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::AssignmentDefaultInStub),
         (Flake8Pyi, "016") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::DuplicateUnionMember),
         (Flake8Pyi, "017") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::ComplexAssignmentInStub),
+        (Flake8Pyi, "018") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::UnusedPrivateTypeVar),
         (Flake8Pyi, "020") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::QuotedAnnotationInStub),
         (Flake8Pyi, "021") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::DocstringInStub),
         (Flake8Pyi, "024") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::CollectionsNamedTuple),
@@ -649,6 +650,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Pyi, "043") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::TSuffixedTypeAlias),
         (Flake8Pyi, "044") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::FutureAnnotationsInStub),
         (Flake8Pyi, "045") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::IterMethodReturnIterable),
+        (Flake8Pyi, "046") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::UnusedPrivateProtocol),
         (Flake8Pyi, "048") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::StubBodyMultipleStatements),
         (Flake8Pyi, "050") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::NoReturnArgumentAnnotationInStub),
         (Flake8Pyi, "052") => (RuleGroup::Unspecified, rules::flake8_pyi::rules::UnannotatedAssignmentInStub),
@@ -759,6 +761,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8UsePathlib, "204") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::rules::OsPathGetmtime),
         (Flake8UsePathlib, "205") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::rules::OsPathGetctime),
         (Flake8UsePathlib, "206") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::rules::OsSepSplit),
+        (Flake8UsePathlib, "207") => (RuleGroup::Unspecified, rules::flake8_use_pathlib::rules::Glob),
 
         // flake8-logging-format
         (Flake8LoggingFormat, "001") => (RuleGroup::Unspecified, rules::flake8_logging_format::violations::LoggingStringFormat),

crates/ruff/src/directives.rs

@@ -3,9 +3,9 @@
 use std::str::FromStr;
 
 use bitflags::bitflags;
+use ruff_python_parser::lexer::LexResult;
+use ruff_python_parser::Tok;
 use ruff_text_size::{TextLen, TextRange, TextSize};
-use rustpython_parser::lexer::LexResult;
-use rustpython_parser::Tok;
 
 use ruff_python_index::Indexer;
 use ruff_source_file::Locator;
@@ -349,9 +349,9 @@ impl TodoDirectiveKind {
 
 #[cfg(test)]
 mod tests {
+    use ruff_python_parser::lexer::LexResult;
+    use ruff_python_parser::{lexer, Mode};
     use ruff_text_size::{TextLen, TextRange, TextSize};
-    use rustpython_parser::lexer::LexResult;
-    use rustpython_parser::{lexer, Mode};
 
     use ruff_python_index::Indexer;
     use ruff_source_file::Locator;

crates/ruff/src/doc_lines.rs

@@ -3,10 +3,10 @@
 
 use std::iter::FusedIterator;
 
+use ruff_python_ast::{self as ast, Constant, Expr, Ranged, Stmt, Suite};
+use ruff_python_parser::lexer::LexResult;
+use ruff_python_parser::Tok;
 use ruff_text_size::TextSize;
-use rustpython_ast::{self as ast, Constant, Expr, Ranged, Stmt, Suite};
-use rustpython_parser::lexer::LexResult;
-use rustpython_parser::Tok;
 
 use ruff_python_ast::statement_visitor::{walk_stmt, StatementVisitor};
 use ruff_source_file::{Locator, UniversalNewlineIterator};

crates/ruff/src/docstrings/extraction.rs

@@ -1,6 +1,6 @@
 //! Extract docstrings from an AST.
 
-use rustpython_ast::{self as ast, Constant, Expr, Stmt};
+use ruff_python_ast::{self as ast, Constant, Expr, Stmt};
 
 use ruff_python_semantic::{Definition, DefinitionId, Definitions, Member, MemberKind};
 

crates/ruff/src/docstrings/mod.rs

@@ -1,8 +1,8 @@
 use std::fmt::{Debug, Formatter};
 use std::ops::Deref;
 
+use ruff_python_ast::{Expr, Ranged};
 use ruff_text_size::{TextRange, TextSize};
-use rustpython_ast::{Expr, Ranged};
 
 use ruff_python_semantic::Definition;
 

crates/ruff/src/importer/insertion.rs

@@ -1,9 +1,9 @@
 //! Insert statements into Python code.
 use std::ops::Add;
 
+use ruff_python_ast::{Ranged, Stmt};
+use ruff_python_parser::{lexer, Mode, Tok};
 use ruff_text_size::TextSize;
-use rustpython_ast::{Ranged, Stmt};
-use rustpython_parser::{lexer, Mode, Tok};
 
 use ruff_diagnostics::Edit;
 use ruff_python_ast::helpers::is_docstring_stmt;
@@ -299,10 +299,10 @@ fn match_leading_semicolon(s: &str) -> Option<TextSize> {
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
+    use ruff_python_ast::Suite;
+    use ruff_python_parser::lexer::LexResult;
+    use ruff_python_parser::Parse;
     use ruff_text_size::TextSize;
-    use rustpython_ast::Suite;
-    use rustpython_parser::lexer::LexResult;
-    use rustpython_parser::Parse;
 
     use ruff_python_codegen::Stylist;
     use ruff_source_file::{LineEnding, Locator};

crates/ruff/src/importer/mod.rs

@@ -7,8 +7,8 @@ use std::error::Error;
 
 use anyhow::Result;
 use libcst_native::{ImportAlias, Name, NameOrAttribute};
+use ruff_python_ast::{self as ast, Ranged, Stmt, Suite};
 use ruff_text_size::TextSize;
-use rustpython_ast::{self as ast, Ranged, Stmt, Suite};
 
 use ruff_diagnostics::Edit;
 use ruff_python_ast::imports::{AnyImport, Import, ImportFrom};

crates/ruff/src/jupyter/notebook.rs

@@ -10,10 +10,10 @@ use serde::Serialize;
 use serde_json::error::Category;
 
 use ruff_diagnostics::Diagnostic;
+use ruff_python_parser::lexer::lex;
+use ruff_python_parser::Mode;
 use ruff_source_file::{NewlineWithTrailingNewline, UniversalNewlineIterator};
 use ruff_text_size::{TextRange, TextSize};
-use rustpython_parser::lexer::lex;
-use rustpython_parser::Mode;
 
 use crate::autofix::source_map::{SourceMap, SourceMarker};
 use crate::jupyter::index::JupyterIndex;

crates/ruff/src/lex/docstring_detection.rs

@@ -4,7 +4,7 @@
 //!
 //! TODO(charlie): Consolidate with the existing AST-based docstring extraction.
 
-use rustpython_parser::Tok;
+use ruff_python_parser::Tok;
 
 #[derive(Default, Copy, Clone)]
 enum State {

crates/ruff/src/linter.rs

@@ -6,9 +6,9 @@ use anyhow::{anyhow, Result};
 use colored::Colorize;
 use itertools::Itertools;
 use log::error;
+use ruff_python_parser::lexer::LexResult;
+use ruff_python_parser::ParseError;
 use rustc_hash::FxHashMap;
-use rustpython_parser::lexer::LexResult;
-use rustpython_parser::ParseError;
 
 use ruff_diagnostics::Diagnostic;
 use ruff_python_ast::imports::ImportMap;

crates/ruff/src/logging.rs

@@ -7,7 +7,7 @@ use colored::Colorize;
 use fern;
 use log::Level;
 use once_cell::sync::Lazy;
-use rustpython_parser::{ParseError, ParseErrorType};
+use ruff_python_parser::{ParseError, ParseErrorType};
 
 use ruff_source_file::{OneIndexed, SourceCode, SourceLocation};
 

crates/ruff/src/noqa.rs

@@ -8,8 +8,8 @@ use std::path::Path;
 use anyhow::Result;
 use itertools::Itertools;
 use log::warn;
+use ruff_python_ast::Ranged;
 use ruff_text_size::{TextLen, TextRange, TextSize};
-use rustpython_ast::Ranged;
 
 use ruff_diagnostics::Diagnostic;
 use ruff_source_file::{LineEnding, Locator};

crates/ruff/src/registry.rs

@@ -246,8 +246,7 @@ impl Rule {
             | Rule::MissingNewlineAtEndOfFile
             | Rule::MixedSpacesAndTabs
             | Rule::TabIndentation
-            | Rule::TrailingWhitespace
-            | Rule::UTF8EncodingDeclaration => LintSource::PhysicalLines,
+            | Rule::TrailingWhitespace => LintSource::PhysicalLines,
             Rule::AmbiguousUnicodeCharacterComment
             | Rule::AmbiguousUnicodeCharacterDocstring
             | Rule::AmbiguousUnicodeCharacterString
@@ -289,7 +288,8 @@ impl Rule {
             | Rule::SingleLineImplicitStringConcatenation
             | Rule::TrailingCommaOnBareTuple
             | Rule::TypeCommentInStub
-            | Rule::UselessSemicolon => LintSource::Tokens,
+            | Rule::UselessSemicolon
+            | Rule::UTF8EncodingDeclaration => LintSource::Tokens,
             Rule::IOError => LintSource::Io,
             Rule::UnsortedImports | Rule::MissingRequiredImport => LintSource::Imports,
             Rule::ImplicitNamespacePackage | Rule::InvalidModuleName => LintSource::Filesystem,

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

@@ -1,10 +1,10 @@
-use rustpython_ast::{Expr, Ranged};
-use rustpython_parser::ast;
+use ruff_python_ast as ast;
+use ruff_python_ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::find_keyword;
-use rustpython_ast::Constant;
+use ruff_python_ast::Constant;
 
 use crate::checkers::ast::Checker;
 

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

@@ -1,8 +1,8 @@
 /// See: [eradicate.py](https://github.com/myint/eradicate/blob/98f199940979c94447a461d50d27862b118b282d/eradicate.py)
 use once_cell::sync::Lazy;
 use regex::Regex;
-use rustpython_ast::Suite;
-use rustpython_parser::Parse;
+use ruff_python_ast::Suite;
+use ruff_python_parser::Parse;
 
 static ALLOWLIST_REGEX: Lazy<Regex> = Lazy::new(|| {
     Regex::new(

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

@@ -1,4 +1,4 @@
-use rustpython_ast::Expr;
+use ruff_python_ast::Expr;
 
 use ruff_python_semantic::SemanticModel;
 

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

@@ -1,5 +1,5 @@
 use num_bigint::BigInt;
-use rustpython_ast::{self as ast, CmpOp, Constant, Expr, Ranged};
+use ruff_python_ast::{self as ast, CmpOp, Constant, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

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

@@ -1,4 +1,4 @@
-use rustpython_ast::{Expr, Ranged};
+use ruff_python_ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

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

@@ -1,5 +1,5 @@
 use num_bigint::BigInt;
-use rustpython_ast::{self as ast, Constant, Expr, Ranged};
+use ruff_python_ast::{self as ast, Constant, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

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

@@ -1,6 +1,6 @@
 use anyhow::{bail, Result};
-use rustpython_ast::{Ranged, Stmt};
-use rustpython_parser::{lexer, Mode, Tok};
+use ruff_python_ast::{Ranged, Stmt};
+use ruff_python_parser::{lexer, Mode, Tok};
 
 use ruff_diagnostics::Edit;
 use ruff_source_file::Locator;

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

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, Arguments, Expr, Stmt};
+use ruff_python_ast::{self as ast, Arguments, Expr, Stmt};
 
 use ruff_python_ast::cast;
 use ruff_python_semantic::analyze::visibility;

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

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, ArgWithDefault, Constant, Expr, Ranged, Stmt};
+use ruff_python_ast::{self as ast, ArgWithDefault, Constant, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};

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

@@ -1,5 +1,5 @@
-use rustpython_ast::{Expr, Ranged};
-use rustpython_parser::ast;
+use ruff_python_ast as ast;
+use ruff_python_ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

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

@@ -1,5 +1,5 @@
-use rustpython_ast::{Expr, Ranged};
-use rustpython_parser::ast;
+use ruff_python_ast as ast;
+use ruff_python_ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

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

@@ -1,5 +1,5 @@
-use rustpython_ast::{Expr, Ranged};
-use rustpython_parser::ast;
+use ruff_python_ast as ast;
+use ruff_python_ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/helpers.rs

@@ -1,6 +1,6 @@
 use once_cell::sync::Lazy;
 use regex::Regex;
-use rustpython_ast::{self as ast, Constant, Expr};
+use ruff_python_ast::{self as ast, Constant, Expr};
 
 use ruff_python_semantic::SemanticModel;
 

crates/ruff/src/rules/flake8_bandit/rules/assert_used.rs

@@ -1,5 +1,5 @@
+use ruff_python_ast::{Ranged, Stmt};
 use ruff_text_size::{TextLen, TextRange};
-use rustpython_ast::{Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/bad_file_permissions.rs

@@ -1,5 +1,5 @@
 use num_traits::ToPrimitive;
-use rustpython_ast::{self as ast, Constant, Expr, Keyword, Operator, Ranged};
+use ruff_python_ast::{self as ast, Constant, Expr, Keyword, Operator, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/exec_used.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Expr, Ranged};
+use ruff_python_ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_default.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Arg, ArgWithDefault, Arguments, Expr, Ranged};
+use ruff_python_ast::{Arg, ArgWithDefault, Arguments, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_func_arg.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Keyword, Ranged};
+use ruff_python_ast::{Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/hardcoded_password_string.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, Constant, Expr, Ranged};
+use ruff_python_ast::{self as ast, Constant, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/hardcoded_sql_expression.rs

@@ -1,6 +1,6 @@
 use once_cell::sync::Lazy;
 use regex::Regex;
-use rustpython_ast::{self as ast, Expr, Operator, Ranged};
+use ruff_python_ast::{self as ast, Expr, Operator, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/hardcoded_tmp_directory.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Expr, Ranged};
+use ruff_python_ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/hashlib_insecure_hash_functions.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Expr, Keyword, Ranged};
+use ruff_python_ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/jinja2_autoescape_false.rs

@@ -1,5 +1,5 @@
 use ruff_python_ast::helpers::find_keyword;
-use rustpython_ast::{self as ast, Constant, Expr, Keyword, Ranged};
+use ruff_python_ast::{self as ast, Constant, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/logging_config_insecure_listen.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Expr, Keyword, Ranged};
+use ruff_python_ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/paramiko_calls.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Expr, Ranged};
+use ruff_python_ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/request_with_no_cert_validation.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Expr, Keyword, Ranged};
+use ruff_python_ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/request_without_timeout.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Expr, Keyword, Ranged};
+use ruff_python_ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/shell_injection.rs

@@ -1,6 +1,6 @@
 //! Checks relating to shell injection.
 
-use rustpython_ast::{self as ast, Constant, Expr, Keyword, Ranged};
+use ruff_python_ast::{self as ast, Constant, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/snmp_insecure_version.rs

@@ -1,5 +1,5 @@
 use num_traits::{One, Zero};
-use rustpython_ast::{self as ast, Constant, Expr, Keyword, Ranged};
+use ruff_python_ast::{self as ast, Constant, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/snmp_weak_cryptography.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Expr, Keyword, Ranged};
+use ruff_python_ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/suspicious_function_call.rs

@@ -1,7 +1,7 @@
 //! Check for calls to suspicious functions, or calls into suspicious modules.
 //!
 //! See: <https://bandit.readthedocs.io/en/latest/blacklists/blacklist_calls.html>
-use rustpython_ast::{self as ast, Expr, Ranged};
+use ruff_python_ast::{self as ast, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, DiagnosticKind, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/try_except_continue.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{ExceptHandler, Expr, Ranged, Stmt};
+use ruff_python_ast::{ExceptHandler, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/try_except_pass.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{ExceptHandler, Expr, Ranged, Stmt};
+use ruff_python_ast::{ExceptHandler, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bandit/rules/unsafe_yaml_load.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, Expr, Keyword, Ranged};
+use ruff_python_ast::{self as ast, Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_blind_except/rules/blind_except.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, Expr, Ranged, Stmt};
+use ruff_python_ast::{self as ast, Expr, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_boolean_trap/helpers.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, Constant, Expr, Ranged};
+use ruff_python_ast::{self as ast, Constant, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, DiagnosticKind};
 

crates/ruff/src/rules/flake8_boolean_trap/rules/check_boolean_default_value_in_function_definition.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{ArgWithDefault, Arguments, Decorator};
+use ruff_python_ast::{ArgWithDefault, Arguments, Decorator};
 
 use ruff_diagnostics::Violation;
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_boolean_trap/rules/check_boolean_positional_value_in_function_call.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::Expr;
+use ruff_python_ast::Expr;
 
 use ruff_diagnostics::Violation;
 

crates/ruff/src/rules/flake8_boolean_trap/rules/check_positional_boolean_in_def.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, ArgWithDefault, Arguments, Constant, Decorator, Expr, Ranged};
+use ruff_python_ast::{self as ast, ArgWithDefault, Arguments, Constant, Decorator, Expr, Ranged};
 
 use ruff_diagnostics::Diagnostic;
 use ruff_diagnostics::Violation;

crates/ruff/src/rules/flake8_bugbear/rules/abstract_base_class.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, Constant, Expr, Keyword, Ranged, Stmt};
+use ruff_python_ast::{self as ast, Constant, Expr, Keyword, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bugbear/rules/assert_false.rs

@@ -1,5 +1,5 @@
+use ruff_python_ast::{self as ast, Expr, ExprContext, Ranged, Stmt};
 use ruff_text_size::TextRange;
-use rustpython_ast::{self as ast, Expr, ExprContext, Ranged, Stmt};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bugbear/rules/assert_raises_exception.rs

@@ -1,6 +1,6 @@
 use std::fmt;
 
-use rustpython_ast::{self as ast, Expr, Ranged, WithItem};
+use ruff_python_ast::{self as ast, Expr, Ranged, WithItem};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bugbear/rules/assignment_to_os_environ.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, Expr, Ranged};
+use ruff_python_ast::{self as ast, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bugbear/rules/cached_instance_method.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, Decorator, Expr, Ranged};
+use ruff_python_ast::{self as ast, Decorator, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bugbear/rules/duplicate_exceptions.rs

@@ -1,7 +1,7 @@
 use itertools::Itertools;
+use ruff_python_ast::{self as ast, ExceptHandler, Expr, ExprContext, Ranged};
 use ruff_text_size::TextRange;
 use rustc_hash::{FxHashMap, FxHashSet};
-use rustpython_ast::{self as ast, ExceptHandler, Expr, ExprContext, Ranged};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Violation};
 use ruff_diagnostics::{Diagnostic, Edit, Fix};

crates/ruff/src/rules/flake8_bugbear/rules/duplicate_value.rs

@@ -1,5 +1,5 @@
+use ruff_python_ast::{self as ast, Expr, Ranged};
 use rustc_hash::FxHashSet;
-use rustpython_ast::{self as ast, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bugbear/rules/except_with_empty_tuple.rs

@@ -1,5 +1,5 @@
-use rustpython_ast::{self as ast, Ranged};
-use rustpython_ast::{ExceptHandler, Expr};
+use ruff_python_ast::{self as ast, Ranged};
+use ruff_python_ast::{ExceptHandler, Expr};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bugbear/rules/except_with_non_exception_classes.rs

@@ -1,6 +1,6 @@
 use std::collections::VecDeque;
 
-use rustpython_ast::{self as ast, ExceptHandler, Expr, Ranged};
+use ruff_python_ast::{self as ast, ExceptHandler, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bugbear/rules/f_string_docstring.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, Stmt};
+use ruff_python_ast::{self as ast, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bugbear/rules/function_call_in_argument_default.rs

@@ -1,5 +1,5 @@
+use ruff_python_ast::{self as ast, ArgWithDefault, Arguments, Expr, Ranged};
 use ruff_text_size::TextRange;
-use rustpython_ast::{self as ast, ArgWithDefault, Arguments, Expr, Ranged};
 
 use ruff_diagnostics::Violation;
 use ruff_diagnostics::{Diagnostic, DiagnosticKind};

crates/ruff/src/rules/flake8_bugbear/rules/function_uses_loop_variable.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, Comprehension, Expr, ExprContext, Ranged, Stmt};
+use ruff_python_ast::{self as ast, Comprehension, Expr, ExprContext, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bugbear/rules/getattr_with_constant.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, Constant, Expr, Ranged};
+use ruff_python_ast::{self as ast, Constant, Expr, Ranged};
 
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bugbear/rules/jump_statement_in_finally.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{self as ast, Ranged, Stmt};
+use ruff_python_ast::{self as ast, Ranged, Stmt};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bugbear/rules/loop_variable_overrides_iterator.rs

@@ -1,5 +1,5 @@
+use ruff_python_ast::{self as ast, ArgWithDefault, Expr, Ranged};
 use rustc_hash::FxHashMap;
-use rustpython_ast::{self as ast, ArgWithDefault, Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bugbear/rules/mutable_argument_default.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{ArgWithDefault, Arguments, Ranged};
+use ruff_python_ast::{ArgWithDefault, Arguments, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bugbear/rules/no_explicit_stacklevel.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Expr, Keyword, Ranged};
+use ruff_python_ast::{Expr, Keyword, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};

crates/ruff/src/rules/flake8_bugbear/rules/raise_literal.rs

@@ -1,4 +1,4 @@
-use rustpython_ast::{Expr, Ranged};
+use ruff_python_ast::{Expr, Ranged};
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};