Use tracing in ruff_cli

.github/workflows/docs.yaml

@@ -52,4 +52,4 @@ jobs:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}
           # `github.head_ref` is only set during pull requests and for manual runs or tags we use `main` to deploy to production
-          command: pages deploy site --project-name=astral-docs --branch ${{ github.head_ref || 'main' }} --commit-hash ${GITHUB_SHA}
+          command: pages deploy site --project-name=ruff-docs --branch ${{ github.head_ref || 'main' }} --commit-hash ${GITHUB_SHA}

.github/workflows/playground.yaml

@@ -44,4 +44,4 @@ jobs:
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          command: pages deploy playground/dist --project-name=ruff-playground --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}
+          command: pages publish playground/dist --project-name=ruff --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}

.github/workflows/release.yaml

@@ -419,7 +419,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: main # We checkout the main branch to check for the commit
+          ref: ${{ inputs.sha }}
+      - name: Check tag consistency
+        run: |
+          version=$(grep "version = " pyproject.toml | sed -e 's/version = "\(.*\)"/\1/g')
+          if [ "${{ inputs.tag }}" != "${version}" ]; then
+            echo "The input tag does not match the version from pyproject.toml:" >&2
+            echo "${{ inputs.tag }}" >&2
+            echo "${version}" >&2
+            exit 1
+          else
+            echo "Releasing ${version}"
+          fi
       - name: Check main branch
         if: ${{ inputs.sha }}
         run: |
@@ -429,18 +440,17 @@ jobs:
             echo "The specified sha is not on the main branch" >&2
             exit 1
           fi
-      - name: Check tag consistency
+      - name: Check SHA consistency
+        if: ${{ inputs.sha }}
         run: |
-          # Switch to the commit we want to release
-          git checkout ${{ inputs.sha }}
-          version=$(grep "version = " pyproject.toml | sed -e 's/version = "\(.*\)"/\1/g')
-          if [ "${{ inputs.tag }}" != "${version}" ]; then
-            echo "The input tag does not match the version from pyproject.toml:" >&2
-            echo "${{ inputs.tag }}" >&2
-            echo "${version}" >&2
+          git_sha=$(git rev-parse HEAD)
+          if [ "${{ inputs.sha }}" != "${git_sha}" ]; then
+            echo "The specified sha does not match the git checkout" >&2
+            echo "${{ inputs.sha }}" >&2
+            echo "${git_sha}" >&2
             exit 1
           else
-            echo "Releasing ${version}"
+            echo "Releasing ${git_sha}"
           fi
 
   upload-release:

BREAKING_CHANGES.md

@@ -299,4 +299,4 @@ default.
 `pyproject.toml` files are now resolved hierarchically, such that for each Python file, we find
 the first `pyproject.toml` file in its path, and use that to determine its lint settings.
 
-See the [documentation](https://docs.astral.sh/ruff/configuration/#python-file-discovery) for more.
+See the [documentation](https://beta.ruff.rs/docs/configuration/#python-file-discovery) for more.

CONTRIBUTING.md

@@ -719,8 +719,8 @@ Module {
 - `cargo dev generate-cli-help`, `cargo dev generate-docs` and `cargo dev generate-json-schema`:
     Update just `docs/configuration.md`, `docs/rules` and `ruff.schema.json` respectively.
 - `cargo dev generate-options`: Generate a markdown-compatible table of all `pyproject.toml`
-    options. Used for <https://docs.astral.sh/ruff/settings/>.
-- `cargo dev generate-rules-table`: Generate a markdown-compatible table of all rules. Used for <https://docs.astral.sh/ruff/rules/>.
+    options. Used for <https://beta.ruff.rs/docs/settings/>
+- `cargo dev generate-rules-table`: Generate a markdown-compatible table of all rules. Used for <https://beta.ruff.rs/docs/rules/>
 - `cargo dev round-trip <python file or jupyter notebook>`: Read a Python file or Jupyter Notebook,
     parse it, serialize the parsed representation and write it back. Used to check how good our
     representation is so that fixes don't rewrite irrelevant parts of a file.
@@ -778,7 +778,7 @@ To understand Ruff's import categorization system, we first need to define two c
 - "Package root": The top-most directory defining the Python package that includes a given Python
     file. To find the package root for a given Python file, traverse up its parent directories until
     you reach a parent directory that doesn't contain an `__init__.py` file (and isn't marked as
-    a [namespace package](https://docs.astral.sh/ruff/settings/#namespace-packages)); take the directory
+    a [namespace package](https://beta.ruff.rs/docs/settings/#namespace-packages)); take the directory
     just before that, i.e., the first directory in the package.
 
 For example, given:
@@ -867,7 +867,7 @@ There are three ways in which an import can be categorized as "first-party":
     package (e.g., `from foo import bar` or `import foo.bar`), they'll be classified as first-party
     automatically. This check is as simple as comparing the first segment of the current file's
     module path to the first segment of the import.
-1. **Source roots**: Ruff supports a `[src](https://docs.astral.sh/ruff/settings/#src)` setting, which
+1. **Source roots**: Ruff supports a `[src](https://beta.ruff.rs/docs/settings/#src)` setting, which
     sets the directories to scan when identifying first-party imports. The algorithm is
     straightforward: given an import, like `import foo`, iterate over the directories enumerated in
     the `src` setting and, for each directory, check for the existence of a subdirectory `foo` or a

Cargo.lock

@@ -172,12 +172,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
 [[package]]
 name = "base64"
 version = "0.21.3"
@@ -220,15 +214,6 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
 
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "bstr"
 version = "1.6.2"
@@ -236,7 +221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a"
 dependencies = [
  "memchr",
- "regex-automata 0.3.8",
+ "regex-automata 0.3.7",
  "serde",
 ]
 
@@ -287,14 +272,15 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.31"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
+ "time",
  "wasm-bindgen",
  "windows-targets 0.48.5",
 ]
@@ -328,19 +314,20 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.4"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136"
+checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27"
 dependencies = [
  "clap_builder",
  "clap_derive",
+ "once_cell",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.4.4"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56"
+checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d"
 dependencies = [
  "anstream",
  "anstyle",
@@ -391,14 +378,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.4.2"
+version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
+checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -510,15 +497,6 @@ version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
 
-[[package]]
-name = "cpufeatures"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "crc32fast"
 version = "1.3.2"
@@ -540,7 +518,7 @@ dependencies = [
  "clap",
  "criterion-plot",
  "is-terminal",
- "itertools 0.10.5",
+ "itertools",
  "num-traits",
  "once_cell",
  "oorandom",
@@ -559,7 +537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
 dependencies = [
  "cast",
- "itertools 0.10.5",
+ "itertools",
 ]
 
 [[package]]
@@ -611,16 +589,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
 [[package]]
 name = "darling"
 version = "0.20.3"
@@ -642,7 +610,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.37",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -653,7 +621,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -668,16 +636,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
 [[package]]
 name = "dirs"
 version = "4.0.0"
@@ -764,18 +722,6 @@ version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
-[[package]]
-name = "embed-doc-image"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af36f591236d9d822425cb6896595658fa558fcebf5ee8accac1d4b92c47166e"
-dependencies = [
- "base64 0.13.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "ena"
 version = "0.14.2"
@@ -837,15 +783,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
 
-[[package]]
-name = "fern"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee"
-dependencies = [
- "log",
-]
-
 [[package]]
 name = "filetime"
 version = "0.2.22"
@@ -866,13 +803,13 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.290"
+version = "0.0.289"
 dependencies = [
  "anyhow",
  "clap",
  "colored",
  "configparser",
- "itertools 0.11.0",
+ "itertools",
  "log",
  "once_cell",
  "pep440_rs",
@@ -928,16 +865,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.10"
@@ -947,7 +874,7 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
@@ -1115,9 +1042,9 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.4"
+version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
+checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4"
 
 [[package]]
 name = "inotify"
@@ -1186,7 +1113,7 @@ dependencies = [
  "pmutil 0.6.1",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -1209,15 +1136,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.9"
@@ -1233,15 +1151,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "keccak"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
-dependencies = [
- "cpufeatures",
-]
-
 [[package]]
 name = "kqueue"
 version = "1.0.8"
@@ -1273,7 +1182,7 @@ dependencies = [
  "diff",
  "ena",
  "is-terminal",
- "itertools 0.10.5",
+ "itertools",
  "lalrpop-util",
  "petgraph",
  "regex",
@@ -1359,9 +1268,9 @@ dependencies = [
 
 [[package]]
 name = "libmimalloc-sys"
-version = "0.1.35"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664"
+checksum = "25d058a81af0d1c22d7a1c948576bee6d673f7af3c0f35564abd6c81122f513d"
 dependencies = [
  "cc",
  "libc",
@@ -1395,41 +1304,6 @@ version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
-[[package]]
-name = "malachite"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9fa232412d927f518cd873073911726943f432bac1bbc1288316d240635dc51"
-dependencies = [
- "malachite-base",
- "malachite-nz",
-]
-
-[[package]]
-name = "malachite-base"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "606a61b226dc58b8b283399b74754460433c193b193f26eaaad92f7966abd72b"
-dependencies = [
- "getrandom",
- "itertools 0.11.0",
- "rand",
- "rand_chacha",
- "ryu",
- "sha3",
-]
-
-[[package]]
-name = "malachite-nz"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "863d06218c83cc2269c425186cc15094d6284b1333a1184d0890aecfddb8916b"
-dependencies = [
- "embed-doc-image",
- "itertools 0.11.0",
- "malachite-base",
-]
-
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -1462,9 +1336,9 @@ dependencies = [
 
 [[package]]
 name = "mimalloc"
-version = "0.1.39"
+version = "0.1.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c"
+checksum = "972e5f23f6716f62665760b0f4cbf592576a80c7b879ba9beaafc0e558894127"
 dependencies = [
  "libmimalloc-sys",
 ]
@@ -1492,7 +1366,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
  "log",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.48.0",
 ]
 
@@ -1537,21 +1411,20 @@ dependencies = [
 
 [[package]]
 name = "notify"
-version = "6.1.1"
+version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
+checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 1.3.2",
  "crossbeam-channel",
  "filetime",
  "fsevent-sys",
  "inotify",
  "kqueue",
  "libc",
- "log",
  "mio",
  "walkdir",
- "windows-sys 0.48.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -1564,6 +1437,27 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "num-bigint"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.16"
@@ -1818,7 +1712,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -1847,7 +1741,7 @@ checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9"
 dependencies = [
  "anstyle",
  "difflib",
- "itertools 0.10.5",
+ "itertools",
  "predicates-core",
 ]
 
@@ -1903,9 +1797,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
 dependencies = [
  "unicode-ident",
 ]
@@ -2038,13 +1932,13 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.5"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
+checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.3.8",
+ "regex-automata 0.3.7",
  "regex-syntax 0.7.5",
 ]
 
@@ -2059,9 +1953,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.8"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
+checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2119,7 +2013,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.290"
+version = "0.0.289"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -2127,18 +2021,17 @@ dependencies = [
  "chrono",
  "clap",
  "colored",
- "fern",
  "glob",
  "globset",
  "imperative",
  "insta",
  "is-macro",
- "itertools 0.11.0",
+ "itertools",
  "libcst",
  "log",
- "malachite",
  "memchr",
  "natord",
+ "num-bigint",
  "num-traits",
  "once_cell",
  "path-absolutize",
@@ -2177,6 +2070,8 @@ dependencies = [
  "test-case",
  "thiserror",
  "toml",
+ "tracing",
+ "tracing-subscriber",
  "typed-arena",
  "unicode-width",
  "unicode_names2",
@@ -2210,14 +2105,14 @@ dependencies = [
  "filetime",
  "glob",
  "globset",
- "itertools 0.11.0",
+ "itertools",
  "regex",
  "ruff_macros",
 ]
 
 [[package]]
 name = "ruff_cli"
-version = "0.0.290"
+version = "0.0.289"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -2237,7 +2132,7 @@ dependencies = [
  "insta",
  "insta-cmd",
  "is-macro",
- "itertools 0.11.0",
+ "itertools",
  "itoa",
  "log",
  "mimalloc",
@@ -2284,7 +2179,7 @@ dependencies = [
  "imara-diff",
  "indicatif",
  "indoc",
- "itertools 0.11.0",
+ "itertools",
  "libcst",
  "once_cell",
  "pretty_assertions",
@@ -2353,11 +2248,11 @@ dependencies = [
 name = "ruff_macros"
 version = "0.0.0"
 dependencies = [
- "itertools 0.11.0",
+ "itertools",
  "proc-macro2",
  "quote",
  "ruff_python_trivia",
- "syn 2.0.37",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -2366,7 +2261,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "insta",
- "itertools 0.11.0",
+ "itertools",
  "once_cell",
  "ruff_diagnostics",
  "ruff_source_file",
@@ -2386,9 +2281,10 @@ dependencies = [
  "bitflags 2.4.0",
  "insta",
  "is-macro",
- "itertools 0.11.0",
- "malachite",
+ "itertools",
  "memchr",
+ "num-bigint",
+ "num-traits",
  "once_cell",
  "ruff_python_parser",
  "ruff_python_trivia",
@@ -2420,7 +2316,7 @@ dependencies = [
  "clap",
  "countme",
  "insta",
- "itertools 0.11.0",
+ "itertools",
  "memchr",
  "once_cell",
  "ruff_formatter",
@@ -2445,7 +2341,7 @@ dependencies = [
 name = "ruff_python_index"
 version = "0.0.0"
 dependencies = [
- "itertools 0.11.0",
+ "itertools",
  "ruff_python_ast",
  "ruff_python_parser",
  "ruff_python_trivia",
@@ -2460,7 +2356,7 @@ dependencies = [
  "bitflags 2.4.0",
  "hexf-parse",
  "is-macro",
- "itertools 0.11.0",
+ "itertools",
  "lexical-parse-float",
  "num-traits",
  "rand",
@@ -2474,10 +2370,11 @@ dependencies = [
  "anyhow",
  "insta",
  "is-macro",
- "itertools 0.11.0",
+ "itertools",
  "lalrpop",
  "lalrpop-util",
- "malachite",
+ "num-bigint",
+ "num-traits",
  "ruff_python_ast",
  "ruff_text_size",
  "rustc-hash",
@@ -2503,6 +2400,7 @@ version = "0.0.0"
 dependencies = [
  "bitflags 2.4.0",
  "is-macro",
+ "num-traits",
  "ruff_index",
  "ruff_python_ast",
  "ruff_python_parser",
@@ -2525,11 +2423,12 @@ name = "ruff_python_trivia"
 version = "0.0.0"
 dependencies = [
  "insta",
- "itertools 0.11.0",
+ "memchr",
  "ruff_python_ast",
  "ruff_python_parser",
  "ruff_source_file",
  "ruff_text_size",
+ "smallvec",
  "unicode-ident",
 ]
 
@@ -2586,7 +2485,6 @@ dependencies = [
  "ruff_python_formatter",
  "ruff_python_index",
  "ruff_python_parser",
- "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
  "ruff_workspace",
@@ -2606,7 +2504,7 @@ dependencies = [
  "glob",
  "globset",
  "ignore",
- "itertools 0.11.0",
+ "itertools",
  "log",
  "path-absolutize",
  "pep440_rs",
@@ -2707,9 +2605,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.15"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c"
+checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161"
 dependencies = [
  "dyn-clone",
  "schemars_derive",
@@ -2719,9 +2617,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.15"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c"
+checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2768,9 +2666,9 @@ dependencies = [
 
 [[package]]
 name = "serde-wasm-bindgen"
-version = "0.6.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30c9933e5689bd420dc6c87b7a1835701810cbc10cd86a26e4da45b73e6b1d78"
+checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e"
 dependencies = [
  "js-sys",
  "serde",
@@ -2785,7 +2683,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -2801,9 +2699,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2"
 dependencies = [
  "itoa",
  "ryu",
@@ -2847,17 +2745,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
-]
-
-[[package]]
-name = "sha3"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
-dependencies = [
- "digest",
- "keccak",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -2880,9 +2768,9 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.2.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
+checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
 
 [[package]]
 name = "similar"
@@ -2952,7 +2840,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.37",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -2968,9 +2856,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.37"
+version = "2.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3040,57 +2928,57 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "test-case"
-version = "3.2.1"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425"
+checksum = "2a1d6e7bde536b0412f20765b76e921028059adfd1b90d8974d33fd3c91b25df"
 dependencies = [
  "test-case-macros",
 ]
 
 [[package]]
 name = "test-case-core"
-version = "3.2.1"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462"
+checksum = "d10394d5d1e27794f772b6fc854c7e91a2dc26e2cbf807ad523370c2a59c0cee"
 dependencies = [
  "cfg-if",
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "test-case-macros"
-version = "3.2.1"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257"
+checksum = "eeb9a44b1c6a54c1ba58b152797739dba2a83ca74e18168a68c980eb142f9404"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 1.0.109",
  "test-case-core",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.48"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
+checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.48"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
+checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -3123,6 +3011,17 @@ dependencies = [
  "tikv-jemalloc-sys",
 ]
 
+[[package]]
+name = "time"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
+dependencies = [
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi",
+]
+
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -3159,9 +3058,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "toml"
-version = "0.7.8"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -3180,9 +3079,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.19.15"
+version = "0.19.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
 dependencies = [
  "indexmap",
  "serde",
@@ -3212,7 +3111,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -3272,12 +3171,6 @@ version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
 
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
 [[package]]
 name = "unic-char-property"
 version = "0.9.0"
@@ -3328,9 +3221,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
 [[package]]
 name = "unicode-normalization"
@@ -3373,7 +3266,7 @@ version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9"
 dependencies = [
- "base64 0.21.3",
+ "base64",
  "flate2",
  "log",
  "once_cell",
@@ -3421,7 +3314,7 @@ checksum = "f7e1ba1f333bd65ce3c9f27de592fcbc256dafe3af2717f56d7c87761fbaccf4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -3488,6 +3381,12 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -3515,7 +3414,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.29",
  "wasm-bindgen-shared",
 ]
 
@@ -3549,7 +3448,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.29",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]

Cargo.toml

@@ -5,8 +5,8 @@ resolver = "2"
 [workspace.package]
 edition = "2021"
 rust-version = "1.71"
-homepage = "https://docs.astral.sh/ruff"
-documentation = "https://docs.astral.sh/ruff"
+homepage = "https://beta.ruff.rs/docs"
+documentation = "https://beta.ruff.rs/docs"
 repository = "https://github.com/astral-sh/ruff"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 license = "MIT"
@@ -14,8 +14,8 @@ license = "MIT"
 [workspace.dependencies]
 anyhow = { version = "1.0.69" }
 bitflags = { version = "2.3.1" }
-chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
-clap = { version = "4.4.4", features = ["derive"] }
+chrono = { version = "0.4.23", default-features = false, features = ["clock"] }
+clap = { version = "4.1.8", features = ["derive"] }
 colored = { version = "2.0.0" }
 filetime = { version = "0.2.20" }
 glob = { version = "0.3.1" }
@@ -23,34 +23,34 @@ globset = { version = "0.4.10" }
 ignore = { version = "0.4.20" }
 insta = { version = "1.31.0", feature = ["filters", "glob"] }
 is-macro = { version = "0.3.0" }
-itertools = { version = "0.11.0" }
+itertools = { version = "0.10.5" }
 log = { version = "0.4.17" }
-malachite = { version = "0.4.0", default-features = false, features = ["naturals_and_integers"] }
 memchr = "2.6.3"
+num-bigint = { version = "0.4.3" }
 num-traits = { version = "0.2.15" }
 once_cell = { version = "1.17.1" }
 path-absolutize = { version = "3.1.1" }
-proc-macro2 = { version = "1.0.67" }
+proc-macro2 = { version = "1.0.51" }
 quote = { version = "1.0.23" }
-regex = { version = "1.9.5" }
+regex = { version = "1.7.1" }
 rustc-hash = { version = "1.1.0" }
-schemars = { version = "0.8.15" }
+schemars = { version = "0.8.12" }
 serde = { version = "1.0.152", features = ["derive"] }
-serde_json = { version = "1.0.107" }
+serde_json = { version = "1.0.106" }
 shellexpand = { version = "3.0.0" }
 similar = { version = "2.2.1", features = ["inline"] }
 smallvec = { version = "1.10.0" }
 static_assertions = "1.1.0"
 strum = { version = "0.25.0", features = ["strum_macros"] }
 strum_macros = { version = "0.25.2" }
-syn = { version = "2.0.37" }
-test-case = { version = "3.2.1" }
-thiserror = { version = "1.0.48" }
-toml = { version = "0.7.8" }
+syn = { version = "2.0.15" }
+test-case = { version = "3.0.0" }
+thiserror = { version = "1.0.43" }
+toml = { version = "0.7.2" }
 tracing = "0.1.37"
 tracing-indicatif = "0.3.4"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-unicode-ident = "1.0.12"
+unicode-ident = "1.0.11"
 unicode-width = "0.1.10"
 uuid = { version = "1.4.1", features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
 wsl = { version = "0.1.0" }

LICENSE

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

README.md

@@ -8,7 +8,7 @@
 [![image](https://img.shields.io/pypi/pyversions/ruff.svg)](https://pypi.python.org/pypi/ruff)
 [![Actions status](https://github.com/astral-sh/ruff/workflows/CI/badge.svg)](https://github.com/astral-sh/ruff/actions)
 
-[**Discord**](https://discord.gg/c9MhzV8aU5) | [**Docs**](https://docs.astral.sh/ruff/) | [**Playground**](https://play.ruff.rs/)
+[**Discord**](https://discord.gg/c9MhzV8aU5) | [**Docs**](https://beta.ruff.rs/docs/) | [**Playground**](https://play.ruff.rs/)
 
 An extremely fast Python linter, written in Rust.
 
@@ -30,13 +30,13 @@ An extremely fast Python linter, written in Rust.
 - 🤝 Python 3.11 compatibility
 - 📦 Built-in caching, to avoid re-analyzing unchanged files
 - 🔧 Autofix support, for automatic error correction (e.g., automatically remove unused imports)
-- 📏 Over [600 built-in rules](https://docs.astral.sh/ruff/rules/)
-- ⚖️ [Near-parity](https://docs.astral.sh/ruff/faq/#how-does-ruff-compare-to-flake8) with the
+- 📏 Over [600 built-in rules](https://beta.ruff.rs/docs/rules/)
+- ⚖️ [Near-parity](https://beta.ruff.rs/docs/faq/#how-does-ruff-compare-to-flake8) with the
     built-in Flake8 rule set
 - 🔌 Native re-implementations of dozens of Flake8 plugins, like flake8-bugbear
-- ⌨️ First-party [editor integrations](https://docs.astral.sh/ruff/editor-integrations/) for
+- ⌨️ First-party [editor integrations](https://beta.ruff.rs/docs/editor-integrations/) for
     [VS Code](https://github.com/astral-sh/ruff-vscode) and [more](https://github.com/astral-sh/ruff-lsp)
-- 🌎 Monorepo-friendly, with [hierarchical and cascading configuration](https://docs.astral.sh/ruff/configuration/#pyprojecttoml-discovery)
+- 🌎 Monorepo-friendly, with [hierarchical and cascading configuration](https://beta.ruff.rs/docs/configuration/#pyprojecttoml-discovery)
 
 Ruff aims to be orders of magnitude faster than alternative tools while integrating more
 functionality behind a single, common interface.
@@ -98,7 +98,7 @@ developer of [Zulip](https://github.com/zulip/zulip):
 
 ## Table of Contents
 
-For more, see the [documentation](https://docs.astral.sh/ruff/).
+For more, see the [documentation](https://beta.ruff.rs/docs/).
 
 1. [Getting Started](#getting-started)
 1. [Configuration](#configuration)
@@ -111,7 +111,7 @@ For more, see the [documentation](https://docs.astral.sh/ruff/).
 
 ## Getting Started
 
-For more, see the [documentation](https://docs.astral.sh/ruff/).
+For more, see the [documentation](https://beta.ruff.rs/docs/).
 
 ### Installation
 
@@ -122,7 +122,7 @@ pip install ruff
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
-and with [a variety of other package managers](https://docs.astral.sh/ruff/installation/).
+and with [a variety of other package managers](https://beta.ruff.rs/docs/installation/).
 
 ### Usage
 
@@ -140,7 +140,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.0.290
+  rev: v0.0.289
   hooks:
     - id: ruff
 ```
@@ -165,7 +165,7 @@ jobs:
 ### Configuration
 
 Ruff can be configured through a `pyproject.toml`, `ruff.toml`, or `.ruff.toml` file (see:
-[_Configuration_](https://docs.astral.sh/ruff/configuration/), or [_Settings_](https://docs.astral.sh/ruff/settings/)
+[_Configuration_](https://beta.ruff.rs/docs/configuration/), or [_Settings_](https://beta.ruff.rs/docs/settings/)
 for a complete list of all configuration options).
 
 If left unspecified, the default configuration is equivalent to:
@@ -238,7 +238,7 @@ isort, pyupgrade, and others. Regardless of the rule's origin, Ruff re-implement
 Rust as a first-party feature.
 
 By default, Ruff enables Flake8's `E` and `F` rules. Ruff supports all rules from the `F` category,
-and a [subset](https://docs.astral.sh/ruff/rules/#error-e) of the `E` category, omitting those
+and a [subset](https://beta.ruff.rs/docs/rules/#error-e) of the `E` category, omitting those
 stylistic rules made obsolete by the use of an autoformatter, like
 [Black](https://github.com/psf/black).
 
@@ -274,7 +274,6 @@ quality tools, including:
 - [flake8-gettext](https://pypi.org/project/flake8-gettext/)
 - [flake8-implicit-str-concat](https://pypi.org/project/flake8-implicit-str-concat/)
 - [flake8-import-conventions](https://github.com/joaopalmeiro/flake8-import-conventions)
-- [flake8-logging](https://pypi.org/project/flake8-logging/)
 - [flake8-logging-format](https://pypi.org/project/flake8-logging-format/)
 - [flake8-no-pep420](https://pypi.org/project/flake8-no-pep420)
 - [flake8-pie](https://pypi.org/project/flake8-pie/)
@@ -304,12 +303,12 @@ quality tools, including:
 - [tryceratops](https://pypi.org/project/tryceratops/)
 - [yesqa](https://pypi.org/project/yesqa/)
 
-For a complete enumeration of the supported rules, see [_Rules_](https://docs.astral.sh/ruff/rules/).
+For a complete enumeration of the supported rules, see [_Rules_](https://beta.ruff.rs/docs/rules/).
 
 ## Contributing
 
 Contributions are welcome and highly appreciated. To get started, check out the
-[**contributing guidelines**](https://docs.astral.sh/ruff/contributing/).
+[**contributing guidelines**](https://beta.ruff.rs/docs/contributing/).
 
 You can also join us on [**Discord**](https://discord.gg/c9MhzV8aU5).
 

crates/flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.290"
+version = "0.0.289"
 description = """
 Convert Flake8 configuration files to Ruff configuration files.
 """

crates/flake8_to_ruff/README.md

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

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.0.290"
+version = "0.0.289"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -37,7 +37,6 @@ bitflags = { workspace = true }
 chrono = { workspace = true }
 clap = { workspace = true, features = ["derive", "string"], optional = true }
 colored = { workspace = true }
-fern = { version = "0.6.1" }
 glob = { workspace = true }
 globset = { workspace = true }
 imperative = { version = "1.0.4" }
@@ -45,9 +44,9 @@ is-macro = { workspace = true }
 itertools = { workspace = true }
 libcst = { workspace = true }
 log = { workspace = true }
-malachite = { workspace = true }
 memchr = { workspace = true }
 natord = { version = "1.0.9" }
+num-bigint = { workspace = true }
 num-traits = { workspace = true }
 once_cell = { workspace = true }
 path-absolutize = { workspace = true, features = [
@@ -71,6 +70,8 @@ strum = { workspace = true }
 strum_macros = { workspace = true }
 thiserror = { workspace = true }
 toml = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
 typed-arena = { version = "2.0.2" }
 unicode-width = { workspace = true }
 unicode_names2 = { version = "0.6.0", git = "https://github.com/youknowone/unicode_names2.git", rev = "4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" }

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

@@ -1,22 +0,0 @@
-from flask import Flask
-
-app = Flask(__name__)
-
-@app.route('/')
-def main():
-    raise
-
-# OK
-app.run(debug=True)
-
-# Errors
-app.run()
-app.run(debug=False)
-
-# Unrelated
-run()
-run(debug=True)
-run(debug)
-foo.run(debug=True)
-app = 1
-app.run(debug=True)

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_4.py

@@ -1,9 +0,0 @@
-# formfeed indent
-# https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458825
-# This is technically a stylist bug (and has a test there), but it surfaced in B006
-
-
-class FormFeedIndent:
-   def __init__(self, a=[]):
-        print(a)
-

crates/ruff/resources/test/fixtures/flake8_bugbear/B009_B010.py

@@ -53,6 +53,3 @@ setattr(foo, "__123abc__", None)
 setattr(foo, "abc123", None)
 setattr(foo, r"abc123", None)
 setattr(foo.bar, r"baz", None)
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
-assert getattr(func, '_rpc')is True

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

@@ -19,6 +19,3 @@ print(f'Hello {dict((x,f(x)) for x in "abc")} World')
 
 # Regression test for: https://github.com/astral-sh/ruff/issues/7086
 dict((k,v)for k,v in d.iteritems() if k in only_args)
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458940
-dict((*v, k) for k, v in enumerate(calendar.month_abbr))

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

@@ -7,8 +7,6 @@ d = {"a": 1, "b": 2, "c": 3}
 {i for i in x}
 {k: v for k, v in y}
 {k: v for k, v in d.items()}
-[(k, v) for k, v in d.items()]
-{k: (a, b) for k, (a, b) in d.items()}
 
 [i for i, in z]
 [i for i, j in y]

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

@@ -1,5 +0,0 @@
-import logging
-
-logging.Logger(__name__)
-logging.Logger()
-logging.getLogger(__name__)

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

@@ -1,24 +0,0 @@
-import logging
-from logging import getLogger
-
-# Ok
-logging.getLogger(__name__)
-logging.getLogger(name=__name__)
-logging.getLogger("custom")
-logging.getLogger(name="custom")
-
-# LOG002
-getLogger(__file__)
-logging.getLogger(name=__file__)
-
-logging.getLogger(__cached__)
-getLogger(name=__cached__)
-
-
-# Override `logging.getLogger`
-class logging:
-    def getLogger(self):
-        pass
-
-
-logging.getLogger(__file__)

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

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

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

@@ -1,9 +0,0 @@
-import logging
-
-logging.WARN  # LOG009
-logging.WARNING  # OK
-
-from logging import WARN, WARNING
-
-WARN  # LOG009
-WARNING  # OK

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

@@ -92,9 +92,3 @@ class Test(unittest.TestCase):
 
     def test_fail_if_equal(self):
         self.failIfEqual(1, 2)  # Error
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459517
-(self.assertTrue(
-    "piAx_piAy_beta[r][x][y] = {17}".format(
-        self.model.piAx_piAy_beta[r][x][y])))

crates/ruff/resources/test/fixtures/pep8_naming/N802.py

@@ -41,13 +41,9 @@ class Test(unittest.TestCase):
         assert True
 
 
-from typing import override, overload
+from typing import override
 
 
 @override
 def BAD_FUNC():
     pass
-
-@overload
-def BAD_FUNC():
-    pass

crates/ruff/resources/test/fixtures/perflint/PERF403.py

@@ -1,83 +0,0 @@
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = {}
-    for idx, name in enumerate(fruit):
-        result[idx] = name  # PERF403
-
-
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = {}
-    for idx, name in enumerate(fruit):
-        if idx % 2:
-            result[idx] = name  # PERF403
-
-
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = {}
-    for idx, name in enumerate(fruit):
-        if idx % 2:
-            result[idx] = name  # Ok (false negative: edge case where `else` is same as `if`)
-        else:
-            result[idx] = name
-
-
-def foo():
-    result = {}
-    fruit = ["apple", "pear", "orange"]
-    for idx, name in enumerate(fruit):
-        if idx % 2:
-            result[idx] = name  # PERF403
-
-
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = []
-    for idx, name in enumerate(fruit):
-        if idx % 2:
-            result[idx] = name  # OK (result is not a dictionary)
-        else:
-            result[idx] = name
-
-
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = {}
-    for idx, name in enumerate(fruit):
-        if idx % 2:
-            result[idx] = name  # OK (if/elif/else isn't replaceable)
-        elif idx % 3:
-            result[idx] = name
-        else:
-            result[idx] = name
-
-
-def foo():
-    result = {1: "banana"}
-    fruit = ["apple", "pear", "orange"]
-    for idx, name in enumerate(fruit):
-        if idx % 2:
-            result[idx] = name  # PERF403
-
-
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = {}
-    for idx, name in enumerate(fruit):
-        if idx in result:
-            result[idx] = name  # PERF403
-
-
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = {}
-    for name in fruit:
-        result[name] = name  # PERF403
-
-
-def foo():
-    fruit = ["apple", "pear", "orange"]
-    result = {}
-    for idx, name in enumerate(fruit):
-        result[name] = idx  # PERF403

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

@@ -37,4 +37,3 @@ assert (not foo) in bar
 assert {"x": not foo} in bar
 assert [42, not foo] in bar
 assert not (re.search(r"^.:\\Users\\[^\\]*\\Downloads\\.*") is None)
-assert not('name' in request)or not request['name']

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

@@ -1,6 +1,3 @@
-	'''File starts with a tab
-	multiline string with tab in it'''
-
 #: W191
 if False:
 	print  # indented with 1 tab

crates/ruff/resources/test/fixtures/pydocstyle/D.py

@@ -658,8 +658,3 @@ class CommentAfterDocstring:
     "After this docstring there's a comment."  # priorities=1
     def sort_services(self):
         pass
-
-
-def newline_after_closing_quote(self):
-    "We enforce a newline after the closing quote for a multi-line docstring \
-    but continuations shouldn't be considered multi-line"

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

@@ -49,20 +49,6 @@ class Apples:
     def __doc__(self):
         return "Docstring"
 
-    # Allow dunder methods recommended by attrs.
-    def __attrs_post_init__(self):
-        pass
-
-    def __attrs_pre_init__(self):
-        pass
-
-    def __attrs_init__(self):
-        pass
-
-    # Allow __html__, used by Jinja2 and Django.
-    def __html__(self):
-        pass
-
 
 def __foo_bar__():  # this is not checked by the [bad-dunder-name] rule
     ...

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

@@ -36,8 +36,3 @@ def isinstances():
     result = isinstance(var[6], int) or isinstance(var[7], int)
     result = isinstance(var[6], (float, int)) or False
     return result
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722460483
-if(isinstance(self.k, int)) or (isinstance(self.k, float)):
-    ...

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

@@ -10,5 +10,6 @@ type(arg)(" ")
 # OK
 y = x.dtype.type(0.0)
 
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459841
-assert isinstance(fullname, type("")is not True)
+# OK
+type = lambda *args, **kwargs: None
+type("")

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

@@ -108,9 +108,3 @@ class ServiceRefOrValue:
 # Regression test for: https://github.com/astral-sh/ruff/issues/7201
 class ServiceRefOrValue:
     service_specification: Optional[str]is not True = None
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7452
-class Collection(Protocol[*_B0]):
-    def __iter__(self) -> Iterator[Union[*_B0]]:
-        ...

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

@@ -75,8 +75,3 @@ print("foo".encode())  # print(b"foo")
 (f"foo{bar}").encode(encoding="utf-8")
 ("unicode text©").encode("utf-8")
 ("unicode text©").encode(encoding="utf-8")
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459882
-def _match_ignore(line):
-	input=stdin and'\n'.encode()or None

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

@@ -13,19 +13,18 @@ x: typing.TypeAlias = list[T]
 T = typing.TypeVar("T")
 x: typing.TypeAlias = list[T]
 
-# UP040 bounded generic
+# UP040 bounded generic (todo)
 T = typing.TypeVar("T", bound=int)
 x: typing.TypeAlias = list[T]
 
-# UP040 constrained generic
 T = typing.TypeVar("T", int, str)
 x: typing.TypeAlias = list[T]
 
-# UP040 contravariant generic
+# UP040 contravariant generic (todo)
 T = typing.TypeVar("T", contravariant=True)
 x: typing.TypeAlias = list[T]
 
-# UP040 covariant generic
+# UP040 covariant generic (todo)
 T = typing.TypeVar("T", covariant=True)
 x: typing.TypeAlias = list[T]
 

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

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

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

@@ -13,10 +13,10 @@ use crate::registry::Rule;
 use crate::rules::{
     flake8_2020, flake8_async, flake8_bandit, flake8_boolean_trap, flake8_bugbear, flake8_builtins,
     flake8_comprehensions, flake8_datetimez, flake8_debugger, flake8_django,
-    flake8_future_annotations, flake8_gettext, flake8_implicit_str_concat, flake8_logging,
-    flake8_logging_format, flake8_pie, flake8_print, flake8_pyi, flake8_pytest_style, flake8_self,
-    flake8_simplify, flake8_tidy_imports, flake8_use_pathlib, flynt, numpy, pandas_vet,
-    pep8_naming, pycodestyle, pyflakes, pygrep_hooks, pylint, pyupgrade, refurb, ruff,
+    flake8_future_annotations, flake8_gettext, flake8_implicit_str_concat, flake8_logging_format,
+    flake8_pie, flake8_print, flake8_pyi, flake8_pytest_style, flake8_self, flake8_simplify,
+    flake8_tidy_imports, flake8_use_pathlib, flynt, numpy, pandas_vet, pep8_naming, pycodestyle,
+    pyflakes, pygrep_hooks, pylint, pyupgrade, refurb, ruff,
 };
 use crate::settings::types::PythonVersion;
 
@@ -260,9 +260,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::SixPY3) {
                 flake8_2020::rules::name_or_attribute(checker, expr);
             }
-            if checker.enabled(Rule::UndocumentedWarn) {
-                flake8_logging::rules::undocumented_warn(checker, expr);
-            }
             if checker.enabled(Rule::LoadBeforeGlobalDeclaration) {
                 pylint::rules::load_before_global_declaration(checker, id, expr);
             }
@@ -329,9 +326,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::CollectionsNamedTuple) {
                 flake8_pyi::rules::collections_named_tuple(checker, expr);
             }
-            if checker.enabled(Rule::UndocumentedWarn) {
-                flake8_logging::rules::undocumented_warn(checker, expr);
-            }
             pandas_vet::rules::attr(checker, attribute);
         }
         Expr::Call(
@@ -586,9 +580,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::LoggingConfigInsecureListen) {
                 flake8_bandit::rules::logging_config_insecure_listen(checker, call);
             }
-            if checker.enabled(Rule::FlaskDebugTrue) {
-                flake8_bandit::rules::flask_debug_true(checker, call);
-            }
             if checker.any_enabled(&[
                 Rule::SubprocessWithoutShellEqualsTrue,
                 Rule::SubprocessPopenWithShellEqualsTrue,
@@ -895,15 +886,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::QuadraticListSummation) {
                 ruff::rules::quadratic_list_summation(checker, call);
             }
-            if checker.enabled(Rule::DirectLoggerInstantiation) {
-                flake8_logging::rules::direct_logger_instantiation(checker, call);
-            }
-            if checker.enabled(Rule::InvalidGetLoggerArgument) {
-                flake8_logging::rules::invalid_get_logger_argument(checker, call);
-            }
-            if checker.enabled(Rule::ExceptionWithoutExcInfo) {
-                flake8_logging::rules::exception_without_exc_info(checker, call);
-            }
         }
         Expr::Dict(ast::ExprDict {
             keys,
@@ -1279,13 +1261,16 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 flake8_simplify::rules::twisted_arms_in_ifexpr(checker, expr, test, body, orelse);
             }
         }
-        Expr::ListComp(
-            comp @ ast::ExprListComp {
-                elt,
-                generators,
-                range: _,
-            },
-        ) => {
+        Expr::ListComp(ast::ExprListComp {
+            elt,
+            generators,
+            range: _,
+        })
+        | Expr::SetComp(ast::ExprSetComp {
+            elt,
+            generators,
+            range: _,
+        }) => {
             if checker.enabled(Rule::UnnecessaryComprehension) {
                 flake8_comprehensions::rules::unnecessary_list_set_comprehension(
                     checker, expr, elt, generators,
@@ -1299,33 +1284,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                     pylint::rules::iteration_over_set(checker, &generator.iter);
                 }
             }
-            if checker.enabled(Rule::ReimplementedStarmap) {
-                refurb::rules::reimplemented_starmap(checker, &comp.into());
-            }
-        }
-        Expr::SetComp(
-            comp @ ast::ExprSetComp {
-                elt,
-                generators,
-                range: _,
-            },
-        ) => {
-            if checker.enabled(Rule::UnnecessaryComprehension) {
-                flake8_comprehensions::rules::unnecessary_list_set_comprehension(
-                    checker, expr, elt, generators,
-                );
-            }
-            if checker.enabled(Rule::FunctionUsesLoopVariable) {
-                flake8_bugbear::rules::function_uses_loop_variable(checker, &Node::Expr(expr));
-            }
-            if checker.enabled(Rule::IterationOverSet) {
-                for generator in generators {
-                    pylint::rules::iteration_over_set(checker, &generator.iter);
-                }
-            }
-            if checker.enabled(Rule::ReimplementedStarmap) {
-                refurb::rules::reimplemented_starmap(checker, &comp.into());
-            }
         }
         Expr::DictComp(ast::ExprDictComp {
             key,
@@ -1350,13 +1308,11 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 ruff::rules::static_key_dict_comprehension(checker, key);
             }
         }
-        Expr::GeneratorExp(
-            generator @ ast::ExprGeneratorExp {
-                generators,
-                elt: _,
-                range: _,
-            },
-        ) => {
+        Expr::GeneratorExp(ast::ExprGeneratorExp {
+            generators,
+            elt: _,
+            range: _,
+        }) => {
             if checker.enabled(Rule::FunctionUsesLoopVariable) {
                 flake8_bugbear::rules::function_uses_loop_variable(checker, &Node::Expr(expr));
             }
@@ -1365,9 +1321,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                     pylint::rules::iteration_over_set(checker, &generator.iter);
                 }
             }
-            if checker.enabled(Rule::ReimplementedStarmap) {
-                refurb::rules::reimplemented_starmap(checker, &generator.into());
-            }
         }
         Expr::BoolOp(
             bool_op @ ast::ExprBoolOp {

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

@@ -1184,7 +1184,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 iter,
                 orelse,
                 is_async,
-                range: _,
+                ..
             },
         ) => {
             if checker.any_enabled(&[
@@ -1218,9 +1218,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             if checker.enabled(Rule::ManualListCopy) {
                 perflint::rules::manual_list_copy(checker, target, body);
             }
-            if checker.enabled(Rule::ManualDictComprehension) {
-                perflint::rules::manual_dict_comprehension(checker, target, body);
-            }
             if checker.enabled(Rule::UnnecessaryListCast) {
                 perflint::rules::unnecessary_list_cast(checker, iter);
             }

crates/ruff/src/checkers/noqa.rs

@@ -6,7 +6,6 @@ use itertools::Itertools;
 use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
 
 use ruff_diagnostics::{Diagnostic, Edit, Fix};
-use ruff_python_trivia::CommentRanges;
 use ruff_source_file::Locator;
 
 use crate::noqa;
@@ -20,7 +19,7 @@ pub(crate) fn check_noqa(
     diagnostics: &mut Vec<Diagnostic>,
     path: &Path,
     locator: &Locator,
-    comment_ranges: &CommentRanges,
+    comment_ranges: &[TextRange],
     noqa_line_for: &NoqaMapping,
     analyze_directives: bool,
     settings: &Settings,

crates/ruff/src/checkers/physical_lines.rs

@@ -9,7 +9,7 @@ use crate::registry::Rule;
 use crate::rules::flake8_copyright::rules::missing_copyright_notice;
 use crate::rules::pycodestyle::rules::{
     doc_line_too_long, line_too_long, mixed_spaces_and_tabs, no_newline_at_end_of_file,
-    trailing_whitespace,
+    tab_indentation, trailing_whitespace,
 };
 use crate::rules::pylint;
 use crate::settings::Settings;
@@ -31,6 +31,7 @@ pub(crate) fn check_physical_lines(
     let enforce_trailing_whitespace = settings.rules.enabled(Rule::TrailingWhitespace);
     let enforce_blank_line_contains_whitespace =
         settings.rules.enabled(Rule::BlankLineWithWhitespace);
+    let enforce_tab_indentation = settings.rules.enabled(Rule::TabIndentation);
     let enforce_copyright_notice = settings.rules.enabled(Rule::MissingCopyrightNotice);
 
     let mut doc_lines_iter = doc_lines.iter().peekable();
@@ -68,6 +69,12 @@ pub(crate) fn check_physical_lines(
                 diagnostics.push(diagnostic);
             }
         }
+
+        if enforce_tab_indentation {
+            if let Some(diagnostic) = tab_indentation(&line, indexer) {
+                diagnostics.push(diagnostic);
+            }
+        }
     }
 
     if enforce_no_newline_at_end_of_file {

crates/ruff/src/checkers/tokens.rs

@@ -86,10 +86,6 @@ pub(crate) fn check_tokens(
         }
     }
 
-    if settings.rules.enabled(Rule::TabIndentation) {
-        pycodestyle::rules::tab_indentation(&mut diagnostics, tokens, locator, indexer);
-    }
-
     if settings.rules.any_enabled(&[
         Rule::InvalidCharacterBackspace,
         Rule::InvalidCharacterSub,

crates/ruff/src/codes.rs

@@ -573,7 +573,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Bandit, "110") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::TryExceptPass),
         (Flake8Bandit, "112") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::TryExceptContinue),
         (Flake8Bandit, "113") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::RequestWithoutTimeout),
-        (Flake8Bandit, "201") => (RuleGroup::Preview, rules::flake8_bandit::rules::FlaskDebugTrue),
         (Flake8Bandit, "301") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousPickleUsage),
         (Flake8Bandit, "302") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousMarshalUsage),
         (Flake8Bandit, "303") => (RuleGroup::Unspecified, rules::flake8_bandit::rules::SuspiciousInsecureHashUsage),
@@ -899,7 +898,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Perflint, "203") => (RuleGroup::Unspecified, rules::perflint::rules::TryExceptInLoop),
         (Perflint, "401") => (RuleGroup::Unspecified, rules::perflint::rules::ManualListComprehension),
         (Perflint, "402") => (RuleGroup::Unspecified, rules::perflint::rules::ManualListCopy),
-        (Perflint, "403") => (RuleGroup::Preview, rules::perflint::rules::ManualDictComprehension),
 
         // flake8-fixme
         (Flake8Fixme, "001") => (RuleGroup::Unspecified, rules::flake8_fixme::rules::LineContainsFixme),
@@ -919,15 +917,8 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Refurb, "131") => (RuleGroup::Nursery, rules::refurb::rules::DeleteFullSlice),
         #[allow(deprecated)]
         (Refurb, "132") => (RuleGroup::Nursery, rules::refurb::rules::CheckAndRemoveFromSet),
-        (Refurb, "140") => (RuleGroup::Preview, rules::refurb::rules::ReimplementedStarmap),
         (Refurb, "145") => (RuleGroup::Preview, rules::refurb::rules::SliceCopy),
 
-        // flake8-logging
-        (Flake8Logging, "001") => (RuleGroup::Preview, rules::flake8_logging::rules::DirectLoggerInstantiation),
-        (Flake8Logging, "002") => (RuleGroup::Preview, rules::flake8_logging::rules::InvalidGetLoggerArgument),
-        (Flake8Logging, "007") => (RuleGroup::Preview, rules::flake8_logging::rules::ExceptionWithoutExcInfo),
-        (Flake8Logging, "009") => (RuleGroup::Preview, rules::flake8_logging::rules::UndocumentedWarn),
-
         _ => return None,
     })
 }

crates/ruff/src/docstrings/mod.rs

@@ -30,11 +30,6 @@ impl<'a> Docstring<'a> {
     pub(crate) fn leading_quote(&self) -> &'a str {
         &self.contents[TextRange::up_to(self.body_range.start())]
     }
-
-    pub(crate) fn triple_quoted(&self) -> bool {
-        let leading_quote = self.leading_quote();
-        leading_quote.ends_with("\"\"\"") || leading_quote.ends_with("'''")
-    }
 }
 
 impl Ranged for Docstring<'_> {

crates/ruff/src/lib.rs

@@ -5,8 +5,6 @@
 //!
 //! [Ruff]: https://github.com/astral-sh/ruff
 
-#[cfg(feature = "clap")]
-pub use rule_selector::clap_completion::RuleSelectorParser;
 pub use rule_selector::RuleSelector;
 pub use rules::pycodestyle::rules::{IOError, SyntaxError};
 

crates/ruff/src/linter.rs

@@ -36,6 +36,9 @@ use crate::settings::{flags, Settings};
 use crate::source_kind::SourceKind;
 use crate::{directives, fs};
 
+const CARGO_PKG_NAME: &str = env!("CARGO_PKG_NAME");
+const CARGO_PKG_REPOSITORY: &str = env!("CARGO_PKG_REPOSITORY");
+
 /// A [`Result`]-like type that returns both data and an error. Used to return
 /// diagnostics even in the face of parse errors, since many diagnostics can be
 /// generated without a full AST.
@@ -540,9 +543,8 @@ fn report_failed_to_converge_error(path: &Path, transformed: &str, diagnostics:
     let codes = collect_rule_codes(diagnostics.iter().map(|diagnostic| diagnostic.kind.rule()));
     if cfg!(debug_assertions) {
         eprintln!(
-            "{}{} Failed to converge after {} iterations in `{}` with rule codes {}:---\n{}\n---",
+            "{}: Failed to converge after {} iterations in `{}` with rule codes {}:---\n{}\n---",
             "debug error".red().bold(),
-            ":".bold(),
             MAX_ITERATIONS,
             fs::relativize_path(path),
             codes,
@@ -551,17 +553,18 @@ fn report_failed_to_converge_error(path: &Path, transformed: &str, diagnostics:
     } else {
         eprintln!(
             r#"
-{}{} Failed to converge after {} iterations.
+{}: Failed to converge after {} iterations.
 
-This indicates a bug in Ruff. If you could open an issue at:
+This indicates a bug in `{}`. If you could open an issue at:
 
-    https://github.com/astral-sh/ruff/issues/new?title=%5BInfinite%20loop%5D
+    {}/issues/new?title=%5BInfinite%20loop%5D
 
 ...quoting the contents of `{}`, the rule codes {}, along with the `pyproject.toml` settings and executed command, we'd be very appreciative!
 "#,
             "error".red().bold(),
-            ":".bold(),
             MAX_ITERATIONS,
+            CARGO_PKG_NAME,
+            CARGO_PKG_REPOSITORY,
             fs::relativize_path(path),
             codes
         );
@@ -578,9 +581,8 @@ fn report_autofix_syntax_error(
     let codes = collect_rule_codes(rules);
     if cfg!(debug_assertions) {
         eprintln!(
-            "{}{} Autofix introduced a syntax error in `{}` with rule codes {}: {}\n---\n{}\n---",
+            "{}: Autofix introduced a syntax error in `{}` with rule codes {}: {}\n---\n{}\n---",
             "error".red().bold(),
-            ":".bold(),
             fs::relativize_path(path),
             codes,
             error,
@@ -589,16 +591,17 @@ fn report_autofix_syntax_error(
     } else {
         eprintln!(
             r#"
-{}{} Autofix introduced a syntax error. Reverting all changes.
+{}: Autofix introduced a syntax error. Reverting all changes.
 
-This indicates a bug in Ruff. If you could open an issue at:
+This indicates a bug in `{}`. If you could open an issue at:
 
-    https://github.com/astral-sh/ruff/issues/new?title=%5BAutofix%20error%5D
+    {}/issues/new?title=%5BAutofix%20error%5D
 
 ...quoting the contents of `{}`, the rule codes {}, along with the `pyproject.toml` settings and executed command, we'd be very appreciative!
 "#,
             "error".red().bold(),
-            ":".bold(),
+            CARGO_PKG_NAME,
+            CARGO_PKG_REPOSITORY,
             fs::relativize_path(path),
             codes,
         );

crates/ruff/src/logging.rs

@@ -4,16 +4,17 @@ use std::sync::Mutex;
 
 use anyhow::Result;
 use colored::Colorize;
-use fern;
-use log::Level;
 use once_cell::sync::Lazy;
-use ruff_python_parser::{ParseError, ParseErrorType};
+use tracing_subscriber::layer::SubscriberExt;
+use tracing_subscriber::util::SubscriberInitExt;
+use tracing_subscriber::EnvFilter;
 
+use ruff_notebook::Notebook;
+use ruff_python_parser::{ParseError, ParseErrorType};
 use ruff_source_file::{OneIndexed, SourceCode, SourceLocation};
 
 use crate::fs;
 use crate::source_kind::SourceKind;
-use ruff_notebook::Notebook;
 
 pub static WARNINGS: Lazy<Mutex<Vec<&'static str>>> = Lazy::new(Mutex::default);
 
@@ -90,49 +91,27 @@ pub enum LogLevel {
 
 impl LogLevel {
     #[allow(clippy::trivially_copy_pass_by_ref)]
-    const fn level_filter(&self) -> log::LevelFilter {
+    const fn tracing_level(&self) -> tracing::Level {
         match self {
-            LogLevel::Default => log::LevelFilter::Info,
-            LogLevel::Verbose => log::LevelFilter::Debug,
-            LogLevel::Quiet => log::LevelFilter::Off,
-            LogLevel::Silent => log::LevelFilter::Off,
+            LogLevel::Default => tracing::Level::INFO,
+            LogLevel::Verbose => tracing::Level::DEBUG,
+            LogLevel::Quiet => tracing::Level::WARN,
+            LogLevel::Silent => tracing::Level::ERROR,
         }
     }
 }
 
+/// Log level priorities: 1. `RUST_LOG=`, 2. explicit CLI log level, 3. default to info
 pub fn set_up_logging(level: &LogLevel) -> Result<()> {
-    fern::Dispatch::new()
-        .format(|out, message, record| match record.level() {
-            Level::Error => {
-                out.finish(format_args!(
-                    "{}{} {}",
-                    "error".red().bold(),
-                    ":".bold(),
-                    message
-                ));
-            }
-            Level::Warn => {
-                out.finish(format_args!(
-                    "{}{} {}",
-                    "warning".yellow().bold(),
-                    ":".bold(),
-                    message
-                ));
-            }
-            Level::Info | Level::Debug | Level::Trace => {
-                out.finish(format_args!(
-                    "{}[{}][{}] {}",
-                    chrono::Local::now().format("[%Y-%m-%d][%H:%M:%S]"),
-                    record.target(),
-                    record.level(),
-                    message
-                ));
-            }
-        })
-        .level(level.level_filter())
-        .level_for("globset", log::LevelFilter::Warn)
-        .chain(std::io::stderr())
-        .apply()?;
+    let filter_layer = EnvFilter::try_from_default_env().unwrap_or_else(|_| {
+        EnvFilter::builder()
+            .with_default_directive(level.tracing_level().into())
+            .parse_lossy("")
+    });
+    tracing_subscriber::registry()
+        .with(filter_layer)
+        .with(tracing_subscriber::fmt::layer())
+        .init();
     Ok(())
 }
 

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

@@ -33,7 +33,7 @@ expression: content
     },
     "message": "`os` imported but unused",
     "noqa_row": 1,
-    "url": "https://docs.astral.sh/ruff/rules/unused-import"
+    "url": "https://beta.ruff.rs/docs/rules/unused-import"
   },
   {
     "code": "F841",
@@ -65,7 +65,7 @@ expression: content
     },
     "message": "Local variable `x` is assigned to but never used",
     "noqa_row": 6,
-    "url": "https://docs.astral.sh/ruff/rules/unused-variable"
+    "url": "https://beta.ruff.rs/docs/rules/unused-variable"
   },
   {
     "code": "F821",
@@ -81,6 +81,6 @@ expression: content
     },
     "message": "Undefined name `a`",
     "noqa_row": 1,
-    "url": "https://docs.astral.sh/ruff/rules/undefined-name"
+    "url": "https://beta.ruff.rs/docs/rules/undefined-name"
   }
 ]

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

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

crates/ruff/src/noqa.rs

@@ -11,7 +11,7 @@ use log::warn;
 use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
 
 use ruff_diagnostics::Diagnostic;
-use ruff_python_trivia::{indentation_at_offset, CommentRanges};
+use ruff_python_trivia::indentation_at_offset;
 use ruff_source_file::{LineEnding, Locator};
 
 use crate::codes::NoqaCode;
@@ -234,7 +234,7 @@ impl FileExemption {
     /// globally ignored within the file.
     pub(crate) fn try_extract(
         contents: &str,
-        comment_ranges: &CommentRanges,
+        comment_ranges: &[TextRange],
         path: &Path,
         locator: &Locator,
     ) -> Option<Self> {
@@ -457,7 +457,7 @@ pub(crate) fn add_noqa(
     path: &Path,
     diagnostics: &[Diagnostic],
     locator: &Locator,
-    comment_ranges: &CommentRanges,
+    commented_lines: &[TextRange],
     noqa_line_for: &NoqaMapping,
     line_ending: LineEnding,
 ) -> Result<usize> {
@@ -465,7 +465,7 @@ pub(crate) fn add_noqa(
         path,
         diagnostics,
         locator,
-        comment_ranges,
+        commented_lines,
         noqa_line_for,
         line_ending,
     );
@@ -477,7 +477,7 @@ fn add_noqa_inner(
     path: &Path,
     diagnostics: &[Diagnostic],
     locator: &Locator,
-    comment_ranges: &CommentRanges,
+    commented_ranges: &[TextRange],
     noqa_line_for: &NoqaMapping,
     line_ending: LineEnding,
 ) -> (usize, String) {
@@ -487,8 +487,8 @@ fn add_noqa_inner(
 
     // Whether the file is exempted from all checks.
     // Codes that are globally exempted (within the current file).
-    let exemption = FileExemption::try_extract(locator.contents(), comment_ranges, path, locator);
-    let directives = NoqaDirectives::from_commented_ranges(comment_ranges, path, locator);
+    let exemption = FileExemption::try_extract(locator.contents(), commented_ranges, path, locator);
+    let directives = NoqaDirectives::from_commented_ranges(commented_ranges, path, locator);
 
     // Mark any non-ignored diagnostics.
     for diagnostic in diagnostics {
@@ -658,7 +658,7 @@ pub(crate) struct NoqaDirectives<'a> {
 
 impl<'a> NoqaDirectives<'a> {
     pub(crate) fn from_commented_ranges(
-        comment_ranges: &CommentRanges,
+        comment_ranges: &[TextRange],
         path: &Path,
         locator: &'a Locator<'a>,
     ) -> Self {
@@ -800,7 +800,6 @@ mod tests {
     use ruff_text_size::{TextRange, TextSize};
 
     use ruff_diagnostics::Diagnostic;
-    use ruff_python_trivia::CommentRanges;
     use ruff_source_file::{LineEnding, Locator};
 
     use crate::noqa::{add_noqa_inner, Directive, NoqaMapping, ParsedFileExemption};
@@ -998,7 +997,7 @@ mod tests {
             path,
             &[],
             &Locator::new(contents),
-            &CommentRanges::default(),
+            &[],
             &noqa_line_for,
             LineEnding::Lf,
         );
@@ -1018,7 +1017,7 @@ mod tests {
             path,
             &diagnostics,
             &Locator::new(contents),
-            &CommentRanges::default(),
+            &[],
             &noqa_line_for,
             LineEnding::Lf,
         );
@@ -1039,13 +1038,11 @@ mod tests {
         ];
         let contents = "x = 1  # noqa: E741\n";
         let noqa_line_for = NoqaMapping::default();
-        let comment_ranges =
-            CommentRanges::new(vec![TextRange::new(TextSize::from(7), TextSize::from(19))]);
         let (count, output) = add_noqa_inner(
             path,
             &diagnostics,
             &Locator::new(contents),
-            &comment_ranges,
+            &[TextRange::new(TextSize::from(7), TextSize::from(19))],
             &noqa_line_for,
             LineEnding::Lf,
         );
@@ -1066,13 +1063,11 @@ mod tests {
         ];
         let contents = "x = 1  # noqa";
         let noqa_line_for = NoqaMapping::default();
-        let comment_ranges =
-            CommentRanges::new(vec![TextRange::new(TextSize::from(7), TextSize::from(13))]);
         let (count, output) = add_noqa_inner(
             path,
             &diagnostics,
             &Locator::new(contents),
-            &comment_ranges,
+            &[TextRange::new(TextSize::from(7), TextSize::from(13))],
             &noqa_line_for,
             LineEnding::Lf,
         );

crates/ruff/src/registry.rs

@@ -199,9 +199,6 @@ pub enum Linter {
     /// [refurb](https://pypi.org/project/refurb/)
     #[prefix = "FURB"]
     Refurb,
-    /// [flake8-logging](https://pypi.org/project/flake8-logging/)
-    #[prefix = "LOG"]
-    Flake8Logging,
     /// Ruff-specific rules
     #[prefix = "RUF"]
     Ruff,
@@ -251,6 +248,7 @@ impl Rule {
             | Rule::MissingCopyrightNotice
             | Rule::MissingNewlineAtEndOfFile
             | Rule::MixedSpacesAndTabs
+            | Rule::TabIndentation
             | Rule::TrailingWhitespace => LintSource::PhysicalLines,
             Rule::AmbiguousUnicodeCharacterComment
             | Rule::AmbiguousUnicodeCharacterDocstring
@@ -291,7 +289,6 @@ impl Rule {
             | Rule::ShebangNotExecutable
             | Rule::ShebangNotFirstLine
             | Rule::SingleLineImplicitStringConcatenation
-            | Rule::TabIndentation
             | Rule::TrailingCommaOnBareTuple
             | Rule::TypeCommentInStub
             | Rule::UselessSemicolon

crates/ruff/src/rule_selector.rs

@@ -15,8 +15,10 @@ use crate::settings::types::PreviewMode;
 pub enum RuleSelector {
     /// Select all rules (includes rules in preview if enabled)
     All,
+    /// Category to select all rules in preview (includes legacy nursery rules)
+    Preview,
     /// Legacy category to select all rules in the "nursery" which predated preview mode
-    #[deprecated(note = "The nursery was replaced with 'preview mode' which has no selector")]
+    #[deprecated(note = "Use `RuleSelector::Preview` for new rules instead")]
     Nursery,
     /// Legacy category to select both the `mccabe` and `flake8-comprehensions` linters
     /// via a single selector.
@@ -52,6 +54,7 @@ impl FromStr for RuleSelector {
             "ALL" => Ok(Self::All),
             #[allow(deprecated)]
             "NURSERY" => Ok(Self::Nursery),
+            "PREVIEW" => Ok(Self::Preview),
             "C" => Ok(Self::C),
             "T" => Ok(Self::T),
             _ => {
@@ -118,6 +121,7 @@ impl RuleSelector {
             RuleSelector::All => ("", "ALL"),
             #[allow(deprecated)]
             RuleSelector::Nursery => ("", "NURSERY"),
+            RuleSelector::Preview => ("", "PREVIEW"),
             RuleSelector::C => ("", "C"),
             RuleSelector::T => ("", "T"),
             RuleSelector::Prefix { prefix, .. } | RuleSelector::Rule { prefix, .. } => {
@@ -181,6 +185,9 @@ impl RuleSelector {
             RuleSelector::Nursery => {
                 RuleSelectorIter::Nursery(Rule::iter().filter(Rule::is_nursery))
             }
+            RuleSelector::Preview => RuleSelectorIter::Nursery(
+                Rule::iter().filter(|rule| rule.is_preview() || rule.is_nursery()),
+            ),
             RuleSelector::C => RuleSelectorIter::Chain(
                 Linter::Flake8Comprehensions
                     .rules()
@@ -254,9 +261,8 @@ mod schema {
                 instance_type: Some(InstanceType::String.into()),
                 enum_values: Some(
                     [
-                        // Include the non-standard "ALL" and "NURSERY" selectors.
+                        // Include the non-standard "ALL" selector.
                         "ALL".to_string(),
-                        "NURSERY".to_string(),
                         // Include the legacy "C" and "T" selectors.
                         "C".to_string(),
                         "T".to_string(),
@@ -295,6 +301,7 @@ impl RuleSelector {
     pub fn specificity(&self) -> Specificity {
         match self {
             RuleSelector::All => Specificity::All,
+            RuleSelector::Preview => Specificity::All,
             #[allow(deprecated)]
             RuleSelector::Nursery => Specificity::All,
             RuleSelector::T => Specificity::LinterGroup,
@@ -336,14 +343,13 @@ pub enum Specificity {
 }
 
 #[cfg(feature = "clap")]
-pub mod clap_completion {
+mod clap_completion {
     use clap::builder::{PossibleValue, TypedValueParser, ValueParserFactory};
     use strum::IntoEnumIterator;
 
     use crate::{
         codes::RuleCodePrefix,
         registry::{Linter, RuleNamespace},
-        rule_selector::is_single_rule_selector,
         RuleSelector,
     };
 
@@ -363,29 +369,17 @@ pub mod clap_completion {
 
         fn parse_ref(
             &self,
-            cmd: &clap::Command,
-            arg: Option<&clap::Arg>,
+            _cmd: &clap::Command,
+            _arg: Option<&clap::Arg>,
             value: &std::ffi::OsStr,
         ) -> Result<Self::Value, clap::Error> {
             let value = value
                 .to_str()
                 .ok_or_else(|| clap::Error::new(clap::error::ErrorKind::InvalidUtf8))?;
 
-            value.parse().map_err(|_| {
-                let mut error =
-                    clap::Error::new(clap::error::ErrorKind::ValueValidation).with_cmd(cmd);
-                if let Some(arg) = arg {
-                    error.insert(
-                        clap::error::ContextKind::InvalidArg,
-                        clap::error::ContextValue::String(arg.to_string()),
-                    );
-                }
-                error.insert(
-                    clap::error::ContextKind::InvalidValue,
-                    clap::error::ContextValue::String(value.to_string()),
-                );
-                error
-            })
+            value
+                .parse()
+                .map_err(|e| clap::Error::raw(clap::error::ErrorKind::InvalidValue, e))
         }
 
         fn possible_values(&self) -> Option<Box<dyn Iterator<Item = PossibleValue> + '_>> {
@@ -400,34 +394,27 @@ pub mod clap_completion {
                             RuleCodePrefix::iter()
                                 // Filter out rule gated behind `#[cfg(feature = "unreachable-code")]`, which is
                                 // off-by-default
-                                .filter(|prefix| {
-                                    format!(
-                                        "{}{}",
-                                        prefix.linter().common_prefix(),
-                                        prefix.short_code()
-                                    ) != "RUF014"
+                                .filter(|p| {
+                                    format!("{}{}", p.linter().common_prefix(), p.short_code())
+                                        != "RUF014"
                                 })
-                                .filter_map(|prefix| {
-                                    // Ex) `UP`
-                                    if prefix.short_code().is_empty() {
-                                        let code = prefix.linter().common_prefix();
-                                        let name = prefix.linter().name();
-                                        return Some(PossibleValue::new(code).help(name));
-                                    }
+                                .map(|p| {
+                                    let prefix = p.linter().common_prefix();
+                                    let code = p.short_code();
 
-                                    // Ex) `UP004`
-                                    if is_single_rule_selector(&prefix) {
-                                        let rule = prefix.rules().next()?;
-                                        let code = format!(
-                                            "{}{}",
-                                            prefix.linter().common_prefix(),
-                                            prefix.short_code()
-                                        );
-                                        let name: &'static str = rule.into();
-                                        return Some(PossibleValue::new(code).help(name));
-                                    }
+                                    let mut rules_iter = p.rules();
+                                    let rule1 = rules_iter.next();
+                                    let rule2 = rules_iter.next();
 
-                                    None
+                                    let value = PossibleValue::new(format!("{prefix}{code}"));
+
+                                    if rule2.is_none() {
+                                        let rule1 = rule1.unwrap();
+                                        let name: &'static str = rule1.into();
+                                        value.help(name)
+                                    } else {
+                                        value
+                                    }
                                 }),
                         ),
                 ),

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

@@ -1,6 +1,8 @@
+use num_bigint::BigInt;
+use ruff_python_ast::{self as ast, CmpOp, Constant, Expr};
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::{self as ast, CmpOp, Constant, Expr};
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
@@ -235,7 +237,7 @@ pub(crate) fn compare(checker: &mut Checker, left: &Expr, ops: &[CmpOp], compara
                 ..
             }) = slice.as_ref()
             {
-                if *i == 0 {
+                if *i == BigInt::from(0) {
                     if let (
                         [CmpOp::Eq | CmpOp::NotEq],
                         [Expr::Constant(ast::ExprConstant {
@@ -244,13 +246,13 @@ pub(crate) fn compare(checker: &mut Checker, left: &Expr, ops: &[CmpOp], compara
                         })],
                     ) = (ops, comparators)
                     {
-                        if *n == 3 && checker.enabled(Rule::SysVersionInfo0Eq3) {
+                        if *n == BigInt::from(3) && checker.enabled(Rule::SysVersionInfo0Eq3) {
                             checker
                                 .diagnostics
                                 .push(Diagnostic::new(SysVersionInfo0Eq3, left.range()));
                         }
                     }
-                } else if *i == 1 {
+                } else if *i == BigInt::from(1) {
                     if let (
                         [CmpOp::Lt | CmpOp::LtE | CmpOp::Gt | CmpOp::GtE],
                         [Expr::Constant(ast::ExprConstant {

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

@@ -1,3 +1,4 @@
+use num_bigint::BigInt;
 use ruff_python_ast::{self as ast, Constant, Expr};
 
 use ruff_diagnostics::{Diagnostic, Violation};
@@ -183,11 +184,11 @@ pub(crate) fn subscript(checker: &mut Checker, value: &Expr, slice: &Expr) {
                     ..
                 }) = upper.as_ref()
                 {
-                    if *i == 1 && checker.enabled(Rule::SysVersionSlice1) {
+                    if *i == BigInt::from(1) && checker.enabled(Rule::SysVersionSlice1) {
                         checker
                             .diagnostics
                             .push(Diagnostic::new(SysVersionSlice1, value.range()));
-                    } else if *i == 3 && checker.enabled(Rule::SysVersionSlice3) {
+                    } else if *i == BigInt::from(3) && checker.enabled(Rule::SysVersionSlice3) {
                         checker
                             .diagnostics
                             .push(Diagnostic::new(SysVersionSlice3, value.range()));
@@ -199,11 +200,11 @@ pub(crate) fn subscript(checker: &mut Checker, value: &Expr, slice: &Expr) {
                 value: Constant::Int(i),
                 ..
             }) => {
-                if *i == 2 && checker.enabled(Rule::SysVersion2) {
+                if *i == BigInt::from(2) && checker.enabled(Rule::SysVersion2) {
                     checker
                         .diagnostics
                         .push(Diagnostic::new(SysVersion2, value.range()));
-                } else if *i == 0 && checker.enabled(Rule::SysVersion0) {
+                } else if *i == BigInt::from(0) && checker.enabled(Rule::SysVersion0) {
                     checker
                         .diagnostics
                         .push(Diagnostic::new(SysVersion0, value.range()));

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

@@ -19,7 +19,6 @@ mod tests {
     #[test_case(Rule::BadFilePermissions, Path::new("S103.py"))]
     #[test_case(Rule::CallWithShellEqualsTrue, Path::new("S604.py"))]
     #[test_case(Rule::ExecBuiltin, Path::new("S102.py"))]
-    #[test_case(Rule::FlaskDebugTrue, Path::new("S201.py"))]
     #[test_case(Rule::HardcodedBindAllInterfaces, Path::new("S104.py"))]
     #[test_case(Rule::HardcodedPasswordDefault, Path::new("S107.py"))]
     #[test_case(Rule::HardcodedPasswordFuncArg, Path::new("S106.py"))]

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

@@ -1,4 +1,4 @@
-use malachite::Integer;
+use num_traits::ToPrimitive;
 
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
@@ -36,7 +36,7 @@ use crate::checkers::ast::Checker;
 /// - [Common Weakness Enumeration: CWE-732](https://cwe.mitre.org/data/definitions/732.html)
 #[violation]
 pub struct BadFilePermissions {
-    mask: Integer,
+    mask: u16,
 }
 
 impl Violation for BadFilePermissions {
@@ -56,9 +56,7 @@ pub(crate) fn bad_file_permissions(checker: &mut Checker, call: &ast::ExprCall)
     {
         if let Some(mode_arg) = call.arguments.find_argument("mode", 1) {
             if let Some(int_value) = int_value(mode_arg, checker.semantic()) {
-                if (int_value.clone() & Integer::from(WRITE_WORLD) > 0)
-                    || (int_value.clone() & Integer::from(EXECUTE_GROUP) > 0)
-                {
+                if (int_value & WRITE_WORLD > 0) || (int_value & EXECUTE_GROUP > 0) {
                     checker.diagnostics.push(Diagnostic::new(
                         BadFilePermissions { mask: int_value },
                         mode_arg.range(),
@@ -115,17 +113,13 @@ fn py_stat(call_path: &CallPath) -> Option<u16> {
     }
 }
 
-fn int_value(expr: &Expr, semantic: &SemanticModel) -> Option<Integer> {
+fn int_value(expr: &Expr, semantic: &SemanticModel) -> Option<u16> {
     match expr {
         Expr::Constant(ast::ExprConstant {
             value: Constant::Int(value),
             ..
-        }) => Some(value.clone()),
-        Expr::Attribute(_) => semantic
-            .resolve_call_path(expr)
-            .as_ref()
-            .and_then(py_stat)
-            .map(Integer::from),
+        }) => value.to_u16(),
+        Expr::Attribute(_) => semantic.resolve_call_path(expr).as_ref().and_then(py_stat),
         Expr::BinOp(ast::ExprBinOp {
             left,
             op,

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

@@ -1,89 +0,0 @@
-use ruff_diagnostics::{Diagnostic, Violation};
-use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::is_const_true;
-use ruff_python_ast::{Expr, ExprAttribute, ExprCall, Stmt, StmtAssign};
-use ruff_text_size::Ranged;
-
-use crate::checkers::ast::Checker;
-
-/// ## What it does
-/// Checks for uses of `debug=True` in Flask.
-///
-/// ## Why is this bad?
-/// Enabling debug mode shows an interactive debugger in the browser if an
-/// error occurs, and allows running arbitrary Python code from the browser.
-/// This could leak sensitive information, or allow an attacker to run
-/// arbitrary code.
-///
-/// ## Example
-/// ```python
-/// import flask
-///
-/// app = Flask()
-///
-/// app.run(debug=True)
-/// ```
-///
-/// Use instead:
-/// ```python
-/// import flask
-///
-/// app = Flask()
-///
-/// app.run(debug=os.environ["ENV"] == "dev")
-/// ```
-///
-/// ## References
-/// - [Flask documentation: Debug Mode](https://flask.palletsprojects.com/en/latest/quickstart/#debug-mode)
-#[violation]
-pub struct FlaskDebugTrue;
-
-impl Violation for FlaskDebugTrue {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Use of `debug=True` in Flask app detected")
-    }
-}
-
-/// S201
-pub(crate) fn flask_debug_true(checker: &mut Checker, call: &ExprCall) {
-    let Expr::Attribute(ExprAttribute { attr, value, .. }) = call.func.as_ref() else {
-        return;
-    };
-
-    if attr.as_str() != "run" {
-        return;
-    }
-
-    let Some(debug_argument) = call.arguments.find_keyword("debug") else {
-        return;
-    };
-
-    if !is_const_true(&debug_argument.value) {
-        return;
-    }
-
-    let Expr::Name(name) = value.as_ref() else {
-        return;
-    };
-
-    if let Some(binding_id) = checker.semantic().resolve_name(name) {
-        if let Some(Stmt::Assign(StmtAssign { value, .. })) = checker
-            .semantic()
-            .binding(binding_id)
-            .statement(checker.semantic())
-        {
-            if let Expr::Call(ExprCall { func, .. }) = value.as_ref() {
-                if checker
-                    .semantic()
-                    .resolve_call_path(func)
-                    .is_some_and(|call_path| matches!(call_path.as_slice(), ["flask", "Flask"]))
-                {
-                    checker
-                        .diagnostics
-                        .push(Diagnostic::new(FlaskDebugTrue, debug_argument.range()));
-                }
-            }
-        }
-    };
-}

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

@@ -1,7 +1,6 @@
 pub(crate) use assert_used::*;
 pub(crate) use bad_file_permissions::*;
 pub(crate) use exec_used::*;
-pub(crate) use flask_debug_true::*;
 pub(crate) use hardcoded_bind_all_interfaces::*;
 pub(crate) use hardcoded_password_default::*;
 pub(crate) use hardcoded_password_func_arg::*;
@@ -25,7 +24,6 @@ pub(crate) use unsafe_yaml_load::*;
 mod assert_used;
 mod bad_file_permissions;
 mod exec_used;
-mod flask_debug_true;
 mod hardcoded_bind_all_interfaces;
 mod hardcoded_password_default;
 mod hardcoded_password_func_arg;

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

@@ -148,7 +148,7 @@ impl Violation for StartProcessWithNoShell {
 ///
 /// ## References
 /// - [Python documentation: `subprocess.Popen()`](https://docs.python.org/3/library/subprocess.html#subprocess.Popen)
-/// - [Common Weakness Enumeration: CWE-426](https://cwe.mitre.org/data/definitions/426.html)
+/// - [Common Weakness Enumeration: CWE-78](https://cwe.mitre.org/data/definitions/78.html)
 #[violation]
 pub struct StartProcessWithPartialPath;
 

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

@@ -1,3 +1,5 @@
+use num_traits::{One, Zero};
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::{self as ast, Constant, Expr};
@@ -55,7 +57,7 @@ pub(crate) fn snmp_insecure_version(checker: &mut Checker, call: &ast::ExprCall)
                 ..
             }) = &keyword.value
             {
-                if *value == 0 || *value == 1 {
+                if value.is_zero() || value.is_one() {
                     checker
                         .diagnostics
                         .push(Diagnostic::new(SnmpInsecureVersion, keyword.range()));

crates/ruff/src/rules/flake8_bandit/snapshots/ruff__rules__flake8_bandit__tests__S201_S201.py.snap

@@ -1,13 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_bandit/mod.rs
----
-S201.py:10:9: S201 Use of `debug=True` in Flask app detected
-   |
- 9 | # OK
-10 | app.run(debug=True)
-   |         ^^^^^^^^^^ S201
-11 | 
-12 | # Errors
-   |
-
-

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

@@ -36,7 +36,6 @@ mod tests {
     #[test_case(Rule::MutableArgumentDefault, Path::new("B006_1.py"))]
     #[test_case(Rule::MutableArgumentDefault, Path::new("B006_2.py"))]
     #[test_case(Rule::MutableArgumentDefault, Path::new("B006_3.py"))]
-    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_4.py"))]
     #[test_case(Rule::NoExplicitStacklevel, Path::new("B028.py"))]
     #[test_case(Rule::RaiseLiteral, Path::new("B016.py"))]
     #[test_case(Rule::RaiseWithoutFromInsideExcept, Path::new("B904.py"))]

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

@@ -1,4 +1,3 @@
-use crate::autofix::edits::pad;
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::{self as ast, Constant, Expr};
@@ -81,21 +80,17 @@ pub(crate) fn getattr_with_constant(
     let mut diagnostic = Diagnostic::new(GetAttrWithConstant, expr.range());
     if checker.patch(diagnostic.kind.rule()) {
         diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
-            pad(
-                if matches!(
-                    obj,
-                    Expr::Name(_) | Expr::Attribute(_) | Expr::Subscript(_) | Expr::Call(_)
-                ) {
-                    format!("{}.{}", checker.locator().slice(obj), value)
-                } else {
-                    // Defensively parenthesize any other expressions. For example, attribute accesses
-                    // on `int` literals must be parenthesized, e.g., `getattr(1, "real")` becomes
-                    // `(1).real`. The same is true for named expressions and others.
-                    format!("({}).{}", checker.locator().slice(obj), value)
-                },
-                expr.range(),
-                checker.locator(),
-            ),
+            if matches!(
+                obj,
+                Expr::Name(_) | Expr::Attribute(_) | Expr::Subscript(_) | Expr::Call(_)
+            ) {
+                format!("{}.{}", checker.locator().slice(obj), value)
+            } else {
+                // Defensively parenthesize any other expressions. For example, attribute accesses
+                // on `int` literals must be parenthesized, e.g., `getattr(1, "real")` becomes
+                // `(1).real`. The same is true for named expressions and others.
+                format!("({}).{}", checker.locator().slice(obj), value)
+            },
             expr.range(),
         )));
     }

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

@@ -70,7 +70,6 @@ impl Violation for MutableArgumentDefault {
     fn message(&self) -> String {
         format!("Do not use mutable data structures for argument defaults")
     }
-
     fn autofix_title(&self) -> Option<String> {
         Some(format!("Replace with `None`; initialize within function"))
     }

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

@@ -17,8 +17,8 @@ use crate::checkers::ast::Checker;
 /// contains multiple characters, the reader may be misled into thinking that
 /// a prefix or suffix is being removed, rather than a set of characters.
 ///
-/// In Python 3.9 and later, you can use `str.removeprefix` and
-/// `str.removesuffix` to remove an exact prefix or suffix from a string,
+/// In Python 3.9 and later, you can use `str#removeprefix` and
+/// `str#removesuffix` to remove an exact prefix or suffix from a string,
 /// respectively, which should be preferred when possible.
 ///
 /// ## Example

crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B006_B006_4.py.snap

@@ -1,24 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_bugbear/mod.rs
----
-B006_4.py:7:26: B006 [*] Do not use mutable data structures for argument defaults
-  |
-6 | class FormFeedIndent:
-7 |    def __init__(self, a=[]):
-  |                         ^^ B006
-8 |         print(a)
-  |
-  = help: Replace with `None`; initialize within function
-
-ℹ Possible fix
-4  4  | 
-5  5  | 
-6  6  | class FormFeedIndent:
-7     |-   def __init__(self, a=[]):
-   7  |+   def __init__(self, a=None):
-   8  |+        if a is None:
-   9  |+         a = []
-8  10 |         print(a)
-9  11 | 
-
-

crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B009_B009_B010.py.snap

@@ -316,19 +316,4 @@ B009_B010.py:34:1: B009 [*] Do not call `getattr` with a constant attribute valu
 37 37 | 
 38 38 | # Valid setattr usage
 
-B009_B010.py:58:8: B009 [*] Do not call `getattr` with a constant attribute value. It is not any safer than normal property access.
-   |
-57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
-58 | assert getattr(func, '_rpc')is True
-   |        ^^^^^^^^^^^^^^^^^^^^^ B009
-   |
-   = help: Replace `getattr` with attribute access
-
-ℹ Suggested fix
-55 55 | setattr(foo.bar, r"baz", None)
-56 56 | 
-57 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
-58    |-assert getattr(func, '_rpc')is True
-   58 |+assert func._rpc is True
-
 

crates/ruff/src/rules/flake8_bugbear/snapshots/ruff__rules__flake8_bugbear__tests__B010_B009_B010.py.snap

@@ -82,7 +82,6 @@ B009_B010.py:53:1: B010 [*] Do not call `setattr` with a constant attribute valu
    53 |+foo.abc123 = None
 54 54 | setattr(foo, r"abc123", None)
 55 55 | setattr(foo.bar, r"baz", None)
-56 56 | 
 
 B009_B010.py:54:1: B010 [*] Do not call `setattr` with a constant attribute value. It is not any safer than normal property access.
    |
@@ -101,8 +100,6 @@ B009_B010.py:54:1: B010 [*] Do not call `setattr` with a constant attribute valu
 54    |-setattr(foo, r"abc123", None)
    54 |+foo.abc123 = None
 55 55 | setattr(foo.bar, r"baz", None)
-56 56 | 
-57 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
 
 B009_B010.py:55:1: B010 [*] Do not call `setattr` with a constant attribute value. It is not any safer than normal property access.
    |
@@ -110,8 +107,6 @@ B009_B010.py:55:1: B010 [*] Do not call `setattr` with a constant attribute valu
 54 | setattr(foo, r"abc123", None)
 55 | setattr(foo.bar, r"baz", None)
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B010
-56 | 
-57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
    |
    = help: Replace `setattr` with assignment
 
@@ -121,8 +116,5 @@ B009_B010.py:55:1: B010 [*] Do not call `setattr` with a constant attribute valu
 54 54 | setattr(foo, r"abc123", None)
 55    |-setattr(foo.bar, r"baz", None)
    55 |+foo.bar.baz = None
-56 56 | 
-57 57 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
-58 58 | assert getattr(func, '_rpc')is True
 
 

crates/ruff/src/rules/flake8_builtins/rules/builtin_attribute_shadowing.rs

@@ -137,13 +137,13 @@ fn is_standard_library_override(
         return false;
     };
     match name {
-        // Ex) `Event.set`
+        // Ex) `Event#set`
         "set" => bases.iter().any(|base| {
             semantic
                 .resolve_call_path(base)
                 .is_some_and(|call_path| matches!(call_path.as_slice(), ["threading", "Event"]))
         }),
-        // Ex) `Filter.filter`
+        // Ex) `Filter#filter`
         "filter" => bases.iter().any(|base| {
             semantic
                 .resolve_call_path(base)

crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_comprehension.rs

@@ -1,6 +1,5 @@
 use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Fix};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::comparable::ComparableExpr;
 use ruff_python_ast::{self as ast, Comprehension, Expr};
 use ruff_text_size::Ranged;
 
@@ -87,16 +86,28 @@ pub(crate) fn unnecessary_dict_comprehension(
     if !generator.ifs.is_empty() || generator.is_async {
         return;
     }
+    let Some(key) = key.as_name_expr() else {
+        return;
+    };
+    let Some(value) = value.as_name_expr() else {
+        return;
+    };
     let Expr::Tuple(ast::ExprTuple { elts, .. }) = &generator.target else {
         return;
     };
     let [target_key, target_value] = elts.as_slice() else {
         return;
     };
-    if ComparableExpr::from(key) != ComparableExpr::from(target_key) {
+    let Some(target_key) = target_key.as_name_expr() else {
+        return;
+    };
+    let Some(target_value) = target_value.as_name_expr() else {
+        return;
+    };
+    if target_key.id != key.id {
         return;
     }
-    if ComparableExpr::from(value) != ComparableExpr::from(target_value) {
+    if target_value.id != value.id {
         return;
     }
     add_diagnostic(checker, expr);
@@ -115,7 +126,13 @@ pub(crate) fn unnecessary_list_set_comprehension(
     if !generator.ifs.is_empty() || generator.is_async {
         return;
     }
-    if ComparableExpr::from(elt) != ComparableExpr::from(&generator.target) {
+    let Some(elt) = elt.as_name_expr() else {
+        return;
+    };
+    let Some(target) = generator.target.as_name_expr() else {
+        return;
+    };
+    if elt.id != target.id {
         return;
     }
     add_diagnostic(checker, expr);

crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_generator_dict.rs

@@ -54,23 +54,18 @@ pub(crate) fn unnecessary_generator_dict(
     else {
         return;
     };
-    let Expr::GeneratorExp(ast::ExprGeneratorExp { elt, .. }) = argument else {
-        return;
-    };
-    let Expr::Tuple(ast::ExprTuple { elts, .. }) = elt.as_ref() else {
-        return;
-    };
-    if elts.len() != 2 {
-        return;
+    if let Expr::GeneratorExp(ast::ExprGeneratorExp { elt, .. }) = argument {
+        match elt.as_ref() {
+            Expr::Tuple(ast::ExprTuple { elts, .. }) if elts.len() == 2 => {
+                let mut diagnostic = Diagnostic::new(UnnecessaryGeneratorDict, expr.range());
+                if checker.patch(diagnostic.kind.rule()) {
+                    diagnostic.try_set_fix(|| {
+                        fixes::fix_unnecessary_generator_dict(expr, checker).map(Fix::suggested)
+                    });
+                }
+                checker.diagnostics.push(diagnostic);
+            }
+            _ => {}
+        }
     }
-    if elts.iter().any(Expr::is_starred_expr) {
-        return;
-    }
-    let mut diagnostic = Diagnostic::new(UnnecessaryGeneratorDict, expr.range());
-    if checker.patch(diagnostic.kind.rule()) {
-        diagnostic.try_set_fix(|| {
-            fixes::fix_unnecessary_generator_dict(expr, checker).map(Fix::suggested)
-        });
-    }
-    checker.diagnostics.push(diagnostic);
 }

crates/ruff/src/rules/flake8_comprehensions/rules/unnecessary_subscript_reversal.rs

@@ -1,3 +1,5 @@
+use num_bigint::BigInt;
+
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::{self as ast, Constant, Expr, UnaryOp};
@@ -91,7 +93,7 @@ pub(crate) fn unnecessary_subscript_reversal(
     else {
         return;
     };
-    if *val != 1 {
+    if *val != BigInt::from(1) {
         return;
     };
     checker.diagnostics.push(Diagnostic::new(

crates/ruff/src/rules/flake8_comprehensions/snapshots/ruff__rules__flake8_comprehensions__tests__C402_C402.py.snap

@@ -251,8 +251,6 @@ C402.py:21:1: C402 [*] Unnecessary generator (rewrite as a `dict` comprehension)
 20 | # Regression test for: https://github.com/astral-sh/ruff/issues/7086
 21 | dict((k,v)for k,v in d.iteritems() if k in only_args)
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ C402
-22 | 
-23 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458940
    |
    = help: Rewrite as a `dict` comprehension
 
@@ -262,8 +260,5 @@ C402.py:21:1: C402 [*] Unnecessary generator (rewrite as a `dict` comprehension)
 20 20 | # Regression test for: https://github.com/astral-sh/ruff/issues/7086
 21    |-dict((k,v)for k,v in d.iteritems() if k in only_args)
    21 |+{k: v for k,v in d.iteritems() if k in only_args}
-22 22 | 
-23 23 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458940
-24 24 | dict((*v, k) for k, v in enumerate(calendar.month_abbr))
 
 

crates/ruff/src/rules/flake8_comprehensions/snapshots/ruff__rules__flake8_comprehensions__tests__C416_C416.py.snap

@@ -40,18 +40,17 @@ C416.py:7:1: C416 [*] Unnecessary `set` comprehension (rewrite using `set()`)
   7 |+set(x)
 8 8 | {k: v for k, v in y}
 9 9 | {k: v for k, v in d.items()}
-10 10 | [(k, v) for k, v in d.items()]
+10 10 | 
 
 C416.py:8:1: C416 [*] Unnecessary `dict` comprehension (rewrite using `dict()`)
-   |
- 6 | [i for i in x]
- 7 | {i for i in x}
- 8 | {k: v for k, v in y}
-   | ^^^^^^^^^^^^^^^^^^^^ C416
- 9 | {k: v for k, v in d.items()}
-10 | [(k, v) for k, v in d.items()]
-   |
-   = help: Rewrite using `dict()`
+  |
+6 | [i for i in x]
+7 | {i for i in x}
+8 | {k: v for k, v in y}
+  | ^^^^^^^^^^^^^^^^^^^^ C416
+9 | {k: v for k, v in d.items()}
+  |
+  = help: Rewrite using `dict()`
 
 ℹ Suggested fix
 5 5 | 
@@ -60,8 +59,8 @@ C416.py:8:1: C416 [*] Unnecessary `dict` comprehension (rewrite using `dict()`)
 8   |-{k: v for k, v in y}
   8 |+dict(y)
 9 9 | {k: v for k, v in d.items()}
-10 10 | [(k, v) for k, v in d.items()]
-11 11 | {k: (a, b) for k, (a, b) in d.items()}
+10 10 | 
+11 11 | [i for i, in z]
 
 C416.py:9:1: C416 [*] Unnecessary `dict` comprehension (rewrite using `dict()`)
    |
@@ -69,8 +68,8 @@ C416.py:9:1: C416 [*] Unnecessary `dict` comprehension (rewrite using `dict()`)
  8 | {k: v for k, v in y}
  9 | {k: v for k, v in d.items()}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ C416
-10 | [(k, v) for k, v in d.items()]
-11 | {k: (a, b) for k, (a, b) in d.items()}
+10 | 
+11 | [i for i, in z]
    |
    = help: Rewrite using `dict()`
 
@@ -80,64 +79,23 @@ C416.py:9:1: C416 [*] Unnecessary `dict` comprehension (rewrite using `dict()`)
 8  8  | {k: v for k, v in y}
 9     |-{k: v for k, v in d.items()}
    9  |+dict(d.items())
-10 10 | [(k, v) for k, v in d.items()]
-11 11 | {k: (a, b) for k, (a, b) in d.items()}
-12 12 | 
+10 10 | 
+11 11 | [i for i, in z]
+12 12 | [i for i, j in y]
 
-C416.py:10:1: C416 [*] Unnecessary `list` comprehension (rewrite using `list()`)
+C416.py:22:70: C416 [*] Unnecessary `list` comprehension (rewrite using `list()`)
    |
- 8 | {k: v for k, v in y}
- 9 | {k: v for k, v in d.items()}
-10 | [(k, v) for k, v in d.items()]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ C416
-11 | {k: (a, b) for k, (a, b) in d.items()}
-   |
-   = help: Rewrite using `list()`
-
-ℹ Suggested fix
-7  7  | {i for i in x}
-8  8  | {k: v for k, v in y}
-9  9  | {k: v for k, v in d.items()}
-10    |-[(k, v) for k, v in d.items()]
-   10 |+list(d.items())
-11 11 | {k: (a, b) for k, (a, b) in d.items()}
-12 12 | 
-13 13 | [i for i, in z]
-
-C416.py:11:1: C416 [*] Unnecessary `dict` comprehension (rewrite using `dict()`)
-   |
- 9 | {k: v for k, v in d.items()}
-10 | [(k, v) for k, v in d.items()]
-11 | {k: (a, b) for k, (a, b) in d.items()}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ C416
-12 | 
-13 | [i for i, in z]
-   |
-   = help: Rewrite using `dict()`
-
-ℹ Suggested fix
-8  8  | {k: v for k, v in y}
-9  9  | {k: v for k, v in d.items()}
-10 10 | [(k, v) for k, v in d.items()]
-11    |-{k: (a, b) for k, (a, b) in d.items()}
-   11 |+dict(d.items())
-12 12 | 
-13 13 | [i for i, in z]
-14 14 | [i for i, j in y]
-
-C416.py:24:70: C416 [*] Unnecessary `list` comprehension (rewrite using `list()`)
-   |
-23 | # Regression test for: https://github.com/astral-sh/ruff/issues/7196
-24 | any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in[t for t in SymbolType])
+21 | # Regression test for: https://github.com/astral-sh/ruff/issues/7196
+22 | any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in[t for t in SymbolType])
    |                                                                      ^^^^^^^^^^^^^^^^^^^^^^^ C416
    |
    = help: Rewrite using `list()`
 
 ℹ Suggested fix
-21 21 | {k: v if v else None for k, v in y}
-22 22 | 
-23 23 | # Regression test for: https://github.com/astral-sh/ruff/issues/7196
-24    |-any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in[t for t in SymbolType])
-   24 |+any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in list(SymbolType))
+19 19 | {k: v if v else None for k, v in y}
+20 20 | 
+21 21 | # Regression test for: https://github.com/astral-sh/ruff/issues/7196
+22    |-any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in[t for t in SymbolType])
+   22 |+any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in list(SymbolType))
 
 

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

@@ -1,29 +0,0 @@
-//! Rules from [flake8-logging](https://pypi.org/project/flake8-logging/).
-pub(crate) mod rules;
-
-#[cfg(test)]
-mod tests {
-    use std::path::Path;
-
-    use anyhow::Result;
-    use test_case::test_case;
-
-    use crate::assert_messages;
-    use crate::registry::Rule;
-    use crate::settings::Settings;
-    use crate::test::test_path;
-
-    #[test_case(Rule::DirectLoggerInstantiation, Path::new("LOG001.py"))]
-    #[test_case(Rule::InvalidGetLoggerArgument, Path::new("LOG002.py"))]
-    #[test_case(Rule::ExceptionWithoutExcInfo, Path::new("LOG007.py"))]
-    #[test_case(Rule::UndocumentedWarn, Path::new("LOG009.py"))]
-    fn rules(rule_code: Rule, path: &Path) -> Result<()> {
-        let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
-        let diagnostics = test_path(
-            Path::new("flake8_logging").join(path).as_path(),
-            &Settings::for_rule(rule_code),
-        )?;
-        assert_messages!(snapshot, diagnostics);
-        Ok(())
-    }
-}

crates/ruff/src/rules/flake8_logging/rules/direct_logger_instantiation.rs

@@ -1,77 +0,0 @@
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
-use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast as ast;
-use ruff_text_size::Ranged;
-
-use crate::checkers::ast::Checker;
-use crate::importer::ImportRequest;
-use crate::registry::AsRule;
-
-/// ## What it does
-/// Checks for direct instantiation of `logging.Logger`, as opposed to using
-/// `logging.getLogger()`.
-///
-/// ## Why is this bad?
-/// The [Logger Objects] documentation states that:
-///
-/// > Note that Loggers should NEVER be instantiated directly, but always
-/// > through the module-level function `logging.getLogger(name)`.
-///
-/// If a logger is directly instantiated, it won't be added to the logger
-/// tree, and will bypass all configuration. Messages logged to it will
-/// only be sent to the "handler of last resort", skipping any filtering
-/// or formatting.
-///
-/// ## Example
-/// ```python
-/// import logging
-///
-/// logger = logging.Logger(__name__)
-/// ```
-///
-/// Use instead:
-/// ```python
-/// import logging
-///
-/// logger = logging.getLogger(__name__)
-/// ```
-///
-/// [Logger Objects]: https://docs.python.org/3/library/logging.html#logger-objects
-#[violation]
-pub struct DirectLoggerInstantiation;
-
-impl Violation for DirectLoggerInstantiation {
-    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
-
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Use `logging.getLogger()` to instantiate loggers")
-    }
-
-    fn autofix_title(&self) -> Option<String> {
-        Some(format!("Replace with `logging.getLogger()`"))
-    }
-}
-
-/// LOG001
-pub(crate) fn direct_logger_instantiation(checker: &mut Checker, call: &ast::ExprCall) {
-    if checker
-        .semantic()
-        .resolve_call_path(call.func.as_ref())
-        .is_some_and(|call_path| matches!(call_path.as_slice(), ["logging", "Logger"]))
-    {
-        let mut diagnostic = Diagnostic::new(DirectLoggerInstantiation, call.func.range());
-        if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.try_set_fix(|| {
-                let (import_edit, binding) = checker.importer().get_or_import_symbol(
-                    &ImportRequest::import("logging", "getLogger"),
-                    call.func.start(),
-                    checker.semantic(),
-                )?;
-                let reference_edit = Edit::range_replacement(binding, call.func.range());
-                Ok(Fix::suggested_edits(import_edit, [reference_edit]))
-            });
-        }
-        checker.diagnostics.push(diagnostic);
-    }
-}

crates/ruff/src/rules/flake8_logging/rules/exception_without_exc_info.rs

@@ -1,65 +0,0 @@
-use ruff_python_ast::ExprCall;
-
-use ruff_diagnostics::{Diagnostic, Violation};
-use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::helpers::Truthiness;
-use ruff_python_semantic::analyze::logging::is_logger_candidate;
-use ruff_text_size::Ranged;
-
-use crate::checkers::ast::Checker;
-
-/// ## What it does
-/// Checks for uses of `logging.exception()` with `exc_info` set to `False`.
-///
-/// ## Why is this bad?
-/// The `logging.exception()` method captures the exception automatically, but
-/// accepts an optional `exc_info` argument to override this behavior. Setting
-/// `exc_info` to `False` disables the automatic capture of the exception and
-/// stack trace.
-///
-/// Instead of setting `exc_info` to `False`, prefer `logging.error()`, which
-/// has equivalent behavior to `logging.exception()` with `exc_info` set to
-/// `False`, but is clearer in intent.
-///
-/// ## Example
-/// ```python
-/// logging.exception("...", exc_info=False)
-/// ```
-///
-/// Use instead:
-/// ```python
-/// logging.error("...")
-/// ```
-#[violation]
-pub struct ExceptionWithoutExcInfo;
-
-impl Violation for ExceptionWithoutExcInfo {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Use of `logging.exception` with falsy `exc_info`")
-    }
-}
-
-/// LOG007
-pub(crate) fn exception_without_exc_info(checker: &mut Checker, call: &ExprCall) {
-    if !is_logger_candidate(
-        call.func.as_ref(),
-        checker.semantic(),
-        &["exception".to_string()],
-    ) {
-        return;
-    }
-
-    if call
-        .arguments
-        .find_keyword("exc_info")
-        .map(|keyword| &keyword.value)
-        .is_some_and(|value| {
-            Truthiness::from_expr(value, |id| checker.semantic().is_builtin(id)).is_falsey()
-        })
-    {
-        checker
-            .diagnostics
-            .push(Diagnostic::new(ExceptionWithoutExcInfo, call.range()));
-    }
-}

crates/ruff/src/rules/flake8_logging/rules/invalid_get_logger_argument.rs

@@ -1,92 +0,0 @@
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
-use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::{self as ast, Expr};
-use ruff_text_size::Ranged;
-
-use crate::checkers::ast::Checker;
-use crate::registry::AsRule;
-
-/// ## What it does
-/// Checks for any usage of `__cached__` and `__file__` as an argument to
-/// `logging.getLogger()`.
-///
-/// ## Why is this bad?
-/// The [logging documentation] recommends this pattern:
-///
-/// ```python
-/// logging.getLogger(__name__)
-/// ```
-///
-/// Here, `__name__` is the fully qualified module name, such as `foo.bar`,
-/// which is the intended format for logger names.
-///
-/// This rule detects probably-mistaken usage of similar module-level dunder constants:
-///
-/// * `__cached__` - the pathname of the module's compiled version, such as `foo/__pycache__/bar.cpython-311.pyc`.
-/// * `__file__` - the pathname of the module, such as `foo/bar.py`.
-///
-/// ## Example
-/// ```python
-/// import logging
-///
-/// logger = logging.getLogger(__file__)
-/// ```
-///
-/// Use instead:
-/// ```python
-/// import logging
-///
-/// logger = logging.getLogger(__name__)
-/// ```
-///
-/// [logging documentation]: https://docs.python.org/3/library/logging.html#logger-objects
-#[violation]
-pub struct InvalidGetLoggerArgument;
-
-impl Violation for InvalidGetLoggerArgument {
-    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
-
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Use `__name__` with `logging.getLogger()`")
-    }
-
-    fn autofix_title(&self) -> Option<String> {
-        Some(format!("Replace with `__name__`"))
-    }
-}
-
-/// LOG002
-pub(crate) fn invalid_get_logger_argument(checker: &mut Checker, call: &ast::ExprCall) {
-    let Some(Expr::Name(expr @ ast::ExprName { id, .. })) = call.arguments.find_argument("name", 0)
-    else {
-        return;
-    };
-
-    if !matches!(id.as_ref(), "__file__" | "__cached__") {
-        return;
-    }
-
-    if !checker.semantic().is_builtin(id) {
-        return;
-    }
-
-    if !checker
-        .semantic()
-        .resolve_call_path(call.func.as_ref())
-        .is_some_and(|call_path| matches!(call_path.as_slice(), ["logging", "getLogger"]))
-    {
-        return;
-    }
-
-    let mut diagnostic = Diagnostic::new(InvalidGetLoggerArgument, expr.range());
-    if checker.patch(diagnostic.kind.rule()) {
-        if checker.semantic().is_builtin("__name__") {
-            diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
-                "__name__".to_string(),
-                expr.range(),
-            )));
-        }
-    }
-    checker.diagnostics.push(diagnostic);
-}

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

@@ -1,9 +0,0 @@
-pub(crate) use direct_logger_instantiation::*;
-pub(crate) use exception_without_exc_info::*;
-pub(crate) use invalid_get_logger_argument::*;
-pub(crate) use undocumented_warn::*;
-
-mod direct_logger_instantiation;
-mod exception_without_exc_info;
-mod invalid_get_logger_argument;
-mod undocumented_warn;

crates/ruff/src/rules/flake8_logging/rules/undocumented_warn.rs

@@ -1,71 +0,0 @@
-use ruff_python_ast::Expr;
-
-use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
-use ruff_macros::{derive_message_formats, violation};
-use ruff_text_size::Ranged;
-
-use crate::checkers::ast::Checker;
-use crate::importer::ImportRequest;
-use crate::registry::AsRule;
-
-/// ## What it does
-/// Checks for uses of `logging.WARN`.
-///
-/// ## Why is this bad?
-/// The `logging.WARN` constant is an undocumented alias for `logging.WARNING`.
-///
-/// Although it’s not explicitly deprecated, `logging.WARN` is not mentioned
-/// in the `logging` documentation. Prefer `logging.WARNING` instead.
-///
-/// ## Example
-/// ```python
-/// import logging
-///
-///
-/// logging.basicConfig(level=logging.WARN)
-/// ```
-///
-/// Use instead:
-/// ```python
-/// import logging
-///
-///
-/// logging.basicConfig(level=logging.WARNING)
-/// ```
-#[violation]
-pub struct UndocumentedWarn;
-
-impl Violation for UndocumentedWarn {
-    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Use of undocumented `logging.WARN` constant")
-    }
-
-    fn autofix_title(&self) -> Option<String> {
-        Some(format!("Replace `logging.WARN` with `logging.WARNING`"))
-    }
-}
-
-/// LOG009
-pub(crate) fn undocumented_warn(checker: &mut Checker, expr: &Expr) {
-    if checker
-        .semantic()
-        .resolve_call_path(expr)
-        .is_some_and(|call_path| matches!(call_path.as_slice(), ["logging", "WARN"]))
-    {
-        let mut diagnostic = Diagnostic::new(UndocumentedWarn, expr.range());
-        if checker.patch(diagnostic.kind.rule()) {
-            diagnostic.try_set_fix(|| {
-                let (import_edit, binding) = checker.importer().get_or_import_symbol(
-                    &ImportRequest::import("logging", "WARNING"),
-                    expr.start(),
-                    checker.semantic(),
-                )?;
-                let reference_edit = Edit::range_replacement(binding, expr.range());
-                Ok(Fix::suggested_edits(import_edit, [reference_edit]))
-            });
-        }
-        checker.diagnostics.push(diagnostic);
-    }
-}

crates/ruff/src/rules/flake8_logging/snapshots/ruff__rules__flake8_logging__tests__LOG001_LOG001.py.snap

@@ -1,40 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_logging/mod.rs
----
-LOG001.py:3:1: LOG001 [*] Use `logging.getLogger()` to instantiate loggers
-  |
-1 | import logging
-2 | 
-3 | logging.Logger(__name__)
-  | ^^^^^^^^^^^^^^ LOG001
-4 | logging.Logger()
-5 | logging.getLogger(__name__)
-  |
-  = help: Replace with `logging.getLogger()`
-
-ℹ Suggested fix
-1 1 | import logging
-2 2 | 
-3   |-logging.Logger(__name__)
-  3 |+logging.getLogger(__name__)
-4 4 | logging.Logger()
-5 5 | logging.getLogger(__name__)
-
-LOG001.py:4:1: LOG001 [*] Use `logging.getLogger()` to instantiate loggers
-  |
-3 | logging.Logger(__name__)
-4 | logging.Logger()
-  | ^^^^^^^^^^^^^^ LOG001
-5 | logging.getLogger(__name__)
-  |
-  = help: Replace with `logging.getLogger()`
-
-ℹ Suggested fix
-1 1 | import logging
-2 2 | 
-3 3 | logging.Logger(__name__)
-4   |-logging.Logger()
-  4 |+logging.getLogger()
-5 5 | logging.getLogger(__name__)
-
-

crates/ruff/src/rules/flake8_logging/snapshots/ruff__rules__flake8_logging__tests__LOG002_LOG002.py.snap

@@ -1,82 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_logging/mod.rs
----
-LOG002.py:11:11: LOG002 [*] Use `__name__` with `logging.getLogger()`
-   |
-10 | # LOG002
-11 | getLogger(__file__)
-   |           ^^^^^^^^ LOG002
-12 | logging.getLogger(name=__file__)
-   |
-   = help: Replace with `name`
-
-ℹ Suggested fix
-8  8  | logging.getLogger(name="custom")
-9  9  | 
-10 10 | # LOG002
-11    |-getLogger(__file__)
-   11 |+getLogger(__name__)
-12 12 | logging.getLogger(name=__file__)
-13 13 | 
-14 14 | logging.getLogger(__cached__)
-
-LOG002.py:12:24: LOG002 [*] Use `__name__` with `logging.getLogger()`
-   |
-10 | # LOG002
-11 | getLogger(__file__)
-12 | logging.getLogger(name=__file__)
-   |                        ^^^^^^^^ LOG002
-13 | 
-14 | logging.getLogger(__cached__)
-   |
-   = help: Replace with `name`
-
-ℹ Suggested fix
-9  9  | 
-10 10 | # LOG002
-11 11 | getLogger(__file__)
-12    |-logging.getLogger(name=__file__)
-   12 |+logging.getLogger(name=__name__)
-13 13 | 
-14 14 | logging.getLogger(__cached__)
-15 15 | getLogger(name=__cached__)
-
-LOG002.py:14:19: LOG002 [*] Use `__name__` with `logging.getLogger()`
-   |
-12 | logging.getLogger(name=__file__)
-13 | 
-14 | logging.getLogger(__cached__)
-   |                   ^^^^^^^^^^ LOG002
-15 | getLogger(name=__cached__)
-   |
-   = help: Replace with `name`
-
-ℹ Suggested fix
-11 11 | getLogger(__file__)
-12 12 | logging.getLogger(name=__file__)
-13 13 | 
-14    |-logging.getLogger(__cached__)
-   14 |+logging.getLogger(__name__)
-15 15 | getLogger(name=__cached__)
-16 16 | 
-17 17 | 
-
-LOG002.py:15:16: LOG002 [*] Use `__name__` with `logging.getLogger()`
-   |
-14 | logging.getLogger(__cached__)
-15 | getLogger(name=__cached__)
-   |                ^^^^^^^^^^ LOG002
-   |
-   = help: Replace with `name`
-
-ℹ Suggested fix
-12 12 | logging.getLogger(name=__file__)
-13 13 | 
-14 14 | logging.getLogger(__cached__)
-15    |-getLogger(name=__cached__)
-   15 |+getLogger(name=__name__)
-16 16 | 
-17 17 | 
-18 18 | # Override `logging.getLogger`
-
-

crates/ruff/src/rules/flake8_logging/snapshots/ruff__rules__flake8_logging__tests__LOG007_LOG007.py.snap

@@ -1,40 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_logging/mod.rs
----
-LOG007.py:6:1: LOG007 Use of `logging.exception` with falsy `exc_info`
-  |
-5 | logging.exception("foo")  # OK
-6 | logging.exception("foo", exc_info=False)  # LOG007
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ LOG007
-7 | logging.exception("foo", exc_info=[])  # LOG007
-8 | logger.exception("foo")  # OK
-  |
-
-LOG007.py:7:1: LOG007 Use of `logging.exception` with falsy `exc_info`
-  |
-5 | logging.exception("foo")  # OK
-6 | logging.exception("foo", exc_info=False)  # LOG007
-7 | logging.exception("foo", exc_info=[])  # LOG007
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ LOG007
-8 | logger.exception("foo")  # OK
-9 | logger.exception("foo", exc_info=False)  # LOG007
-  |
-
-LOG007.py:9:1: LOG007 Use of `logging.exception` with falsy `exc_info`
-   |
- 7 | logging.exception("foo", exc_info=[])  # LOG007
- 8 | logger.exception("foo")  # OK
- 9 | logger.exception("foo", exc_info=False)  # LOG007
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ LOG007
-10 | logger.exception("foo", exc_info=[])  # LOG007
-   |
-
-LOG007.py:10:1: LOG007 Use of `logging.exception` with falsy `exc_info`
-   |
- 8 | logger.exception("foo")  # OK
- 9 | logger.exception("foo", exc_info=False)  # LOG007
-10 | logger.exception("foo", exc_info=[])  # LOG007
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ LOG007
-   |
-
-

crates/ruff/src/rules/flake8_logging/snapshots/ruff__rules__flake8_logging__tests__LOG009_LOG009.py.snap

@@ -1,41 +0,0 @@
----
-source: crates/ruff/src/rules/flake8_logging/mod.rs
----
-LOG009.py:3:1: LOG009 [*] Use of undocumented `logging.WARN` constant
-  |
-1 | import logging
-2 | 
-3 | logging.WARN  # LOG009
-  | ^^^^^^^^^^^^ LOG009
-4 | logging.WARNING  # OK
-  |
-  = help: Replace `logging.WARN` with `logging.WARNING`
-
-ℹ Suggested fix
-1 1 | import logging
-2 2 | 
-3   |-logging.WARN  # LOG009
-  3 |+logging.WARNING  # LOG009
-4 4 | logging.WARNING  # OK
-5 5 | 
-6 6 | from logging import WARN, WARNING
-
-LOG009.py:8:1: LOG009 [*] Use of undocumented `logging.WARN` constant
-  |
-6 | from logging import WARN, WARNING
-7 | 
-8 | WARN  # LOG009
-  | ^^^^ LOG009
-9 | WARNING  # OK
-  |
-  = help: Replace `logging.WARN` with `logging.WARNING`
-
-ℹ Suggested fix
-5 5 | 
-6 6 | from logging import WARN, WARNING
-7 7 | 
-8   |-WARN  # LOG009
-  8 |+logging.WARNING  # LOG009
-9 9 | WARNING  # OK
-
-

crates/ruff/src/rules/flake8_pie/rules/unnecessary_range_start.rs

@@ -1,3 +1,5 @@
+use num_bigint::BigInt;
+
 use ruff_diagnostics::Diagnostic;
 use ruff_diagnostics::{AlwaysAutofixableViolation, Fix};
 use ruff_macros::{derive_message_formats, violation};
@@ -73,7 +75,7 @@ pub(crate) fn unnecessary_range_start(checker: &mut Checker, call: &ast::ExprCal
     else {
         return;
     };
-    if *value != 0 {
+    if *value != BigInt::from(0) {
         return;
     };
 

crates/ruff/src/rules/flake8_pyi/rules/pass_statement_stub_body.rs

@@ -6,26 +6,6 @@ use ruff_text_size::Ranged;
 use crate::checkers::ast::Checker;
 use crate::registry::Rule;
 
-/// ## What it does
-/// Checks for `pass` statements in empty stub bodies.
-///
-/// ## Why is this bad?
-/// For consistency, empty stub bodies should contain `...` instead of `pass`.
-///
-/// Additionally, an ellipsis better conveys the intent of the stub body (that
-/// the body has been implemented, but has been intentionally left blank to
-/// document the interface).
-///
-/// ## Example
-/// ```python
-/// def foo(bar: int) -> list[int]:
-///     pass
-/// ```
-///
-/// Use instead:
-/// ```python
-/// def foo(bar: int) -> list[int]: ...
-/// ```
 #[violation]
 pub struct PassStatementStubBody;
 

crates/ruff/src/rules/flake8_pyi/rules/unrecognized_version_info.rs

@@ -1,3 +1,5 @@
+use num_bigint::BigInt;
+use num_traits::{One, Zero};
 use ruff_python_ast::{self as ast, CmpOp, Constant, Expr};
 
 use ruff_diagnostics::{Diagnostic, Violation};
@@ -247,10 +249,10 @@ impl ExpectedComparator {
                     ..
                 }) = upper.as_ref()
                 {
-                    if *upper == 1 {
+                    if *upper == BigInt::one() {
                         return Some(ExpectedComparator::MajorTuple);
                     }
-                    if *upper == 2 {
+                    if *upper == BigInt::from(2) {
                         return Some(ExpectedComparator::MajorMinorTuple);
                     }
                 }
@@ -258,7 +260,7 @@ impl ExpectedComparator {
             Expr::Constant(ast::ExprConstant {
                 value: Constant::Int(n),
                 ..
-            }) if *n == 0 => {
+            }) if n.is_zero() => {
                 return Some(ExpectedComparator::MajorDigit);
             }
             _ => (),

crates/ruff/src/rules/flake8_pytest_style/rules/assertion.rs

@@ -10,7 +10,6 @@ use libcst_native::{
 use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::Truthiness;
-use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::visitor::Visitor;
 use ruff_python_ast::{
     self as ast, Arguments, BoolOp, ExceptHandler, Expr, Keyword, Stmt, UnaryOp,
@@ -294,13 +293,7 @@ pub(crate) fn unittest_assertion(
                         if let Ok(stmt) = unittest_assert.generate_assert(args, keywords) {
                             diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
                                 checker.generator().stmt(&stmt),
-                                parenthesized_range(
-                                    expr.into(),
-                                    checker.semantic().current_statement().into(),
-                                    checker.indexer().comment_ranges(),
-                                    checker.locator().contents(),
-                                )
-                                .unwrap_or(expr.range()),
+                                expr.range(),
                             )));
                         }
                     }

crates/ruff/src/rules/flake8_pytest_style/rules/parametrize.rs

@@ -9,7 +9,6 @@ use ruff_python_ast::node::AstNode;
 use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{self as ast, Arguments, Constant, Decorator, Expr, ExprContext};
 use ruff_python_codegen::Generator;
-use ruff_python_trivia::CommentRanges;
 use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer};
 use ruff_text_size::{Ranged, TextRange, TextSize};
 
@@ -299,17 +298,12 @@ fn elts_to_csv(elts: &[Expr], generator: Generator) -> Option<String> {
 fn get_parametrize_name_range(
     decorator: &Decorator,
     expr: &Expr,
-    comment_ranges: &CommentRanges,
     source: &str,
 ) -> Option<TextRange> {
-    decorator.expression.as_call_expr().and_then(|call| {
-        parenthesized_range(
-            expr.into(),
-            call.arguments.as_any_node_ref(),
-            comment_ranges,
-            source,
-        )
-    })
+    decorator
+        .expression
+        .as_call_expr()
+        .and_then(|call| parenthesized_range(expr.into(), call.arguments.as_any_node_ref(), source))
 }
 
 /// PT006
@@ -328,7 +322,6 @@ fn check_names(checker: &mut Checker, decorator: &Decorator, expr: &Expr) {
                         let name_range = get_parametrize_name_range(
                             decorator,
                             expr,
-                            checker.indexer().comment_ranges(),
                             checker.locator().contents(),
                         )
                         .unwrap_or(expr.range());
@@ -363,7 +356,6 @@ fn check_names(checker: &mut Checker, decorator: &Decorator, expr: &Expr) {
                         let name_range = get_parametrize_name_range(
                             decorator,
                             expr,
-                            checker.indexer().comment_ranges(),
                             checker.locator().contents(),
                         )
                         .unwrap_or(expr.range());

crates/ruff/src/rules/flake8_pytest_style/snapshots/ruff__rules__flake8_pytest_style__tests__PT009.snap

@@ -637,27 +637,5 @@ PT009.py:94:9: PT009 [*] Use a regular `assert` instead of unittest-style `failI
 93 93 |     def test_fail_if_equal(self):
 94    |-        self.failIfEqual(1, 2)  # Error
    94 |+        assert 1 != 2  # Error
-95 95 | 
-96 96 | 
-97 97 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459517
-
-PT009.py:98:2: PT009 [*] Use a regular `assert` instead of unittest-style `assertTrue`
-    |
- 97 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459517
- 98 | (self.assertTrue(
-    |  ^^^^^^^^^^^^^^^ PT009
- 99 |     "piAx_piAy_beta[r][x][y] = {17}".format(
-100 |         self.model.piAx_piAy_beta[r][x][y])))
-    |
-    = help: Replace `assertTrue(...)` with `assert ...`
-
-ℹ Suggested fix
-95 95 | 
-96 96 | 
-97 97 | # Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459517
-98    |-(self.assertTrue(
-99    |-    "piAx_piAy_beta[r][x][y] = {17}".format(
-100    |-        self.model.piAx_piAy_beta[r][x][y])))
-   98 |+assert "piAx_piAy_beta[r][x][y] = {17}".format(self.model.piAx_piAy_beta[r][x][y])
 
 

crates/ruff/src/rules/flake8_simplify/rules/ast_bool_op.rs

@@ -773,14 +773,9 @@ fn is_short_circuit(
             edit = Some(get_short_circuit_edit(
                 value,
                 TextRange::new(
-                    parenthesized_range(
-                        furthest.into(),
-                        expr.into(),
-                        checker.indexer().comment_ranges(),
-                        checker.locator().contents(),
-                    )
-                    .unwrap_or(furthest.range())
-                    .start(),
+                    parenthesized_range(furthest.into(), expr.into(), checker.locator().contents())
+                        .unwrap_or(furthest.range())
+                        .start(),
                     expr.end(),
                 ),
                 short_circuit_truthiness,
@@ -801,14 +796,9 @@ fn is_short_circuit(
             edit = Some(get_short_circuit_edit(
                 next_value,
                 TextRange::new(
-                    parenthesized_range(
-                        furthest.into(),
-                        expr.into(),
-                        checker.indexer().comment_ranges(),
-                        checker.locator().contents(),
-                    )
-                    .unwrap_or(furthest.range())
-                    .start(),
+                    parenthesized_range(furthest.into(), expr.into(), checker.locator().contents())
+                        .unwrap_or(furthest.range())
+                        .start(),
                     expr.end(),
                 ),
                 short_circuit_truthiness,

crates/ruff/src/rules/flake8_simplify/rules/ast_ifexp.rs

@@ -163,13 +163,8 @@ pub(crate) fn if_expr_with_true_false(
                 checker
                     .locator()
                     .slice(
-                        parenthesized_range(
-                            test.into(),
-                            expr.into(),
-                            checker.indexer().comment_ranges(),
-                            checker.locator().contents(),
-                        )
-                        .unwrap_or(test.range()),
+                        parenthesized_range(test.into(), expr.into(), checker.locator().contents())
+                            .unwrap_or(test.range()),
                     )
                     .to_string(),
                 expr.range(),

crates/ruff/src/rules/flake8_simplify/rules/key_in_dict.rs

@@ -88,20 +88,10 @@ fn key_in_dict(
     }
 
     // Extract the exact range of the left and right expressions.
-    let left_range = parenthesized_range(
-        left.into(),
-        parent,
-        checker.indexer().comment_ranges(),
-        checker.locator().contents(),
-    )
-    .unwrap_or(left.range());
-    let right_range = parenthesized_range(
-        right.into(),
-        parent,
-        checker.indexer().comment_ranges(),
-        checker.locator().contents(),
-    )
-    .unwrap_or(right.range());
+    let left_range = parenthesized_range(left.into(), parent, checker.locator().contents())
+        .unwrap_or(left.range());
+    let right_range = parenthesized_range(right.into(), parent, checker.locator().contents())
+        .unwrap_or(right.range());
 
     let mut diagnostic = Diagnostic::new(
         InDictKeys {

crates/ruff/src/rules/flynt/rules/static_join_to_fstring.rs

@@ -12,10 +12,10 @@ use crate::registry::AsRule;
 use crate::rules::flynt::helpers;
 
 /// ## What it does
-/// Checks for `str.join` calls that can be replaced with f-strings.
+/// Checks for `str#join` calls that can be replaced with f-strings.
 ///
 /// ## Why is this bad?
-/// f-strings are more readable and generally preferred over `str.join` calls.
+/// f-strings are more readable and generally preferred over `str#join` calls.
 ///
 /// ## Example
 /// ```python

crates/ruff/src/rules/mod.rs

@@ -22,7 +22,6 @@ pub mod flake8_future_annotations;
 pub mod flake8_gettext;
 pub mod flake8_implicit_str_concat;
 pub mod flake8_import_conventions;
-pub mod flake8_logging;
 pub mod flake8_logging_format;
 pub mod flake8_no_pep420;
 pub mod flake8_pie;

crates/ruff/src/rules/pandas_vet/rules/inplace_argument.rs

@@ -3,7 +3,6 @@ use ruff_macros::{derive_message_formats, violation};
 use ruff_python_ast::helpers::is_const_true;
 use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{self as ast, Keyword, Stmt};
-use ruff_python_trivia::CommentRanges;
 use ruff_source_file::Locator;
 use ruff_text_size::Ranged;
 
@@ -86,7 +85,6 @@ pub(crate) fn inplace_argument(checker: &mut Checker, call: &ast::ExprCall) {
                             call,
                             keyword,
                             statement,
-                            checker.indexer().comment_ranges(),
                             checker.locator(),
                         ) {
                             diagnostic.set_fix(fix);
@@ -109,21 +107,15 @@ fn convert_inplace_argument_to_assignment(
     call: &ast::ExprCall,
     keyword: &Keyword,
     statement: &Stmt,
-    comment_ranges: &CommentRanges,
     locator: &Locator,
 ) -> Option<Fix> {
     // Add the assignment.
     let attr = call.func.as_attribute_expr()?;
     let insert_assignment = Edit::insertion(
         format!("{name} = ", name = locator.slice(attr.value.range())),
-        parenthesized_range(
-            call.into(),
-            statement.into(),
-            comment_ranges,
-            locator.contents(),
-        )
-        .unwrap_or(call.range())
-        .start(),
+        parenthesized_range(call.into(), statement.into(), locator.contents())
+            .unwrap_or(call.range())
+            .start(),
     );
 
     // Remove the `inplace` argument.

crates/ruff/src/rules/pandas_vet/rules/nunique_constant_series_check.rs

@@ -1,3 +1,4 @@
+use num_traits::One;
 use ruff_python_ast::{self as ast, CmpOp, Constant, Expr};
 
 use ruff_diagnostics::Diagnostic;
@@ -114,7 +115,7 @@ pub(crate) fn nunique_constant_series_check(
 fn is_constant_one(expr: &Expr) -> bool {
     match expr {
         Expr::Constant(constant) => match &constant.value {
-            Constant::Int(int) => *int == 1,
+            Constant::Int(int) => int.is_one(),
             _ => false,
         },
         _ => false,

crates/ruff/src/rules/pep8_naming/rules/invalid_function_name.rs

@@ -70,12 +70,9 @@ pub(crate) fn invalid_function_name(
         return None;
     }
 
-    // Ignore any functions that are explicitly `@override` or `@overload`.
-    // These are defined elsewhere, so if they're first-party,
-    // we'll flag them at the definition site.
-    if visibility::is_override(decorator_list, semantic)
-        || visibility::is_overload(decorator_list, semantic)
-    {
+    // Ignore any functions that are explicitly `@override`. These are defined elsewhere,
+    // so if they're first-party, we'll flag them at the definition site.
+    if visibility::is_override(decorator_list, semantic) {
         return None;
     }
 

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

@@ -19,7 +19,6 @@ mod tests {
     #[test_case(Rule::TryExceptInLoop, Path::new("PERF203.py"))]
     #[test_case(Rule::ManualListComprehension, Path::new("PERF401.py"))]
     #[test_case(Rule::ManualListCopy, Path::new("PERF402.py"))]
-    #[test_case(Rule::ManualDictComprehension, Path::new("PERF403.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(

crates/ruff/src/rules/perflint/rules/manual_dict_comprehension.rs

@@ -1,178 +0,0 @@
-use ruff_diagnostics::{Diagnostic, Violation};
-use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::comparable::ComparableExpr;
-use ruff_python_ast::helpers::any_over_expr;
-use ruff_python_ast::{self as ast, Expr, Stmt};
-use ruff_python_semantic::analyze::typing::is_dict;
-use ruff_python_semantic::Binding;
-
-use crate::checkers::ast::Checker;
-
-/// ## What it does
-/// Checks for `for` loops that can be replaced by a dictionary comprehension.
-///
-/// ## Why is this bad?
-/// When creating or extending a dictionary in a for-loop, prefer a dictionary
-/// comprehension. Comprehensions are more readable and more performant.
-///
-/// For example, when comparing `{x: x for x in list(range(1000))}` to the `for`
-/// loop version, the comprehension is ~10% faster on Python 3.11.
-///
-/// Note that, as with all `perflint` rules, this is only intended as a
-/// micro-optimization, and will have a negligible impact on performance in
-/// most cases.
-///
-/// ## Example
-/// ```python
-/// pairs = (("a", 1), ("b", 2))
-/// result = {}
-/// for x, y in pairs:
-///     if y % 2:
-///         result[x] = y
-/// ```
-///
-/// Use instead:
-/// ```python
-/// pairs = (("a", 1), ("b", 2))
-/// result = {x: y for x, y in pairs if y % 2}
-/// ```
-///
-/// If you're appending to an existing dictionary, use the `update` method instead:
-/// ```python
-/// pairs = (("a", 1), ("b", 2))
-/// result.update({x: y for x, y in pairs if y % 2})
-/// ```
-#[violation]
-pub struct ManualDictComprehension;
-
-impl Violation for ManualDictComprehension {
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        format!("Use a dictionary comprehension instead of a for-loop")
-    }
-}
-
-/// PERF403
-pub(crate) fn manual_dict_comprehension(checker: &mut Checker, target: &Expr, body: &[Stmt]) {
-    let (stmt, if_test) = match body {
-        // ```python
-        // for idx, name in enumerate(names):
-        //     if idx % 2 == 0:
-        //         result[name] = idx
-        // ```
-        [Stmt::If(ast::StmtIf {
-            body,
-            elif_else_clauses,
-            test,
-            ..
-        })] => {
-            // TODO(charlie): If there's an `else` clause, verify that the `else` has the
-            // same structure.
-            if !elif_else_clauses.is_empty() {
-                return;
-            }
-            let [stmt] = body.as_slice() else {
-                return;
-            };
-            (stmt, Some(test))
-        }
-        // ```python
-        // for idx, name in enumerate(names):
-        //     result[name] = idx
-        // ```
-        [stmt] => (stmt, None),
-        _ => return,
-    };
-
-    let Stmt::Assign(ast::StmtAssign {
-        targets,
-        value,
-        range,
-    }) = stmt
-    else {
-        return;
-    };
-
-    let [Expr::Subscript(ast::ExprSubscript {
-        value: subscript_value,
-        slice,
-        ..
-    })] = targets.as_slice()
-    else {
-        return;
-    };
-
-    match target {
-        Expr::Tuple(ast::ExprTuple { elts, .. }) => {
-            if !elts
-                .iter()
-                .any(|elt| ComparableExpr::from(slice) == ComparableExpr::from(elt))
-            {
-                return;
-            }
-            if !elts
-                .iter()
-                .any(|elt| ComparableExpr::from(value) == ComparableExpr::from(elt))
-            {
-                return;
-            }
-        }
-        Expr::Name(_) => {
-            if ComparableExpr::from(slice) != ComparableExpr::from(target) {
-                return;
-            }
-            if ComparableExpr::from(value) != ComparableExpr::from(target) {
-                return;
-            }
-        }
-        _ => return,
-    }
-
-    // Exclude non-dictionary value.
-    let Expr::Name(ast::ExprName {
-        id: subscript_name, ..
-    }) = subscript_value.as_ref()
-    else {
-        return;
-    };
-    let scope = checker.semantic().current_scope();
-    let bindings: Vec<&Binding> = scope
-        .get_all(subscript_name)
-        .map(|binding_id| checker.semantic().binding(binding_id))
-        .collect();
-
-    let [binding] = bindings.as_slice() else {
-        return;
-    };
-
-    if !is_dict(binding, checker.semantic()) {
-        return;
-    }
-
-    // Avoid if the value is used in the conditional test, e.g.,
-    //
-    // ```python
-    // for x in y:
-    //    if x in filtered:
-    //        filtered[x] = y
-    // ```
-    //
-    // Converting this to a dictionary comprehension would raise a `NameError` as
-    // `filtered` is not defined yet:
-    //
-    // ```python
-    // filtered = {x: y for x in y if x in filtered}
-    // ```
-    if if_test.is_some_and(|test| {
-        any_over_expr(test, &|expr| {
-            expr.as_name_expr()
-                .is_some_and(|expr| expr.id == *subscript_name)
-        })
-    }) {
-        return;
-    }
-
-    checker
-        .diagnostics
-        .push(Diagnostic::new(ManualDictComprehension, *range));
-}

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

@@ -1,12 +1,10 @@
 pub(crate) use incorrect_dict_iterator::*;
-pub(crate) use manual_dict_comprehension::*;
 pub(crate) use manual_list_comprehension::*;
 pub(crate) use manual_list_copy::*;
 pub(crate) use try_except_in_loop::*;
 pub(crate) use unnecessary_list_cast::*;
 
 mod incorrect_dict_iterator;
-mod manual_dict_comprehension;
 mod manual_list_comprehension;
 mod manual_list_copy;
 mod try_except_in_loop;

crates/ruff/src/rules/perflint/snapshots/ruff__rules__perflint__tests__PERF403_PERF403.py.snap

@@ -1,52 +0,0 @@
----
-source: crates/ruff/src/rules/perflint/mod.rs
----
-PERF403.py:5:9: PERF403 Use a dictionary comprehension instead of a for-loop
-  |
-3 |     result = {}
-4 |     for idx, name in enumerate(fruit):
-5 |         result[idx] = name  # PERF403
-  |         ^^^^^^^^^^^^^^^^^^ PERF403
-  |
-
-PERF403.py:13:13: PERF403 Use a dictionary comprehension instead of a for-loop
-   |
-11 |     for idx, name in enumerate(fruit):
-12 |         if idx % 2:
-13 |             result[idx] = name  # PERF403
-   |             ^^^^^^^^^^^^^^^^^^ PERF403
-   |
-
-PERF403.py:31:13: PERF403 Use a dictionary comprehension instead of a for-loop
-   |
-29 |     for idx, name in enumerate(fruit):
-30 |         if idx % 2:
-31 |             result[idx] = name  # PERF403
-   |             ^^^^^^^^^^^^^^^^^^ PERF403
-   |
-
-PERF403.py:61:13: PERF403 Use a dictionary comprehension instead of a for-loop
-   |
-59 |     for idx, name in enumerate(fruit):
-60 |         if idx % 2:
-61 |             result[idx] = name  # PERF403
-   |             ^^^^^^^^^^^^^^^^^^ PERF403
-   |
-
-PERF403.py:76:9: PERF403 Use a dictionary comprehension instead of a for-loop
-   |
-74 |     result = {}
-75 |     for name in fruit:
-76 |         result[name] = name  # PERF403
-   |         ^^^^^^^^^^^^^^^^^^^ PERF403
-   |
-
-PERF403.py:83:9: PERF403 Use a dictionary comprehension instead of a for-loop
-   |
-81 |     result = {}
-82 |     for idx, name in enumerate(fruit):
-83 |         result[name] = idx  # PERF403
-   |         ^^^^^^^^^^^^^^^^^^ PERF403
-   |
-
-

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

@@ -3,7 +3,6 @@ use unicode_width::UnicodeWidthStr;
 use ruff_python_ast::node::AnyNodeRef;
 use ruff_python_ast::parenthesize::parenthesized_range;
 use ruff_python_ast::{CmpOp, Expr};
-use ruff_python_trivia::CommentRanges;
 use ruff_source_file::{Line, Locator};
 use ruff_text_size::{Ranged, TextLen, TextRange};
 
@@ -18,7 +17,6 @@ pub(super) fn generate_comparison(
     ops: &[CmpOp],
     comparators: &[Expr],
     parent: AnyNodeRef,
-    comment_ranges: &CommentRanges,
     locator: &Locator,
 ) -> String {
     let start = left.start();
@@ -26,12 +24,9 @@ pub(super) fn generate_comparison(
     let mut contents = String::with_capacity(usize::from(end - start));
 
     // Add the left side of the comparison.
-    contents.push_str(
-        locator.slice(
-            parenthesized_range(left.into(), parent, comment_ranges, locator.contents())
-                .unwrap_or(left.range()),
-        ),
-    );
+    contents.push_str(locator.slice(
+        parenthesized_range(left.into(), parent, locator.contents()).unwrap_or(left.range()),
+    ));
 
     for (op, comparator) in ops.iter().zip(comparators) {
         // Add the operator.
@@ -51,13 +46,8 @@ pub(super) fn generate_comparison(
         // Add the right side of the comparison.
         contents.push_str(
             locator.slice(
-                parenthesized_range(
-                    comparator.into(),
-                    parent,
-                    comment_ranges,
-                    locator.contents(),
-                )
-                .unwrap_or(comparator.range()),
+                parenthesized_range(comparator.into(), parent, locator.contents())
+                    .unwrap_or(comparator.range()),
             ),
         );
     }