re-add para on CLICOLOR and CLICOLOR_FORCE

Fixes #3259 

## Summary

Renames `UnnecessaryComprehensionAnyAll` to
`UnnecessaryComprehensionInCall` and extends the check to `sum`, `min`,
and `max`, in addition to `any` and `all`.

## Test Plan

Updated snapshot test.

Built docs locally and verified the docs for this rule still render
correctly.

.github/dependabot.yml

@@ -1,21 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    labels: ["internal"]
-    groups:
-      actions:
-        patterns:
-          - "*"
-    ignore:
-      # The latest versions of these are not compatible with our release workflow
-      - dependency-name: "actions/upload-artifact"
-      - dependency-name: "actions/download-artifact"
-
-  - package-ecosystem: "cargo"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    labels: ["internal"]

.github/renovate.json5

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

.github/workflows/ci.yaml

@@ -35,7 +35,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: tj-actions/changed-files@v42
+      - uses: tj-actions/changed-files@v44
         id: changed
         with:
           files_yaml: |
@@ -525,8 +525,23 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
 
+      # Codspeed comes with a very ancient cargo version (1.66) that resolves features flags differently than what we use now.
+      # This can result in build failures; see https://github.com/astral-sh/ruff/pull/10700.
+      # There's a pending codspeed PR to upgrade to a newer cargo version, but until that's merged, we need to use the workaround below.
+      # https://github.com/CodSpeedHQ/codspeed-rust/pull/31
+      # What we do is to call cargo build manually with the correct feature flags and RUSTC settings. We'll have to
+      # manually maintain the list of benchmarks to run with codspeed (the benefit is that we could detect which benchmarks to run and build based on the changes).
+      # This is inspired by https://github.com/oxc-project/oxc/blob/a0532adc654039a0c7ead7b35216dfa0b0cb8e8f/.github/workflows/benchmark.yml
       - name: "Build benchmarks"
-        run: cargo codspeed build --features codspeed -p ruff_benchmark
+        env:
+          RUSTFLAGS: "-C debuginfo=2 -C strip=none -g --cfg codspeed"
+        shell: bash
+        # Build all benchmarks, copy the binary to the codspeed directory, remove any `*.d` files that might have been created.
+        run: |
+          cargo build --release -p ruff_benchmark --bench parser --bench linter --bench formatter --bench lexer --features=codspeed
+          mkdir -p ./target/codspeed/ruff_benchmark
+          cp ./target/release/deps/{lexer,parser,linter,formatter}* target/codspeed/ruff_benchmark/
+          rm -rf ./target/codspeed/ruff_benchmark/*.d
 
       - name: "Run benchmarks"
         uses: CodSpeedHQ/action@v2

.gitignore

@@ -92,6 +92,7 @@ coverage.xml
 .hypothesis/
 .pytest_cache/
 cover/
+repos/
 
 # Translations
 *.mo

CHANGELOG.md

@@ -1,5 +1,90 @@
 # Changelog
 
+## 0.3.5
+
+### Preview features
+
+- \[`pylint`\] Implement `modified-iterating-set` (`E4703`) ([#10473](https://github.com/astral-sh/ruff/pull/10473))
+- \[`refurb`\] Implement `for-loop-set-mutations` (`FURB142`) ([#10583](https://github.com/astral-sh/ruff/pull/10583))
+- \[`refurb`\] Implement `unnecessary-from-float` (`FURB164`) ([#10647](https://github.com/astral-sh/ruff/pull/10647))
+- \[`refurb`\] Implement `verbose-decimal-constructor` (`FURB157`) ([#10533](https://github.com/astral-sh/ruff/pull/10533))
+
+### Rule changes
+
+- \[`flake8-comprehensions`\] Handled special case for `C401` which also matches `C416` ([#10596](https://github.com/astral-sh/ruff/pull/10596))
+- \[`flake8-pyi`\] Mark `unaliased-collections-abc-set-import` fix as "safe" for more cases in stub files (`PYI025`) ([#10547](https://github.com/astral-sh/ruff/pull/10547))
+- \[`numpy`\] Add `row_stack` to NumPy 2.0 migration rule ([#10646](https://github.com/astral-sh/ruff/pull/10646))
+- \[`pycodestyle`\] Allow cell magics before an import (`E402`) ([#10545](https://github.com/astral-sh/ruff/pull/10545))
+- \[`pycodestyle`\] Avoid blank line rules for the first logical line in cell ([#10291](https://github.com/astral-sh/ruff/pull/10291))
+
+### Configuration
+
+- Respected nested namespace packages ([#10541](https://github.com/astral-sh/ruff/pull/10541))
+- \[`flake8-boolean-trap`\] Add setting for user defined allowed boolean trap ([#10531](https://github.com/astral-sh/ruff/pull/10531))
+
+### Bug fixes
+
+- Correctly handle references in `__all__` definitions when renaming symbols in autofixes ([#10527](https://github.com/astral-sh/ruff/pull/10527))
+- Track ranges of names inside `__all__` definitions ([#10525](https://github.com/astral-sh/ruff/pull/10525))
+- \[`flake8-bugbear`\] Avoid false positive for usage after `continue` (`B031`) ([#10539](https://github.com/astral-sh/ruff/pull/10539))
+- \[`flake8-copyright`\] Accept commas in default copyright pattern ([#9498](https://github.com/astral-sh/ruff/pull/9498))
+- \[`flake8-datetimez`\] Allow f-strings with `%z` for `DTZ007` ([#10651](https://github.com/astral-sh/ruff/pull/10651))
+- \[`flake8-pytest-style`\] Fix `PT014` autofix for last item in list ([#10532](https://github.com/astral-sh/ruff/pull/10532))
+- \[`flake8-quotes`\] Ignore `Q000`, `Q001` when string is inside forward ref ([#10585](https://github.com/astral-sh/ruff/pull/10585))
+- \[`isort`\] Always place non-relative imports after relative imports ([#10669](https://github.com/astral-sh/ruff/pull/10669))
+- \[`isort`\] Respect Unicode characters in import sorting ([#10529](https://github.com/astral-sh/ruff/pull/10529))
+- \[`pyflakes`\] Fix F821 false negatives when `from __future__ import annotations` is active (attempt 2) ([#10524](https://github.com/astral-sh/ruff/pull/10524))
+- \[`pyflakes`\] Make `unnecessary-lambda` an always-unsafe fix ([#10668](https://github.com/astral-sh/ruff/pull/10668))
+- \[`pylint`\] Fixed false-positive on the rule `PLW1641` (`eq-without-hash`) ([#10566](https://github.com/astral-sh/ruff/pull/10566))
+- \[`ruff`\] Fix panic in unused `# noqa` removal with multi-byte space (`RUF100`) ([#10682](https://github.com/astral-sh/ruff/pull/10682))
+
+### Documentation
+
+- Add PR title format to `CONTRIBUTING.md` ([#10665](https://github.com/astral-sh/ruff/pull/10665))
+- Fix list markup to include blank lines required ([#10591](https://github.com/astral-sh/ruff/pull/10591))
+- Put `flake8-logging` next to the other flake8 plugins in registry ([#10587](https://github.com/astral-sh/ruff/pull/10587))
+- \[`flake8-bandit`\] Update warning message for rule `S305` to address insecure block cipher mode use ([#10602](https://github.com/astral-sh/ruff/pull/10602))
+- \[`flake8-bugbear`\] Document use of anonymous assignment in `useless-expression` ([#10551](https://github.com/astral-sh/ruff/pull/10551))
+- \[`flake8-datetimez`\] Clarify error messages and docs for `DTZ` rules ([#10621](https://github.com/astral-sh/ruff/pull/10621))
+- \[`pycodestyle`\] Use same before vs. after numbers for `space-around-operator` ([#10640](https://github.com/astral-sh/ruff/pull/10640))
+- \[`ruff`\] Change `quadratic-list-summation` docs to use `iadd` consistently ([#10666](https://github.com/astral-sh/ruff/pull/10666))
+
+## 0.3.4
+
+### Preview features
+
+- \[`flake8-simplify`\] Detect implicit `else` cases in `needless-bool` (`SIM103`) ([#10414](https://github.com/astral-sh/ruff/pull/10414))
+- \[`pylint`\] Implement `nan-comparison` (`PLW0117`) ([#10401](https://github.com/astral-sh/ruff/pull/10401))
+- \[`pylint`\] Implement `nonlocal-and-global` (`E115`) ([#10407](https://github.com/astral-sh/ruff/pull/10407))
+- \[`pylint`\] Implement `singledispatchmethod-function` (`PLE5120`) ([#10428](https://github.com/astral-sh/ruff/pull/10428))
+- \[`refurb`\] Implement `list-reverse-copy` (`FURB187`) ([#10212](https://github.com/astral-sh/ruff/pull/10212))
+
+### Rule changes
+
+- \[`flake8-pytest-style`\] Add automatic fix for `pytest-parametrize-values-wrong-type` (`PT007`) ([#10461](https://github.com/astral-sh/ruff/pull/10461))
+- \[`pycodestyle`\] Allow SPDX license headers to exceed the line length (`E501`) ([#10481](https://github.com/astral-sh/ruff/pull/10481))
+
+### Formatter
+
+- Fix unstable formatting for trailing subscript end-of-line comment ([#10492](https://github.com/astral-sh/ruff/pull/10492))
+
+### Bug fixes
+
+- Avoid code comment detection in PEP 723 script tags ([#10464](https://github.com/astral-sh/ruff/pull/10464))
+- Avoid incorrect tuple transformation in single-element case (`C409`) ([#10491](https://github.com/astral-sh/ruff/pull/10491))
+- Bug fix: Prevent fully defined links [`name`](link) from being reformatted ([#10442](https://github.com/astral-sh/ruff/pull/10442))
+- Consider raw source code for `W605` ([#10480](https://github.com/astral-sh/ruff/pull/10480))
+- Docs: Link inline settings when not part of options section ([#10499](https://github.com/astral-sh/ruff/pull/10499))
+- Don't treat annotations as redefinitions in `.pyi` files ([#10512](https://github.com/astral-sh/ruff/pull/10512))
+- Fix `E231` bug: Inconsistent catch compared to pycodestyle, such as when dict nested in list ([#10469](https://github.com/astral-sh/ruff/pull/10469))
+- Fix pylint upstream categories not showing in docs ([#10441](https://github.com/astral-sh/ruff/pull/10441))
+- Add missing `Options` references to blank line docs ([#10498](https://github.com/astral-sh/ruff/pull/10498))
+- 'Revert "F821: Fix false negatives in .py files when `from __future__ import annotations` is active (#10362)"' ([#10513](https://github.com/astral-sh/ruff/pull/10513))
+- Apply NFKC normalization to unicode identifiers in the lexer ([#10412](https://github.com/astral-sh/ruff/pull/10412))
+- Avoid failures due to non-deterministic binding ordering ([#10478](https://github.com/astral-sh/ruff/pull/10478))
+- \[`flake8-bugbear`\] Allow tuples of exceptions (`B030`) ([#10437](https://github.com/astral-sh/ruff/pull/10437))
+- \[`flake8-quotes`\] Avoid syntax errors due to invalid quotes (`Q000, Q002`) ([#10199](https://github.com/astral-sh/ruff/pull/10199))
+
 ## 0.3.3
 
 ### Preview features
@@ -61,7 +146,7 @@
 - Fix unstable `with` items formatting ([#10274](https://github.com/astral-sh/ruff/pull/10274))
 - Avoid repeating function calls in f-string conversions ([#10265](https://github.com/astral-sh/ruff/pull/10265))
 - Fix E203 false positive for slices in format strings ([#10280](https://github.com/astral-sh/ruff/pull/10280))
-- Fix incorrect `Parameter` range  for `*args` and `**kwargs`  ([#10283](https://github.com/astral-sh/ruff/pull/10283))
+- Fix incorrect `Parameter` range for `*args` and `**kwargs` ([#10283](https://github.com/astral-sh/ruff/pull/10283))
 - Treat `typing.Annotated` subscripts as type definitions ([#10285](https://github.com/astral-sh/ruff/pull/10285))
 
 ## 0.3.1
@@ -169,8 +254,7 @@ This release introduces the Ruff 2024.2 style, stabilizing the following changes
 Highlights include:
 
 - Initial support formatting f-strings (in `--preview`).
-- Support for overriding arbitrary configuration options via the CLI through an expanded `--config`
-    argument (e.g., `--config "lint.isort.combine-as-imports=false"`).
+- Support for overriding arbitrary configuration options via the CLI through an expanded `--config` argument (e.g., `--config "lint.isort.combine-as-imports=false"`).
 - Significant performance improvements in Ruff's lexer, parser, and lint rules.
 
 ### Preview features
@@ -818,7 +902,7 @@ docstrings via the `docstring-code-format` setting.
 - \[`pylint`\] Default `max-positional-args` to `max-args` ([#8998](https://github.com/astral-sh/ruff/pull/8998))
 - \[`pylint`\] Add `allow-dunder-method-names` setting for `bad-dunder-method-name` (`PLW3201`) ([#8812](https://github.com/astral-sh/ruff/pull/8812))
 - \[`isort`\] Add support for `from-first` setting ([#8663](https://github.com/astral-sh/ruff/pull/8663))
-- \[`isort`\]  Add support for `length-sort` settings ([#8841](https://github.com/astral-sh/ruff/pull/8841))
+- \[`isort`\] Add support for `length-sort` settings ([#8841](https://github.com/astral-sh/ruff/pull/8841))
 
 ### Bug fixes
 
@@ -947,7 +1031,7 @@ docstrings via the `docstring-code-format` setting.
 - \[`flake8-trio`\] Implement `TRIO115` ([#8486](https://github.com/astral-sh/ruff/pull/8486))
 - \[`refurb`\] Implement `type-none-comparison` (`FURB169`) ([#8487](https://github.com/astral-sh/ruff/pull/8487))
 - Flag all comparisons against builtin types in `E721` ([#8491](https://github.com/astral-sh/ruff/pull/8491))
-- Make `SIM118` fix as safe when the expression is a known dictionary  ([#8525](https://github.com/astral-sh/ruff/pull/8525))
+- Make `SIM118` fix as safe when the expression is a known dictionary ([#8525](https://github.com/astral-sh/ruff/pull/8525))
 
 ### Formatter
 
@@ -1115,7 +1199,7 @@ Try it today with `ruff format`! [Check out the blog post](https://astral.sh/blo
 - Add `backports.strenum` to `deprecated-imports` ([#8113](https://github.com/astral-sh/ruff/pull/8113))
 - Update `SIM112` to ignore `https_proxy`, `http_proxy`, and `no_proxy` ([#8140](https://github.com/astral-sh/ruff/pull/8140))
 - Update fix for `literal-membership` (`PLR6201`) to be unsafe ([#8097](https://github.com/astral-sh/ruff/pull/8097))
-- Update fix for  `mutable-argument-defaults` (`B006`) to be unsafe ([#8108](https://github.com/astral-sh/ruff/pull/8108))
+- Update fix for `mutable-argument-defaults` (`B006`) to be unsafe ([#8108](https://github.com/astral-sh/ruff/pull/8108))
 
 ### Formatter
 
@@ -1243,7 +1327,7 @@ Read Ruff's new [versioning policy](https://docs.astral.sh/ruff/versioning/).
 - \[`refurb`\] Add `single-item-membership-test` (`FURB171`) ([#7815](https://github.com/astral-sh/ruff/pull/7815))
 - \[`pylint`\] Add `and-or-ternary` (`R1706`) ([#7811](https://github.com/astral-sh/ruff/pull/7811))
 
-*New rules are added in [preview](https://docs.astral.sh/ruff/preview/).*
+_New rules are added in [preview](https://docs.astral.sh/ruff/preview/)._
 
 ### Configuration
 

CONTRIBUTING.md

@@ -33,27 +33,18 @@ Welcome! We're happy to have you here. Thank you in advance for your contributio
 
 ## The Basics
 
-Ruff welcomes contributions in the form of Pull Requests.
+Ruff welcomes contributions in the form of pull requests.
 
 For small changes (e.g., bug fixes), feel free to submit a PR.
 
 For larger changes (e.g., new lint rules, new functionality, new configuration options), consider
 creating an [**issue**](https://github.com/astral-sh/ruff/issues) outlining your proposed change.
-You can also join us on [**Discord**](https://discord.com/invite/astral-sh) to discuss your idea with the
+You can also join us on [Discord](https://discord.com/invite/astral-sh) to discuss your idea with the
 community. We've labeled [beginner-friendly tasks](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
 in the issue tracker, along with [bugs](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3Abug)
 and [improvements](https://github.com/astral-sh/ruff/issues?q=is%3Aissue+is%3Aopen+label%3Aaccepted)
 that are ready for contributions.
 
-If you're looking for a place to start, we recommend implementing a new lint rule (see:
-[_Adding a new lint rule_](#example-adding-a-new-lint-rule), which will allow you to learn from and
-pattern-match against the examples in the existing codebase. Many lint rules are inspired by
-existing Python plugins, which can be used as a reference implementation.
-
-As a concrete example: consider taking on one of the rules from the [`flake8-pyi`](https://github.com/astral-sh/ruff/issues/848)
-plugin, and looking to the originating [Python source](https://github.com/PyCQA/flake8-pyi) for
-guidance.
-
 If you have suggestions on how we might improve the contributing documentation, [let us know](https://github.com/astral-sh/ruff/discussions/5693)!
 
 ### Prerequisites
@@ -107,7 +98,7 @@ RUFF_UPDATE_SCHEMA=1 cargo test  # Rust testing and updating ruff.schema.json
 pre-commit run --all-files --show-diff-on-failure  # Rust and Python formatting, Markdown and Python linting, etc.
 ```
 
-These checks will run on GitHub Actions when you open your Pull Request, but running them locally
+These checks will run on GitHub Actions when you open your pull request, but running them locally
 will save you time and expedite the merge process.
 
 Note that many code changes also require updating the snapshot tests, which is done interactively
@@ -117,7 +108,14 @@ after running `cargo test` like so:
 cargo insta review
 ```
 
-Your Pull Request will be reviewed by a maintainer, which may involve a few rounds of iteration
+If your pull request relates to a specific lint rule, include the category and rule code in the
+title, as in the following examples:
+
+- \[`flake8-bugbear`\] Avoid false positive for usage after `continue` (`B031`)
+- \[`flake8-simplify`\] Detect implicit `else` cases in `needless-bool` (`SIM103`)
+- \[`pycodestyle`\] Implement `redundant-backslash` (`E502`)
+
+Your pull request will be reviewed by a maintainer, which may involve a few rounds of iteration
 prior to merging.
 
 ### Project Structure
@@ -125,8 +123,8 @@ prior to merging.
 Ruff is structured as a monorepo with a [flat crate structure](https://matklad.github.io/2021/08/22/large-rust-workspaces.html),
 such that all crates are contained in a flat `crates` directory.
 
-The vast majority of the code, including all lint rules, lives in the `ruff` crate (located at
-`crates/ruff_linter`). As a contributor, that's the crate that'll be most relevant to you.
+The vast majority of the code, including all lint rules, lives in the `ruff_linter` crate (located
+at `crates/ruff_linter`). As a contributor, that's the crate that'll be most relevant to you.
 
 At the time of writing, the repository includes the following crates:
 
@@ -199,11 +197,14 @@ and calling out to lint rule analyzer functions as it goes.
 If you need to inspect the AST, you can run `cargo dev print-ast` with a Python file. Grep
 for the `Diagnostic::new` invocations to understand how other, similar rules are implemented.
 
-Once you're satisfied with your code, add tests for your rule. See [rule testing](#rule-testing-fixtures-and-snapshots)
-for more details.
+Once you're satisfied with your code, add tests for your rule
+(see: [rule testing](#rule-testing-fixtures-and-snapshots)), and regenerate the documentation and
+associated assets (like our JSON Schema) with `cargo dev generate-all`.
 
-Finally, regenerate the documentation and other generated assets (like our JSON Schema) with:
-`cargo dev generate-all`.
+Finally, submit a pull request, and include the category, rule name, and rule code in the title, as
+in:
+
+> \[`pycodestyle`\] Implement `redundant-backslash` (`E502`)
 
 #### Rule naming convention
 
@@ -813,8 +814,8 @@ To understand Ruff's import categorization system, we first need to define two c
     "project root".)
 - "Package root": The top-most directory defining the Python package that includes a given Python
     file. To find the package root for a given Python file, traverse up its parent directories until
-    you reach a parent directory that doesn't contain an `__init__.py` file (and isn't marked as
-    a [namespace package](https://docs.astral.sh/ruff/settings/#namespace-packages)); take the directory
+    you reach a parent directory that doesn't contain an `__init__.py` file (and isn't in a subtree
+    marked as a [namespace package](https://docs.astral.sh/ruff/settings/#namespace-packages)); take the directory
     just before that, i.e., the first directory in the package.
 
 For example, given:

Cargo.toml

@@ -12,22 +12,20 @@ authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 license = "MIT"
 
 [workspace.dependencies]
-aho-corasick = { version = "1.1.2" }
+aho-corasick = { version = "1.1.3" }
 annotate-snippets = { version = "0.9.2", features = ["color"] }
+anstream = { version = "0.6.13" }
 anyhow = { version = "1.0.80" }
 argfile = { version = "0.1.6" }
-assert_cmd = { version = "2.0.13" }
 bincode = { version = "1.3.3" }
-bitflags = { version = "2.4.1" }
+bitflags = { version = "2.5.0" }
 bstr = { version = "1.9.1" }
 cachedir = { version = "0.3.1" }
 chrono = { version = "0.4.35", default-features = false, features = ["clock"] }
-clap = { version = "4.5.2", features = ["derive"] }
+clap = { version = "4.5.3", features = ["derive"] }
 clap_complete_command = { version = "0.5.1" }
 clearscreen = { version = "2.0.0" }
 codspeed-criterion-compat = { version = "2.4.0", default-features = false }
-colored = { version = "2.1.0" }
-configparser = { version = "3.0.3" }
 console_error_panic_hook = { version = "0.1.7" }
 console_log = { version = "1.0.0" }
 countme = { version = "3.0.1" }
@@ -35,7 +33,7 @@ criterion = { version = "0.5.1", default-features = false }
 crossbeam = { version = "0.8.4" }
 dirs = { version = "5.0.0" }
 drop_bomb = { version = "0.1.5" }
-env_logger = { version = "0.10.1" }
+env_logger = { version = "0.11.0" }
 fern = { version = "0.6.1" }
 filetime = { version = "0.2.23" }
 fs-err = { version = "2.11.0" }
@@ -48,7 +46,7 @@ imperative = { version = "1.0.4" }
 indicatif = { version = "0.17.8" }
 indoc = { version = "2.0.4" }
 insta = { version = "1.35.1", feature = ["filters", "glob"] }
-insta-cmd = { version = "0.4.0" }
+insta-cmd = { version = "0.5.0" }
 is-macro = { version = "0.3.5" }
 is-wsl = { version = "0.4.0" }
 itertools = { version = "0.12.1" }
@@ -65,17 +63,19 @@ memchr = { version = "2.7.1" }
 mimalloc = { version = "0.1.39" }
 natord = { version = "1.0.9" }
 notify = { version = "6.1.1" }
+num_cpus = { version = "1.16.0" }
 once_cell = { version = "1.19.0" }
+owo-colors = { version = "4.0.0" }
 path-absolutize = { version = "3.1.1" }
 pathdiff = { version = "0.2.1" }
-pep440_rs = { version = "0.4.0", features = ["serde"] }
+pep440_rs = { version = "0.5.0", features = ["serde"] }
 pretty_assertions = "1.3.0"
-proc-macro2 = { version = "1.0.78" }
+proc-macro2 = { version = "1.0.79" }
 pyproject-toml = { version = "0.9.0" }
 quick-junit = { version = "0.3.5" }
 quote = { version = "1.0.23" }
 rand = { version = "0.8.5" }
-rayon = { version = "1.8.1" }
+rayon = { version = "1.10.0" }
 regex = { version = "1.10.2" }
 result-like = { version = "0.5.0" }
 rustc-hash = { version = "1.1.0" }
@@ -89,31 +89,32 @@ serde_with = { version = "3.6.0", default-features = false, features = ["macros"
 shellexpand = { version = "3.0.0" }
 shlex = { version = "1.3.0" }
 similar = { version = "2.4.0", features = ["inline"] }
-smallvec = { version = "1.13.1" }
+smallvec = { version = "1.13.2" }
 static_assertions = "1.1.0"
-strum = { version = "0.25.0", features = ["strum_macros"] }
-strum_macros = { version = "0.25.3" }
-syn = { version = "2.0.51" }
+strum = { version = "0.26.0", features = ["strum_macros"] }
+strum_macros = { version = "0.26.0" }
+syn = { version = "2.0.55" }
 tempfile = { version = "3.9.0" }
 test-case = { version = "3.3.1" }
-thiserror = { version = "1.0.57" }
+thiserror = { version = "1.0.58" }
 tikv-jemallocator = { version = "0.5.0" }
-toml = { version = "0.8.9" }
+toml = { version = "0.8.11" }
 tracing = { version = "0.1.40" }
 tracing-indicatif = { version = "0.3.6" }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-tracing-tree = { version = "0.2.4" }
+tracing-tree = { version = "0.3.0" }
 typed-arena = { version = "2.0.2" }
 unic-ucd-category = { version = "0.9" }
 unicode-ident = { version = "1.0.12" }
 unicode-width = { version = "0.1.11" }
 unicode_names2 = { version = "1.2.2" }
+unicode-normalization = { version = "0.1.23" }
 ureq = { version = "2.9.6" }
 url = { version = "2.5.0" }
 uuid = { version = "1.6.1", features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
 walkdir = { version = "2.3.2" }
 wasm-bindgen = { version = "0.2.92" }
-wasm-bindgen-test = { version = "0.3.40" }
+wasm-bindgen-test = { version = "0.3.42" }
 wild = { version = "2" }
 
 [workspace.lints.rust]

README.md

@@ -32,7 +32,7 @@ An extremely fast Python linter and code formatter, written in Rust.
 - ⚖️ Drop-in parity with [Flake8](https://docs.astral.sh/ruff/faq/#how-does-ruff-compare-to-flake8), isort, and Black
 - 📦 Built-in caching, to avoid re-analyzing unchanged files
 - 🔧 Fix support, for automatic error correction (e.g., automatically remove unused imports)
-- 📏 Over [700 built-in rules](https://docs.astral.sh/ruff/rules/), with native re-implementations
+- 📏 Over [800 built-in rules](https://docs.astral.sh/ruff/rules/), with native re-implementations
     of popular Flake8 plugins, like flake8-bugbear
 - ⌨️ First-party [editor integrations](https://docs.astral.sh/ruff/integrations/) for
     [VS Code](https://github.com/astral-sh/ruff-vscode) and [more](https://github.com/astral-sh/ruff-lsp)
@@ -151,7 +151,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.3.3
+  rev: v0.3.5
   hooks:
     # Run the linter.
     - id: ruff
@@ -272,7 +272,7 @@ for more on the linting and formatting commands, respectively.
 
 <!-- Begin section: Rules -->
 
-**Ruff supports over 700 lint rules**, many of which are inspired by popular tools like Flake8,
+**Ruff supports over 800 lint rules**, many of which are inspired by popular tools like Flake8,
 isort, pyupgrade, and others. Regardless of the rule's origin, Ruff re-implements every rule in
 Rust as a first-party feature.
 
@@ -429,6 +429,7 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [Mypy](https://github.com/python/mypy)
 - Netflix ([Dispatch](https://github.com/Netflix/dispatch))
 - [Neon](https://github.com/neondatabase/neon)
+- [Nokia](https://nokia.com/)
 - [NoneBot](https://github.com/nonebot/nonebot2)
 - [NumPyro](https://github.com/pyro-ppl/numpyro)
 - [ONNX](https://github.com/onnx/onnx)

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.3.3"
+version = "0.3.5"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -25,6 +25,7 @@ ruff_source_file = { path = "../ruff_source_file" }
 ruff_text_size = { path = "../ruff_text_size" }
 ruff_workspace = { path = "../ruff_workspace" }
 
+anstream = { workspace = true }
 anyhow = { workspace = true }
 argfile = { workspace = true }
 bincode = { workspace = true }
@@ -34,13 +35,14 @@ chrono = { workspace = true }
 clap = { workspace = true, features = ["derive", "env", "wrap_help"] }
 clap_complete_command = { workspace = true }
 clearscreen = { workspace = true }
-colored = { workspace = true }
 filetime = { workspace = true }
 ignore = { workspace = true }
 is-macro = { workspace = true }
 itertools = { workspace = true }
 log = { workspace = true }
 notify = { workspace = true }
+num_cpus = { workspace = true }
+owo-colors = { workspace = true }
 path-absolutize = { workspace = true, features = ["once_cell_cache"] }
 rayon = { workspace = true }
 regex = { workspace = true }
@@ -53,7 +55,7 @@ tempfile = { workspace = true }
 thiserror = { workspace = true }
 toml = { workspace = true }
 tracing = { workspace = true, features = ["log"] }
-tracing-subscriber = { workspace = true, features = ["registry"]}
+tracing-subscriber = { workspace = true, features = ["registry"] }
 tracing-tree = { workspace = true }
 walkdir = { workspace = true }
 wild = { workspace = true }
@@ -61,9 +63,6 @@ wild = { workspace = true }
 [dev-dependencies]
 # Enable test rules during development
 ruff_linter = { path = "../ruff_linter", features = ["clap", "test-rules"] }
-assert_cmd = { workspace = true }
-# Avoid writing colored snapshots when running tests from the terminal
-colored = { workspace = true, features = ["no-color"]}
 insta = { workspace = true, features = ["filters", "json"] }
 insta-cmd = { workspace = true }
 tempfile = { workspace = true }

crates/ruff/src/args.rs

@@ -8,7 +8,7 @@ use std::sync::Arc;
 use anyhow::bail;
 use clap::builder::{TypedValueParser, ValueParserFactory};
 use clap::{command, Parser};
-use colored::Colorize;
+use owo_colors::OwoColorize;
 use path_absolutize::path_dedot;
 use regex::Regex;
 use rustc_hash::FxHashMap;
@@ -496,7 +496,7 @@ pub struct FormatCommand {
     pub range: Option<FormatRange>,
 }
 
-#[derive(Clone, Debug, clap::Parser)]
+#[derive(Copy, Clone, Debug, clap::Parser)]
 pub struct ServerCommand {
     /// Enable preview mode; required for regular operation
     #[arg(long)]
@@ -1053,7 +1053,6 @@ pub enum FormatRangeParseError {
 
 impl std::fmt::Display for FormatRangeParseError {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let tip = "  tip:".bold().green();
         match self {
             FormatRangeParseError::StartGreaterThanEnd(start, end) => {
                 write!(
@@ -1062,7 +1061,8 @@ impl std::fmt::Display for FormatRangeParseError {
                     start_invalid=start.to_string().bold().yellow(),
                     end_invalid=end.to_string().bold().yellow(),
                     start=start.to_string().green().bold(),
-                    end=end.to_string().green().bold()
+                    end=end.to_string().green().bold(),
+                    tip="  tip:".bold().green()
                 )
             }
             FormatRangeParseError::InvalidStart(inner) => inner.write(f, true),
@@ -1148,7 +1148,8 @@ pub enum LineColumnParseError {
 
 impl LineColumnParseError {
     fn write(&self, f: &mut std::fmt::Formatter, start_range: bool) -> std::fmt::Result {
-        let tip = "tip:".bold().green();
+        let tip = "tip:".bold();
+        let tip = tip.green();
 
         let range = if start_range { "start" } else { "end" };
 

crates/ruff/src/commands/check.rs

@@ -4,9 +4,9 @@ use std::path::{Path, PathBuf};
 use std::time::Instant;
 
 use anyhow::Result;
-use colored::Colorize;
 use ignore::Error;
 use log::{debug, error, warn};
+use owo_colors::OwoColorize;
 #[cfg(not(target_family = "wasm"))]
 use rayon::prelude::*;
 use rustc_hash::FxHashMap;
@@ -226,6 +226,7 @@ mod test {
     use rustc_hash::FxHashMap;
     use tempfile::TempDir;
 
+    use ruff_linter::colors;
     use ruff_linter::message::{Emitter, EmitterContext, TextEmitter};
     use ruff_linter::registry::Rule;
     use ruff_linter::settings::types::UnsafeFixes;
@@ -252,6 +253,7 @@ mod test {
         for file in [&pyproject_toml, &python_file, &notebook] {
             fs::OpenOptions::new()
                 .create(true)
+                .truncate(true)
                 .write(true)
                 .mode(0o000)
                 .open(file)?;
@@ -279,7 +281,7 @@ mod test {
             UnsafeFixes::Enabled,
         )
         .unwrap();
-        let mut output = Vec::new();
+        let mut output = colors::none(Vec::new());
 
         TextEmitter::default()
             .with_show_fix_status(true)
@@ -290,7 +292,7 @@ mod test {
             )
             .unwrap();
 
-        let messages = String::from_utf8(output).unwrap();
+        let messages = String::from_utf8(output.into_inner()).unwrap();
 
         insta::with_settings!({
             omit_expression => true,

crates/ruff/src/commands/clean.rs

@@ -2,7 +2,7 @@ use std::fs::remove_dir_all;
 use std::io::{self, BufWriter, Write};
 
 use anyhow::Result;
-use colored::Colorize;
+use owo_colors::OwoColorize;
 use path_absolutize::path_dedot;
 use walkdir::WalkDir;
 

crates/ruff/src/commands/format.rs

@@ -6,9 +6,9 @@ use std::path::{Path, PathBuf};
 use std::time::Instant;
 
 use anyhow::Result;
-use colored::Colorize;
 use itertools::Itertools;
 use log::{error, warn};
+use owo_colors::OwoColorize;
 use rayon::iter::Either::{Left, Right};
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 use rustc_hash::FxHashSet;
@@ -16,6 +16,7 @@ use thiserror::Error;
 use tracing::debug;
 
 use ruff_diagnostics::SourceMap;
+use ruff_linter::colors;
 use ruff_linter::fs;
 use ruff_linter::logging::{DisplayParseError, LogLevel};
 use ruff_linter::registry::Rule;
@@ -189,10 +190,10 @@ pub(crate) fn format(
     match mode {
         FormatMode::Write => {}
         FormatMode::Check => {
-            results.write_changed(&mut stdout().lock())?;
+            results.write_changed(&mut colors::auto(stdout()).lock())?;
         }
         FormatMode::Diff => {
-            results.write_diff(&mut stdout().lock())?;
+            results.write_diff(&mut colors::auto(stdout()).lock())?;
         }
     }
 
@@ -200,9 +201,9 @@ pub(crate) fn format(
     if config_arguments.log_level >= LogLevel::Default {
         if mode.is_diff() {
             // Allow piping the diff to e.g. a file by writing the summary to stderr
-            results.write_summary(&mut stderr().lock())?;
+            results.write_summary(&mut colors::auto(stderr()).lock())?;
         } else {
-            results.write_summary(&mut stdout().lock())?;
+            results.write_summary(&mut colors::auto(stdout()).lock())?;
         }
     }
 

crates/ruff/src/commands/format_stdin.rs

@@ -4,6 +4,7 @@ use std::path::Path;
 use anyhow::Result;
 use log::error;
 
+use ruff_linter::colors;
 use ruff_linter::source_kind::SourceKind;
 use ruff_python_ast::{PySourceType, SourceType};
 use ruff_workspace::resolver::{match_exclusion, python_file_at_path, Resolver};
@@ -111,7 +112,7 @@ fn format_source_code(
     match &formatted {
         FormattedSource::Formatted(formatted) => match mode {
             FormatMode::Write => {
-                let mut writer = stdout().lock();
+                let mut writer = colors::auto(stdout()).lock();
                 formatted
                     .write(&mut writer)
                     .map_err(|err| FormatCommandError::Write(path.map(Path::to_path_buf), err))?;
@@ -120,7 +121,7 @@ fn format_source_code(
             FormatMode::Diff => {
                 use std::io::Write;
                 write!(
-                    &mut stdout().lock(),
+                    &mut colors::auto(stdout()).lock(),
                     "{}",
                     source_kind.diff(formatted, path).unwrap()
                 )
@@ -130,7 +131,7 @@ fn format_source_code(
         FormattedSource::Unchanged => {
             // Write to stdout regardless of whether the source was formatted
             if mode.is_write() {
-                let mut writer = stdout().lock();
+                let mut writer = colors::auto(stdout()).lock();
                 source_kind
                     .write(&mut writer)
                     .map_err(|err| FormatCommandError::Write(path.map(Path::to_path_buf), err))?;

crates/ruff/src/commands/server.rs

@@ -1,3 +1,5 @@
+use std::num::NonZeroUsize;
+
 use crate::ExitStatus;
 use anyhow::Result;
 use ruff_linter::logging::LogLevel;
@@ -9,7 +11,11 @@ use tracing_subscriber::{
 };
 use tracing_tree::time::Uptime;
 
-pub(crate) fn run_server(preview: bool, log_level: LogLevel) -> Result<ExitStatus> {
+pub(crate) fn run_server(
+    preview: bool,
+    worker_threads: NonZeroUsize,
+    log_level: LogLevel,
+) -> Result<ExitStatus> {
     if !preview {
         tracing::error!("--preview needs to be provided as a command line argument while the server is still unstable.\nFor example: `ruff server --preview`");
         return Ok(ExitStatus::Error);
@@ -33,7 +39,7 @@ pub(crate) fn run_server(preview: bool, log_level: LogLevel) -> Result<ExitStatu
 
     tracing::subscriber::set_global_default(subscriber)?;
 
-    let server = Server::new()?;
+    let server = Server::new(worker_threads)?;
 
     server.run().map(|()| ExitStatus::Success)
 }

crates/ruff/src/diagnostics.rs

@@ -8,11 +8,12 @@ use std::ops::{Add, AddAssign};
 use std::path::Path;
 
 use anyhow::{Context, Result};
-use colored::Colorize;
 use log::{debug, error, warn};
+use owo_colors::OwoColorize;
 use rustc_hash::FxHashMap;
 
 use ruff_diagnostics::Diagnostic;
+use ruff_linter::colors;
 use ruff_linter::linter::{lint_fix, lint_only, FixTable, FixerResult, LinterResult, ParseSource};
 use ruff_linter::logging::DisplayParseError;
 use ruff_linter::message::Message;
@@ -444,7 +445,7 @@ pub(crate) fn lint_stdin(
                     // But only write a diff if it's non-empty.
                     if !fixed.is_empty() {
                         write!(
-                            &mut io::stdout().lock(),
+                            &mut colors::auto(io::stdout()).lock(),
                             "{}",
                             source_kind.diff(&transformed, path).unwrap()
                         )?;

crates/ruff/src/lib.rs

@@ -2,6 +2,7 @@
 
 use std::fs::File;
 use std::io::{self, stdout, BufWriter, Write};
+use std::num::NonZeroUsize;
 use std::path::{Path, PathBuf};
 use std::process::ExitCode;
 use std::sync::mpsc::channel;
@@ -9,10 +10,11 @@ use std::sync::mpsc::channel;
 use anyhow::Result;
 use args::{GlobalConfigArgs, ServerCommand};
 use clap::CommandFactory;
-use colored::Colorize;
 use log::warn;
 use notify::{recommended_watcher, RecursiveMode, Watcher};
+use owo_colors::OwoColorize;
 
+use ruff_linter::colors;
 use ruff_linter::logging::{set_up_logging, LogLevel};
 use ruff_linter::settings::flags::FixMode;
 use ruff_linter::settings::types::SerializationFormat;
@@ -144,10 +146,6 @@ pub fn run(
         }));
     }
 
-    // Enabled ANSI colors on Windows 10.
-    #[cfg(windows)]
-    assert!(colored::control::set_virtual_terminal(true).is_ok());
-
     set_up_logging(global_options.log_level())?;
 
     if let Some(deprecated_alias_warning) = deprecated_alias_warning {
@@ -204,10 +202,15 @@ fn format(args: FormatCommand, global_options: GlobalConfigArgs) -> Result<ExitS
     }
 }
 
-#[allow(clippy::needless_pass_by_value)] // TODO: remove once we start taking arguments from here
 fn server(args: ServerCommand, log_level: LogLevel) -> Result<ExitStatus> {
     let ServerCommand { preview } = args;
-    commands::server::run_server(preview, log_level)
+    // by default, we set the number of worker threads to `num_cpus`, with a maximum of 4.
+    let worker_threads = num_cpus::get().max(4);
+    commands::server::run_server(
+        preview,
+        NonZeroUsize::try_from(worker_threads).expect("a non-zero worker thread count"),
+        log_level,
+    )
 }
 
 pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<ExitStatus> {
@@ -219,13 +222,12 @@ pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<Exi
 
     let mut writer: Box<dyn Write> = match cli.output_file {
         Some(path) if !cli.watch => {
-            colored::control::set_override(false);
             let file = File::create(path)?;
-            Box::new(BufWriter::new(file))
+            Box::new(BufWriter::new(colors::none(file)))
         }
-        _ => Box::new(BufWriter::new(io::stdout())),
+        _ => Box::new(BufWriter::new(colors::auto(io::stdout()))),
     };
-    let stderr_writer = Box::new(BufWriter::new(io::stderr()));
+    let stderr_writer = Box::new(BufWriter::new(colors::auto(io::stderr())));
 
     let is_stdin = is_stdin(&cli.files, cli.stdin_filename.as_deref());
     let files = resolve_default_files(cli.files, is_stdin);

crates/ruff/src/main.rs

@@ -1,7 +1,8 @@
 use std::process::ExitCode;
 
+use anstream::eprintln;
 use clap::{Parser, Subcommand};
-use colored::Colorize;
+use owo_colors::OwoColorize;
 
 use ruff::args::{Args, Command};
 use ruff::{run, ExitStatus};

crates/ruff/src/panic.rs

@@ -16,7 +16,7 @@ impl std::fmt::Display for PanicError {
 }
 
 thread_local! {
-    static LAST_PANIC: std::cell::Cell<Option<PanicError>> = std::cell::Cell::new(None);
+    static LAST_PANIC: std::cell::Cell<Option<PanicError>> = const { std::cell::Cell::new(None) };
 }
 
 /// [`catch_unwind`](std::panic::catch_unwind) wrapper that sets a custom [`set_hook`](std::panic::set_hook)

crates/ruff/src/printer.rs

@@ -5,8 +5,8 @@ use std::io::Write;
 
 use anyhow::Result;
 use bitflags::bitflags;
-use colored::Colorize;
 use itertools::{iterate, Itertools};
+use owo_colors::OwoColorize;
 use serde::Serialize;
 
 use ruff_linter::fs::relativize_path;

crates/ruff/src/version.rs

@@ -70,7 +70,7 @@ pub(crate) fn version() -> VersionInfo {
 
 #[cfg(test)]
 mod tests {
-    use insta::{assert_display_snapshot, assert_json_snapshot};
+    use insta::{assert_json_snapshot, assert_snapshot};
 
     use super::{CommitInfo, VersionInfo};
 
@@ -80,7 +80,7 @@ mod tests {
             version: "0.0.0".to_string(),
             commit_info: None,
         };
-        assert_display_snapshot!(version);
+        assert_snapshot!(version);
     }
 
     #[test]
@@ -95,7 +95,7 @@ mod tests {
                 commits_since_last_tag: 0,
             }),
         };
-        assert_display_snapshot!(version);
+        assert_snapshot!(version);
     }
 
     #[test]
@@ -110,7 +110,7 @@ mod tests {
                 commits_since_last_tag: 24,
             }),
         };
-        assert_display_snapshot!(version);
+        assert_snapshot!(version);
     }
 
     #[test]

crates/ruff/tests/integration_test.rs

@@ -1353,6 +1353,7 @@ fn unreadable_pyproject_toml() -> Result<()> {
     // Create an empty file with 000 permissions
     fs::OpenOptions::new()
         .create(true)
+        .truncate(true)
         .write(true)
         .mode(0o000)
         .open(pyproject_toml)?;

crates/ruff/tests/snapshots/show_settings__display_default_settings.snap

@@ -231,7 +231,7 @@ linter.flake8_bandit.check_typed_exception = false
 linter.flake8_bugbear.extend_immutable_calls = []
 linter.flake8_builtins.builtins_ignorelist = []
 linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
-linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}(-\d{4})*
+linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
 linter.flake8_copyright.author = none
 linter.flake8_copyright.min_file_size = 0
 linter.flake8_errmsg.max_string_length = 0

crates/ruff_dev/Cargo.toml

@@ -22,7 +22,7 @@ ruff_python_formatter = { path = "../ruff_python_formatter" }
 ruff_python_parser = { path = "../ruff_python_parser" }
 ruff_python_stdlib = { path = "../ruff_python_stdlib" }
 ruff_python_trivia = { path = "../ruff_python_trivia" }
-ruff_workspace = { path = "../ruff_workspace", features = ["schemars"]}
+ruff_workspace = { path = "../ruff_workspace", features = ["schemars"] }
 
 anyhow = { workspace = true }
 clap = { workspace = true, features = ["wrap_help"] }
@@ -31,7 +31,6 @@ imara-diff = { workspace = true }
 indicatif = { workspace = true }
 itertools = { workspace = true }
 libcst = { workspace = true }
-once_cell = { workspace = true }
 pretty_assertions = { workspace = true }
 rayon = { workspace = true }
 regex = { workspace = true }

crates/ruff_dev/src/format_dev.rs

@@ -134,7 +134,7 @@ impl Statistics {
         }
     }
 
-    /// We currently prefer the the similarity index, but i'd like to keep this around
+    /// We currently prefer the similarity index, but i'd like to keep this around
     #[allow(clippy::cast_precision_loss, unused)]
     pub(crate) fn jaccard_index(&self) -> f32 {
         self.intersection as f32 / (self.black_input + self.ruff_output + self.intersection) as f32

crates/ruff_dev/src/generate_docs.rs

@@ -1,6 +1,7 @@
 //! Generate Markdown documentation for applicable rules.
 #![allow(clippy::print_stdout, clippy::print_stderr)]
 
+use std::collections::HashSet;
 use std::fs;
 use std::path::PathBuf;
 
@@ -97,12 +98,13 @@ pub(crate) fn main(args: &Args) -> Result<()> {
 fn process_documentation(documentation: &str, out: &mut String, rule_name: &str) {
     let mut in_options = false;
     let mut after = String::new();
+    let mut referenced_options = HashSet::new();
 
     // HACK: This is an ugly regex hack that's necessary because mkdocs uses
     // a non-CommonMark-compliant Markdown parser, which doesn't support code
     // tags in link definitions
     // (see https://github.com/Python-Markdown/markdown/issues/280).
-    let documentation = Regex::new(r"\[`([^`]*?)`]($|[^\[])").unwrap().replace_all(
+    let documentation = Regex::new(r"\[`([^`]*?)`]($|[^\[(])").unwrap().replace_all(
         documentation,
         |caps: &Captures| {
             format!(
@@ -135,6 +137,7 @@ fn process_documentation(documentation: &str, out: &mut String, rule_name: &str)
                 let anchor = option.replace('.', "_");
                 out.push_str(&format!("- [`{option}`][{option}]\n"));
                 after.push_str(&format!("[{option}]: ../settings.md#{anchor}\n"));
+                referenced_options.insert(option);
 
                 continue;
             }
@@ -142,6 +145,20 @@ fn process_documentation(documentation: &str, out: &mut String, rule_name: &str)
 
         out.push_str(line);
     }
+
+    let re = Regex::new(r"\[`([^`]*?)`]\[(.*?)]").unwrap();
+    for (_, [option, _]) in re.captures_iter(&documentation).map(|c| c.extract()) {
+        if let Some(OptionEntry::Field(field)) = Options::metadata().find(option) {
+            if referenced_options.insert(option) {
+                let anchor = option.replace('.', "_");
+                after.push_str(&format!("[{option}]: ../settings.md#{anchor}\n"));
+            }
+            if field.deprecated.is_some() {
+                eprintln!("Rule {rule_name} references deprecated option {option}.");
+            }
+        }
+    }
+
     if !after.is_empty() {
         out.push('\n');
         out.push('\n');
@@ -159,7 +176,7 @@ mod tests {
         process_documentation(
             "
 See also [`lint.mccabe.max-complexity`] and [`lint.task-tags`].
-Something [`else`][other].
+Something [`else`][other]. Some [link](https://example.com).
 
 ## Options
 
@@ -174,7 +191,7 @@ Something [`else`][other].
             output,
             "
 See also [`lint.mccabe.max-complexity`][lint.mccabe.max-complexity] and [`lint.task-tags`][lint.task-tags].
-Something [`else`][other].
+Something [`else`][other]. Some [link](https://example.com).
 
 ## Options
 

crates/ruff_dev/src/generate_rules_table.rs

@@ -180,8 +180,22 @@ pub(crate) fn generate() -> String {
             .map(|rule| (rule.upstream_category(&linter), rule))
             .into_group_map();
 
+        let mut rules_by_upstream_category: Vec<_> = rules_by_upstream_category.iter().collect();
+
+        // Sort the upstream categories alphabetically by prefix.
+        rules_by_upstream_category.sort_by(|(a, _), (b, _)| {
+            a.as_ref()
+                .map(|category| category.prefix)
+                .unwrap_or_default()
+                .cmp(
+                    b.as_ref()
+                        .map(|category| category.prefix)
+                        .unwrap_or_default(),
+                )
+        });
+
         if rules_by_upstream_category.len() > 1 {
-            for (opt, rules) in &rules_by_upstream_category {
+            for (opt, rules) in rules_by_upstream_category {
                 if opt.is_some() {
                     let UpstreamCategoryAndPrefix { category, prefix } = opt.unwrap();
                     table_out.push_str(&format!("#### {category} ({prefix})"));

crates/ruff_diagnostics/src/violation.rs

@@ -25,11 +25,6 @@ pub trait Violation: Debug + PartialEq + Eq {
     /// The message used to describe the violation.
     fn message(&self) -> String;
 
-    /// The explanation used in documentation and elsewhere.
-    fn explanation() -> Option<&'static str> {
-        None
-    }
-
     // TODO(micha): Move `fix_title` to `Fix`, add new `advice` method that is shown as an advice.
     // Change the `Diagnostic` renderer to show the advice, and render the fix message after the `Suggested fix: <here>`
 
@@ -50,11 +45,6 @@ pub trait AlwaysFixableViolation: Debug + PartialEq + Eq {
     /// The message used to describe the violation.
     fn message(&self) -> String;
 
-    /// The explanation used in documentation and elsewhere.
-    fn explanation() -> Option<&'static str> {
-        None
-    }
-
     /// The title displayed for the available fix.
     fn fix_title(&self) -> String;
 
@@ -71,10 +61,6 @@ impl<V: AlwaysFixableViolation> Violation for V {
         <Self as AlwaysFixableViolation>::message(self)
     }
 
-    fn explanation() -> Option<&'static str> {
-        <Self as AlwaysFixableViolation>::explanation()
-    }
-
     fn fix_title(&self) -> Option<String> {
         Some(<Self as AlwaysFixableViolation>::fix_title(self))
     }

crates/ruff_formatter/Cargo.toml

@@ -24,7 +24,6 @@ tracing = { workspace = true }
 unicode-width = { workspace = true }
 
 [dev-dependencies]
-insta = { workspace = true }
 
 [features]
 serde = ["dep:serde", "ruff_text_size/serde"]

crates/ruff_linter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.3.3"
+version = "0.3.5"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -15,7 +15,6 @@ license = { workspace = true }
 [dependencies]
 ruff_cache = { path = "../ruff_cache" }
 ruff_diagnostics = { path = "../ruff_diagnostics", features = ["serde"] }
-ruff_index = { path = "../ruff_index" }
 ruff_notebook = { path = "../ruff_notebook" }
 ruff_macros = { path = "../ruff_macros" }
 ruff_python_ast = { path = "../ruff_python_ast", features = ["serde"] }
@@ -31,11 +30,11 @@ ruff_text_size = { path = "../ruff_text_size" }
 
 aho-corasick = { workspace = true }
 annotate-snippets = { workspace = true, features = ["color"] }
+anstream = { workspace = true }
 anyhow = { workspace = true }
 bitflags = { workspace = true }
 chrono = { workspace = true }
 clap = { workspace = true, features = ["derive", "string"], optional = true }
-colored = { workspace = true }
 fern = { workspace = true }
 glob = { workspace = true }
 globset = { workspace = true }
@@ -48,6 +47,7 @@ log = { workspace = true }
 memchr = { workspace = true }
 natord = { workspace = true }
 once_cell = { workspace = true }
+owo-colors = { workspace = true }
 path-absolutize = { workspace = true, features = [
   "once_cell_cache",
   "use_unix_paths_on_wasm",
@@ -75,11 +75,7 @@ url = { workspace = true }
 
 [dev-dependencies]
 insta = { workspace = true }
-pretty_assertions = { workspace = true }
 test-case = { workspace = true }
-# Disable colored output in tests
-colored = { workspace = true, features = ["no-color"] }
-tempfile = { workspace = true }
 
 [features]
 default = []

crates/ruff_linter/resources/test/fixtures/eradicate/ERA001.py

@@ -36,3 +36,32 @@ dictionary = {
 # except:
 # except Foo:
 # except Exception as e: print(e)
+
+
+# Script tag without an opening tag (Error)
+
+# requires-python = ">=3.11"
+# dependencies = [
+#   "requests<3",
+#   "rich",
+# ]
+# ///
+
+# Script tag (OK)
+
+# /// script
+# requires-python = ">=3.11"
+# dependencies = [
+#   "requests<3",
+#   "rich",
+# ]
+# ///
+
+# Script tag without a closing tag (OK)
+
+# /// script
+# requires-python = ">=3.11"
+# dependencies = [
+#   "requests<3",
+#   "rich",
+# ]

crates/ruff_linter/resources/test/fixtures/flake8_boolean_trap/FBT.py

@@ -31,8 +31,7 @@ def function(
     kwonly_nonboolvalued_boolhint: bool = 1,
     kwonly_nonboolvalued_boolstrhint: "bool" = 1,
     **kw,
-):
-    ...
+): ...
 
 
 def used(do):
@@ -131,4 +130,27 @@ class Fit:
     def __post_init__(self, force: bool) -> None:
         print(force)
 
+
 Fit(force=True)
+
+
+# https://github.com/astral-sh/ruff/issues/10356
+from django.db.models import Case, Q, Value, When
+
+
+qs.annotate(
+    is_foo_or_bar=Case(
+        When(Q(is_foo=True) | Q(is_bar=True)),
+        then=Value(True),
+    ),
+    default=Value(False),
+)
+
+
+# https://github.com/astral-sh/ruff/issues/10485
+from pydantic import Field
+from pydantic_settings import BaseSettings
+
+
+class Settings(BaseSettings):
+    foo: bool = Field(True, exclude=True)

crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B030.py

@@ -9,62 +9,69 @@ B030:
 
 try:
     pass
-except 1:  # error
+except 1:  # Error
     pass
 
 try:
     pass
-except (1, ValueError):  # error
+except (1, ValueError):  # Error
     pass
 
 try:
     pass
-except (ValueError, (RuntimeError, (KeyError, TypeError))):  # error
+except (ValueError, (RuntimeError, (KeyError, TypeError))):  # Error
     pass
 
 try:
     pass
-except (ValueError, *(RuntimeError, (KeyError, TypeError))):  # error
+except (ValueError, *(RuntimeError, (KeyError, TypeError))):  # Error
     pass
 
 
 try:
     pass
-except (*a, *(RuntimeError, (KeyError, TypeError))):  # error
-    pass
-
-try:
-    pass
-except (ValueError, *(RuntimeError, TypeError)):  # ok
-    pass
-
-try:
-    pass
-except (ValueError, *[RuntimeError, *(TypeError,)]):  # ok
+except (*a, *(RuntimeError, (KeyError, TypeError))):  # Error
     pass
 
 
 try:
     pass
-except (*a, *b):  # ok
+except* a + (RuntimeError, (KeyError, TypeError)):  # Error
     pass
 
 
 try:
     pass
-except (*a, *(RuntimeError, TypeError)):  # ok
+except (ValueError, *(RuntimeError, TypeError)):  # OK
+    pass
+
+try:
+    pass
+except (ValueError, *[RuntimeError, *(TypeError,)]):  # OK
     pass
 
 
 try:
     pass
-except (*a, *(b, c)):  # ok
+except (*a, *b):  # OK
     pass
 
 
 try:
     pass
-except (*a, *(*b, *c)):  # ok
+except (*a, *(RuntimeError, TypeError)):  # OK
+    pass
+
+
+try:
+    pass
+except (*a, *(b, c)):  # OK
+    pass
+
+
+try:
+    pass
+except (*a, *(*b, *c)):  # OK
     pass
 
 
@@ -74,5 +81,52 @@ def what_to_catch():
 
 try:
     pass
-except what_to_catch():  # ok
+except what_to_catch():  # OK
+    pass
+
+
+try:
+    pass
+except (a, b) + (c, d):  # OK
+    pass
+
+
+try:
+    pass
+except* (a, b) + (c, d):  # OK
+    pass
+
+
+try:
+    pass
+except* (a, (b) + (c)):  # OK
+    pass
+
+
+try:
+    pass
+except (a, b) + (c, d) + (e, f):  # OK
+    pass
+
+
+try:
+    pass
+except a + (b, c):  # OK
+    pass
+
+
+try:
+    pass
+except (ValueError, *(RuntimeError, TypeError), *((ArithmeticError,) + (EOFError,))):
+    pass
+
+
+try:
+    pass
+except ((a, b) + (c, d)) + ((e, f) + (g)):  # OK
+    pass
+
+try:
+    pass
+except (a, b) * (c, d):  # B030
     pass

crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B031.py

@@ -174,6 +174,49 @@ for (_key1, _key2), (_value1, _value2) in groupby(
     collect_shop_items("Jane", group[1])
     collect_shop_items("Joe", group[1])
 
+# Shouldn't trigger the warning when there is a continue, break statement.
+for _section, section_items in groupby(items, key=lambda p: p[1]):
+    if _section == "greens":
+        collect_shop_items(shopper, section_items)
+        continue
+    elif _section == "frozen items":
+        collect_shop_items(shopper, section_items)
+        break
+    collect_shop_items(shopper, section_items)
+
+# Shouldn't trigger the warning when there is a return statement.
+for _section, section_items in groupby(items, key=lambda p: p[1]):
+    if _section == "greens":
+        collect_shop_items(shopper, section_items)
+        return
+    elif _section == "frozen items":
+        return section_items
+    collect_shop_items(shopper, section_items)
+
+# Should trigger the warning for duplicate access, even if is a return statement after.
+for _section, section_items in groupby(items, key=lambda p: p[1]):
+    if _section == "greens":
+        collect_shop_items(shopper, section_items)
+        collect_shop_items(shopper, section_items)
+        return
+
+# Should trigger the warning for duplicate access, even if is a return in another branch.
+for _section, section_items in groupby(items, key=lambda p: p[1]):
+    if _section == "greens":
+        collect_shop_items(shopper, section_items)
+        return
+    elif _section == "frozen items":
+        collect_shop_items(shopper, section_items)
+        collect_shop_items(shopper, section_items)
+
+# Should trigger, since only one branch has a return statement.
+for _section, section_items in groupby(items, key=lambda p: p[1]):
+    if _section == "greens":
+        collect_shop_items(shopper, section_items)
+        return
+    elif _section == "frozen items":
+        collect_shop_items(shopper, section_items)
+    collect_shop_items(shopper, section_items)  # B031
 
 # Let's redefine the `groupby` function to make sure we pick up the correct one.
 # NOTE: This should always be at the end of the file.

crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C401.py

@@ -1,20 +1,30 @@
-x = set(x for x in range(3))
-x = set(x for x in range(3))
-y = f"{set(a if a < 6 else 0  for a in range(3))}"
-_ = "{}".format(set(a if a < 6 else 0 for a in range(3)))
-print(f"Hello {set(a for a in range(3))} World")
-
+# Cannot conbime with C416. Should use set comprehension here.
+even_nums = set(2 * x for x in range(3))
+odd_nums = set(
+    2 * x + 1 for x in range(3)
+)
+small_nums = f"{set(a if a < 6 else 0 for a in range(3))}"
 
 def f(x):
     return x
 
-
-print(f'Hello {set(a for a in "abc")} World')
-print(f"Hello {set(a for a in 'abc')} World")
 print(f"Hello {set(f(a) for a in 'abc')} World")
+print(f"Hello { set(f(a) for a in 'abc') } World")
+
+
+# Short-circuit case, combine with C416 and should produce x = set(range(3))
+x = set(x for x in range(3))
+x = set(
+    x for x in range(3)
+)
+print(f"Hello {set(a for a in range(3))} World")
 print(f"{set(a for a in 'abc') - set(a for a in 'ab')}")
 print(f"{ set(a for a in 'abc') - set(a for a in 'ab') }")
 
-# The fix generated for this diagnostic is incorrect, as we add additional space
-# around the set comprehension.
-print(f"{ {set(a for a in 'abc')} }")
+
+# Not built-in set.
+def set(*args, **kwargs):
+    return None
+
+set(2 * x for x in range(3))
+set(x for x in range(3))

crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C409.py

@@ -16,3 +16,11 @@ tuple(  # comment
 tuple([  # comment
     1, 2
 ])
+
+tuple((
+    1,
+))
+
+t6 = tuple([1])
+t7 = tuple((1,))
+t8 = tuple([1,])

crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C419.py

@@ -13,6 +13,10 @@ all(x.id for x in bar)
 all(x.id for x in bar)
 any(x.id for x in bar)
 all((x.id for x in bar))
+# we don't lint on these in stable yet
+sum([x.val for x in bar])
+min([x.val for x in bar])
+max([x.val for x in bar])
 
 
 async def f() -> bool:

crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C419_1.py

@@ -0,0 +1,8 @@
+sum([x.val for x in bar])
+min([x.val for x in bar])
+max([x.val for x in bar])
+
+# Ok
+sum(x.val for x in bar)
+min(x.val for x in bar)
+max(x.val for x in bar)

crates/ruff_linter/resources/test/fixtures/flake8_comprehensions/C419_2.py

@@ -0,0 +1,3 @@
+# no lint if shadowed
+def all(x): pass
+all([x.id for x in bar])

crates/ruff_linter/resources/test/fixtures/flake8_datetimez/DTZ007.py

@@ -33,3 +33,9 @@ from datetime import datetime
 
 # no replace orastimezone unqualified
 datetime.strptime("something", "something")
+
+# F-strings
+datetime.strptime("something", f"%Y-%m-%dT%H:%M:%S{('.%f' if millis else '')}%z")
+datetime.strptime("something", f"%Y-%m-%d %H:%M:%S%z")
+# F-string is implicitly concatenated to another string
+datetime.strptime("something", f"%Y-%m-%dT%H:%M:%S{('.%f' if millis else '')}" "%z")

crates/ruff_linter/resources/test/fixtures/flake8_import_conventions/defaults.py

@@ -21,6 +21,7 @@ def unconventional_aliases():
     import tkinter as tkr
     import networkx as nxy
 
+
 def conventional_aliases():
     import altair as alt
     import matplotlib.pyplot as plt

crates/ruff_linter/resources/test/fixtures/flake8_import_conventions/same_name.py

@@ -0,0 +1,10 @@
+def no_alias():
+    from django.conf import settings
+
+
+def conventional_alias():
+    from django.conf import settings as settings
+
+
+def unconventional_alias():
+    from django.conf import settings as s

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

@@ -1,9 +1,12 @@
-import logging
+def func():
+    import logging
 
-logging.WARN  # LOG009
-logging.WARNING  # OK
+    logging.WARN  # LOG009
+    logging.WARNING  # OK
 
-from logging import WARN, WARNING
 
-WARN  # LOG009
-WARNING  # OK
+def func():
+    from logging import WARN, WARNING
+
+    WARN  # LOG009
+    WARNING  # OK

crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI025_2.py

@@ -0,0 +1,14 @@
+"""Tests to ensure we correctly rename references inside `__all__`"""
+
+from collections.abc import Set
+
+__all__ = ["Set"]
+
+if True:
+    __all__ += [r'''Set''']
+
+if 1:
+    __all__ += ["S" "e" "t"]
+
+if not False:
+    __all__ += ["Se" 't']

crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI025_2.pyi

@@ -0,0 +1,14 @@
+"""Tests to ensure we correctly rename references inside `__all__`"""
+
+from collections.abc import Set
+
+__all__ = ["Set"]
+
+if True:
+    __all__ += [r'''Set''']
+
+if 1:
+    __all__ += ["S" "e" "t"]
+
+if not False:
+    __all__ += ["Se" 't']

crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI025_3.py

@@ -0,0 +1,6 @@
+"""
+Tests for PYI025 where the import is marked as re-exported
+through usage of a "redundant" `import Set as Set` alias
+"""
+
+from collections.abc import Set as Set  # PYI025 triggered but fix is not marked as safe

crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI025_3.pyi

@@ -0,0 +1,6 @@
+"""
+Tests for PYI025 where the import is marked as re-exported
+through usage of a "redundant" `import Set as Set` alias
+"""
+
+from collections.abc import Set as Set  # PYI025 triggered but fix is not marked as safe

crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT007.py

@@ -79,5 +79,6 @@ def test_single_list_of_lists(param):
 
 @pytest.mark.parametrize("a", [1, 2])
 @pytest.mark.parametrize(("b", "c"), ((3, 4), (5, 6)))
+@pytest.mark.parametrize("d", [3,])
 def test_multiple_decorators(a, b, c):
     pass

crates/ruff_linter/resources/test/fixtures/flake8_pytest_style/PT014.py

@@ -51,3 +51,8 @@ def test_error_parentheses_trailing_comma(x):
 @pytest.mark.parametrize("x", [1, 2])
 def test_ok(x):
     ...
+
+
+@pytest.mark.parametrize('data, spec', [(1.0, 1.0), (1.0, 1.0)])
+def test_numbers(data, spec):
+    ...

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_doubles_mixed_quotes_class_var_1.py

@@ -0,0 +1,9 @@
+class SingleLineDocstrings():
+    ""'Start with empty string' ' and lint docstring safely'
+    """ Not a docstring """
+
+    def foo(self, bar="""not a docstring"""):
+        ""'Start with empty string' ' and lint docstring safely'
+        pass
+
+    class Nested(foo()[:]): ""'Start with empty string' ' and lint docstring safely'; pass

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_doubles_mixed_quotes_class_var_2.py

@@ -0,0 +1,9 @@
+class SingleLineDocstrings():
+    "Do not"' start with empty string' ' and lint docstring safely'
+    """ Not a docstring """
+
+    def foo(self, bar="""not a docstring"""):
+        "Do not"' start with empty string' ' and lint docstring safely'
+        pass
+
+    class Nested(foo()[:]): "Do not"' start with empty string' ' and lint docstring safely'; pass

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_doubles_mixed_quotes_module_singleline_var_1.py

@@ -0,0 +1,5 @@
+""'Start with empty string' ' and lint docstring safely'
+
+def foo():
+    pass
+""" this is not a docstring """

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_doubles_mixed_quotes_module_singleline_var_2.py

@@ -0,0 +1,5 @@
+"Do not"' start with empty string' ' and lint docstring safely'
+
+def foo():
+    pass
+""" this is not a docstring """

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_singles_mixed_quotes_class_var_1.py

@@ -0,0 +1,9 @@
+class SingleLineDocstrings():
+    ''"Start with empty string" ' and lint docstring safely'
+    ''' Not a docstring '''
+
+    def foo(self, bar='''not a docstring'''):
+        ''"Start with empty string" ' and lint docstring safely'
+        pass
+
+    class Nested(foo()[:]): ''"Start with empty string" ' and lint docstring safely'; pass

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_singles_mixed_quotes_class_var_2.py

@@ -0,0 +1,9 @@
+class SingleLineDocstrings():
+    'Do not'" start with empty string" ' and lint docstring safely'
+    ''' Not a docstring '''
+
+    def foo(self, bar='''not a docstring'''):
+        'Do not'" start with empty string" ' and lint docstring safely'
+        pass
+
+    class Nested(foo()[:]): 'Do not'" start with empty string" ' and lint docstring safely'; pass

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_singles_mixed_quotes_module_singleline_var_1.py

@@ -0,0 +1,5 @@
+''"Start with empty string" ' and lint docstring safely'
+
+def foo():
+    pass
+""" this is not a docstring """

crates/ruff_linter/resources/test/fixtures/flake8_quotes/docstring_singles_mixed_quotes_module_singleline_var_2.py

@@ -0,0 +1,5 @@
+'Do not'" start with empty string" ' and lint docstring safely'
+
+def foo():
+    pass
+""" this is not a docstring """

crates/ruff_linter/resources/test/fixtures/flake8_quotes/doubles_all.py

@@ -0,0 +1,7 @@
+"""This is a docstring."""
+
+this_is_an_inline_string = "double quote string"
+
+this_is_a_multiline_string = """
+double quote string
+"""

crates/ruff_linter/resources/test/fixtures/flake8_quotes/doubles_would_be_triple_quotes.py

@@ -0,0 +1,2 @@
+s = ""'Start with empty string' ' and lint docstring safely'
+s = "Do not"' start with empty string' ' and lint docstring safely'

crates/ruff_linter/resources/test/fixtures/flake8_quotes/singles.py

@@ -2,3 +2,6 @@ this_should_be_linted = 'single quote string'
 this_should_be_linted = u'double quote string'
 this_should_be_linted = f'double quote string'
 this_should_be_linted = f'double {"quote"} string'
+
+# https://github.com/astral-sh/ruff/issues/10546
+x: "Literal['foo', 'bar']"

crates/ruff_linter/resources/test/fixtures/flake8_quotes/singles_would_be_triple_quotes.py

@@ -0,0 +1,2 @@
+s = ''"Start with empty string" ' and lint docstring safely'
+s = 'Do not'" start with empty string" ' and lint docstring safely'

crates/ruff_linter/resources/test/fixtures/flake8_return/RET504.py

@@ -406,3 +406,18 @@ def foo():
         with contextlib.suppress(Exception):
             y = 2
         return y
+
+
+# See: https://github.com/astral-sh/ruff/issues/10732
+def func(a: dict[str, int]) -> list[dict[str, int]]:
+    services: list[dict[str, int]]
+    if "services" in a:
+        services = a["services"]
+        return services
+
+
+# See: https://github.com/astral-sh/ruff/issues/10732
+def func(a: dict[str, int]) -> list[dict[str, int]]:
+    if "services" in a:
+        services = a["services"]
+        return services

crates/ruff_linter/resources/test/fixtures/flake8_simplify/SIM103.py

@@ -84,3 +84,22 @@ def f():
         return True
     else:
         return False
+
+
+###
+# Positive cases (preview)
+###
+
+
+def f():
+    # SIM103
+    if a:
+        return True
+    return False
+
+
+def f():
+    # SIM103
+    if a:
+        return False
+    return True

crates/ruff_linter/resources/test/fixtures/isort/separate_local_folder_imports.py

@@ -3,3 +3,5 @@ import ruff
 import leading_prefix
 import os
 from . import leading_prefix
+from .. import trailing_prefix
+from ruff import check

crates/ruff_linter/resources/test/fixtures/isort/unicode.py

@@ -0,0 +1,6 @@
+from astropy.constants import hbar as ℏ
+from numpy import pi as π
+import numpy as ℂℇℊℋℌℍℎℐℑℒℓℕℤΩℨKÅℬℭℯℰℱℹℴ
+import numpy as CƐgHHHhIILlNZΩZKÅBCeEFio
+
+h = 2 * π * ℏ

crates/ruff_linter/resources/test/fixtures/numpy/NPY201.py

@@ -104,3 +104,5 @@ def func():
     np.unicode_("asf")
 
     np.who()
+
+    np.row_stack(([1,2], [3,4]))

crates/ruff_linter/resources/test/fixtures/pep8_naming/N815.py

@@ -21,3 +21,10 @@ class D(TypedDict):
     mixedCase: bool
     _mixedCase: list
     mixed_Case: set
+
+class E(D):
+    lower: int
+    CONSTANT: str
+    mixedCase: bool
+    _mixedCase: list
+    mixed_Case: set

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

@@ -47,4 +47,60 @@ snapshot.file_uri[len(f's3://{self.s3_bucket_name}/'):]
 {len(f's3://{self.s3_bucket_name}/'):1}
 
 #: Okay
-a = (1,
+a = (1,)
+
+
+# https://github.com/astral-sh/ruff/issues/10113
+"""Minimal repo."""
+
+def main() -> None:
+    """Primary function."""
+    results = {
+        "k1": [1],
+        "k2":[2],
+    }
+    results_in_tuple = (
+        {
+            "k1": [1],
+            "k2":[2],
+        },
+    )
+    results_in_list = [
+        {
+            "k1": [1],
+            "k2":[2],
+        }
+    ]
+    results_in_list_first = [
+        {
+            "k2":[2],
+        }
+    ]
+
+x = [
+    {
+        "k1":[2], # E231
+        "k2": [2:4],
+        "k3":[2],  # E231
+        "k4": [2],
+        "k5": [2],
+        "k6": [1, 2, 3, 4,5,6,7]  # E231
+    },
+    {
+        "k1": [
+            {
+                "ka":[2,3],  # E231
+            },
+            {
+                "kb": [2,3],  # E231
+            },
+            {
+                "ka":[2, 3],  # E231
+                "kb": [2, 3],  # Ok
+                "kc": [2, 3],  # Ok
+                "kd": [2,3],  # E231
+                "ke":[2,3],  # E231
+            },
+        ]
+    }
+]

crates/ruff_linter/resources/test/fixtures/pycodestyle/E30.ipynb

@@ -0,0 +1,228 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "palRUQyD-U6u"
+   },
+   "outputs": [],
+   "source": [
+    "some_string = \"123123\""
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "UWdDLRyf-Zz0"
+   },
+   "outputs": [],
+   "source": [
+    "some_computation = 1 + 1"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "YreT1sTr-c32"
+   },
+   "outputs": [],
+   "source": [
+    "some_computation"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "V48ppml7-h0f"
+   },
+   "outputs": [],
+   "source": [
+    "def fn():\n",
+    "    print(\"Hey!\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "cscw_8Xv-lYQ"
+   },
+   "outputs": [],
+   "source": [
+    "fn()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# E301\n",
+    "class Class:\n",
+    "    \"\"\"Class for minimal repo.\"\"\"\n",
+    "\n",
+    "    def method(cls) -> None:\n",
+    "        pass\n",
+    "    @classmethod\n",
+    "    def cls_method(cls) -> None:\n",
+    "        pass\n",
+    "# end"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# E302\n",
+    "def a():\n",
+    "    pass\n",
+    "\n",
+    "def b():\n",
+    "    pass\n",
+    "# end"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# E303\n",
+    "def fn():\n",
+    "    _ = None\n",
+    "\n",
+    "\n",
+    "    # arbitrary comment\n",
+    "\n",
+    "    def inner():  # E306 not expected (pycodestyle detects E306)\n",
+    "        pass\n",
+    "# end"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# E303"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "\n",
+    "\n",
+    "\n",
+    "\n",
+    "def fn():\n",
+    "\tpass\n",
+    "# end"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# E304\n",
+    "@decorator\n",
+    "\n",
+    "def function():\n",
+    "    pass\n",
+    "# end"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# E305:7:1\n",
+    "def fn():\n",
+    "    print()\n",
+    "\n",
+    "    # comment\n",
+    "\n",
+    "    # another comment\n",
+    "fn()\n",
+    "# end"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# E306:3:5\n",
+    "def a():\n",
+    "    x = 1\n",
+    "    def b():\n",
+    "        pass\n",
+    "# end"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Ok\n",
+    "def function1():\n",
+    "\tpass\n",
+    "\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "\n",
+    "def function2():\n",
+    "\tpass\n",
+    "# end"
+   ]
+  }
+ ],
+ "metadata": {
+  "colab": {
+   "provenance": []
+  },
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.11.7"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}

crates/ruff_linter/resources/test/fixtures/pycodestyle/E402.ipynb

@@ -87,6 +87,37 @@
    "metadata": {},
    "outputs": [],
    "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "a51463ee-091c-44b4-9069-c03bf7e3bf83",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "%%time\n",
+    "import pathlib"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "0ddc937e-6c19-475f-b108-9405aa1af4f1",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "285041d2-a76c-4ff3-8ff2-0131bbf66016",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "%%time\n",
+    "%%time\n",
+    "import pathlib"
+   ]
   }
  ],
  "metadata": {

crates/ruff_linter/resources/test/fixtures/pycodestyle/E501.py

@@ -82,3 +82,8 @@ class Bar:
     """
     This is a long sentence that ends with a shortened URL and, therefore, could easily be broken across multiple lines ([source](https://ruff.rs))
     """
+
+
+# OK
+# SPDX-FileCopyrightText: Copyright 2012-2015 Charlie Marsh <very-long-email-address@fake.com>
+# SPDX-License-Identifier: a very long license identifier that exceeds the line length limit

crates/ruff_linter/resources/test/fixtures/pycodestyle/E731.py

@@ -60,7 +60,7 @@ class Scope:
 class Scope:
     from typing import Callable
 
-    # E731
+    # OK
     f: Callable[[int], int] = lambda x: 2 * x
 
 
@@ -147,3 +147,12 @@ def scope():
     f = lambda: (
         i := 1,
     )
+
+
+from dataclasses import dataclass
+from typing import Callable
+
+@dataclass
+class FilterDataclass:
+    # OK
+    filter: Callable[[str], bool] = lambda _: True

crates/ruff_linter/resources/test/fixtures/pycodestyle/W605_1.py

@@ -52,3 +52,8 @@ value = rf'\{{1}}'
 value = rf'\{1}'
 value = rf'{1:\}'
 value = f"{rf"\{1}"}"
+
+# Regression tests for https://github.com/astral-sh/ruff/issues/10434
+f"{{}}+-\d"
+f"\n{{}}+-\d+"
+f"\n{{}}<EFBFBD>+-\d+"

crates/ruff_linter/resources/test/fixtures/pyflakes/F811_29.pyi

@@ -0,0 +1,8 @@
+"""Regression test for: https://github.com/astral-sh/ruff/issues/10509"""
+
+from foo import Bar as Bar
+
+class Eggs:
+    Bar: int  # OK
+
+Bar = 1  # F811

crates/ruff_linter/resources/test/fixtures/pyflakes/F821_28.py

@@ -0,0 +1,9 @@
+"""Test that unicode identifiers are NFKC-normalised"""
+
+𝒞 = 500
+print(𝒞)
+print(C + 𝒞)  # 2 references to the same variable due to NFKC normalization
+print(C / 𝒞)
+print(C == 𝑪 == 𝒞 == 𝓒 == 𝕮)
+
+print(𝒟)  # F821

crates/ruff_linter/resources/test/fixtures/pyflakes/F821_29.py

@@ -0,0 +1,23 @@
+"""Regression test for #10451.
+
+Annotations in a class are allowed to be forward references
+if `from __future__ import annotations` is active,
+even if they're in a class included in
+`lint.flake8-type-checking.runtime-evaluated-base-classes`.
+
+They're not allowed to refer to symbols that cannot be *resolved*
+at runtime, however.
+"""
+
+from __future__ import annotations
+
+from sqlalchemy.orm import DeclarativeBase, Mapped
+
+
+class Base(DeclarativeBase):
+    some_mapping: Mapped[list[Bar]] | None = None  # Should not trigger F821 (resolveable forward reference)
+    simplified: list[Bar] | None = None  # Should not trigger F821 (resolveable forward reference)
+
+
+class Bar:
+    pass

crates/ruff_linter/resources/test/fixtures/pylint/eq_without_hash.py

@@ -5,6 +5,7 @@ class Person:  # [eq-without-hash]
     def __eq__(self, other):
         return isinstance(other, Person) and other.name == self.name
 
+
 # OK
 class Language:
     def __init__(self):
@@ -16,8 +17,24 @@ class Language:
     def __hash__(self):
         return hash(self.name)
 
+
 class MyClass:
     def __eq__(self, other):
         return True
 
     __hash__ = None
+
+
+class SingleClass:
+    def __eq__(self, other):
+        return True
+
+    def __hash__(self):
+        return 7
+
+
+class ChildClass(SingleClass):
+    def __eq__(self, other):
+        return True
+
+    __hash__ = SingleClass.__hash__

crates/ruff_linter/resources/test/fixtures/pylint/modified_iterating_set.py

@@ -0,0 +1,60 @@
+# Errors
+
+nums = {1, 2, 3}
+for num in nums:
+    nums.add(num + 1)
+
+animals = {"dog", "cat", "cow"}
+for animal in animals:
+    animals.pop("cow")
+
+fruits = {"apple", "orange", "grape"}
+for fruit in fruits:
+    fruits.clear()
+
+planets = {"mercury", "venus", "earth"}
+for planet in planets:
+    planets.discard("mercury")
+
+colors = {"red", "green", "blue"}
+for color in colors:
+    colors.remove("red")
+
+odds = {1, 3, 5}
+for num in odds:
+    if num > 1:
+        odds.add(num + 1)
+
+# OK
+
+nums = {1, 2, 3}
+for num in nums.copy():
+    nums.add(nums + 3)
+
+animals = {"dog", "cat", "cow"}
+for animal in animals:
+    print(animals - {animal})
+
+fruits = {"apple", "orange", "grape"}
+temp_fruits = set()
+for fruit in fruits:
+    temp_fruits.add(fruit)
+    temp_fruits.remove(fruit)
+    temp_fruits.clear(fruit)
+
+colors = {"red", "green", "blue"}
+
+
+def add_colors():
+    colors = {"cyan", "magenta", "yellow"}
+    for color in colors:
+
+        def add_color():
+            global colors
+            colors.add(color)
+
+        add_color()
+
+
+add_colors()
+print(colors)

crates/ruff_linter/resources/test/fixtures/pylint/nan_comparison.py

@@ -0,0 +1,76 @@
+import math
+from math import nan as bad_val
+import numpy as np
+from numpy import nan as npy_nan
+
+
+x = float("nan")
+y = np.NaN
+
+# PLW0117
+if x == float("nan"):
+    pass
+
+# PLW0117
+if x == float("NaN"):
+    pass
+
+# PLW0117
+if x == float("NAN"):
+    pass
+
+# PLW0117
+if x == float("Nan"):
+    pass
+
+# PLW0117
+if x == math.nan:
+    pass
+
+# PLW0117
+if x == bad_val:
+    pass
+
+# PLW0117
+if y == np.NaN:
+    pass
+
+# PLW0117
+if y == np.NAN:
+    pass
+
+# PLW0117
+if y == np.nan:
+    pass
+
+# PLW0117
+if y == npy_nan:
+    pass
+
+# OK
+if math.isnan(x):
+    pass
+
+# OK
+if np.isnan(y):
+    pass
+
+# OK
+if x == 0:
+    pass
+
+# OK
+if x == float("32"):
+    pass
+
+# OK
+if x == float(42):
+    pass
+
+# OK
+if y == np.inf:
+    pass
+
+# OK
+if x == "nan":
+    pass

crates/ruff_linter/resources/test/fixtures/pylint/nonlocal_and_global.py

@@ -0,0 +1,67 @@
+# Positive cases
+
+counter = 0
+
+
+def count():
+    global counter
+    nonlocal counter
+    counter += 1
+
+
+def count():
+    counter = 0
+
+    def count(counter_type):
+        if counter_type == "nonlocal":
+            nonlocal counter
+            counter += 1
+        else:
+            global counter
+            counter += 1
+
+
+def count():
+    counter = 0
+
+    def count_twice():
+        for i in range(2):
+            nonlocal counter
+            counter += 1
+        global counter
+
+
+def count():
+    nonlocal counter
+    global counter
+    counter += 1
+
+
+# Negative cases
+
+counter = 0
+
+
+def count():
+    global counter
+    counter += 1
+
+
+def count():
+    counter = 0
+
+    def count_local():
+        nonlocal counter
+        counter += 1
+
+
+def count():
+    counter = 0
+
+    def count_local():
+        nonlocal counter
+        counter += 1
+
+    def count_global():
+        global counter
+        counter += 1

crates/ruff_linter/resources/test/fixtures/pylint/singledispatch_method.py

@@ -20,7 +20,7 @@ class Board:
     def place(self, position):
         pass
 
-    @singledispatch
+    @singledispatch  # [singledispatch-method]
     @staticmethod
     def do(position):
         pass

crates/ruff_linter/resources/test/fixtures/pylint/singledispatchmethod_function.py

@@ -0,0 +1,23 @@
+from functools import singledispatchmethod
+
+
+@singledispatchmethod  # [singledispatchmethod-function]
+def convert_position(position):
+    pass
+
+
+class Board:
+
+    @singledispatchmethod  # Ok
+    @classmethod
+    def convert_position(cls, position):
+        pass
+
+    @singledispatchmethod  # Ok
+    def move(self, position):
+        pass
+
+    @singledispatchmethod  # Ok
+    @staticmethod
+    def do(position):
+        pass

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP017.py

@@ -1,11 +1,28 @@
-import datetime
-import datetime as dt
-from datetime import timezone
-from datetime import timezone as tz
+def func():
+    import datetime
 
-print(datetime.timezone(-1))
-print(timezone.utc)
-print(tz.utc)
+    print(datetime.timezone(-1))
 
-print(datetime.timezone.utc)
-print(dt.timezone.utc)
+
+def func():
+    from datetime import timezone
+
+    print(timezone.utc)
+
+
+def func():
+    from datetime import timezone as tz
+
+    print(tz.utc)
+
+
+def func():
+    import datetime
+
+    print(datetime.timezone.utc)
+
+
+def func():
+    import datetime as dt
+
+    print(dt.timezone.utc)

crates/ruff_linter/resources/test/fixtures/refurb/FURB142.py

@@ -0,0 +1,61 @@
+# Errors
+
+s = set()
+
+for x in [1, 2, 3]:
+    s.add(x)
+
+for x in {1, 2, 3}:
+    s.add(x)
+
+for x in (1, 2, 3):
+    s.add(x)
+
+for x in (1, 2, 3):
+    s.discard(x)
+
+for x in (1, 2, 3):
+    s.add(x + 1)
+
+for x, y in ((1, 2), (3, 4)):
+    s.add((x, y))
+
+num = 123
+
+for x in (1, 2, 3):
+    s.add(num)
+
+for x in (1, 2, 3):
+    s.add((num, x))
+
+for x in (1, 2, 3):
+    s.add(x + num)
+
+# False negative
+
+class C:
+    s: set[int]
+
+
+c = C()
+for x in (1, 2, 3):
+    c.s.add(x)
+
+# Ok
+
+s.update(x for x in (1, 2, 3))
+
+for x in (1, 2, 3):
+    s.add(x)
+else:
+    pass
+
+
+async def f(y):
+    async for x in y:
+        s.add(x)
+
+
+def g():
+    for x in (set(),):
+        x.add(x)

crates/ruff_linter/resources/test/fixtures/refurb/FURB157.py

@@ -0,0 +1,17 @@
+import decimal
+from decimal import Decimal
+
+# Errors
+Decimal("0")
+Decimal("-42")
+Decimal(float("Infinity"))
+Decimal(float("-Infinity"))
+Decimal(float("inf"))
+Decimal(float("-inf"))
+Decimal(float("nan"))
+decimal.Decimal("0")
+
+# OK
+Decimal(0)
+Decimal("Infinity")
+decimal.Decimal(0)

crates/ruff_linter/resources/test/fixtures/refurb/FURB163.py

@@ -1,9 +1,6 @@
 import math
 
-from math import e as special_e
-from math import log as special_log
-
-# Errors.
+# Errors
 math.log(1, 2)
 math.log(1, 10)
 math.log(1, math.e)
@@ -11,15 +8,10 @@ foo = ...
 math.log(foo, 2)
 math.log(foo, 10)
 math.log(foo, math.e)
-math.log(1, special_e)
-special_log(1, 2)
-special_log(1, 10)
-special_log(1, math.e)
-special_log(1, special_e)
 math.log(1, 2.0)
 math.log(1, 10.0)
 
-# Ok.
+# OK
 math.log2(1)
 math.log10(1)
 math.log(1)
@@ -40,6 +32,7 @@ math.log10(1, 2)  # math.log10 takes only one argument.
 
 math.log(1, base=2)  # math.log does not accept keyword arguments.
 
+
 def log(*args):
     print(f"Logging: {args}")
 

crates/ruff_linter/resources/test/fixtures/refurb/FURB164.py

@@ -0,0 +1,34 @@
+from decimal import Decimal
+from fractions import Fraction
+import decimal
+import fractions
+
+# Errors
+_ = Fraction.from_float(0.1)
+_ = Fraction.from_float(-0.5)
+_ = Fraction.from_float(5.0)
+_ = fractions.Fraction.from_float(4.2)
+_ = Fraction.from_decimal(Decimal("4.2"))
+_ = Fraction.from_decimal(Decimal("-4.2"))
+_ = Fraction.from_decimal(Decimal.from_float(4.2))
+_ = Decimal.from_float(0.1)
+_ = Decimal.from_float(-0.5)
+_ = Decimal.from_float(5.0)
+_ = decimal.Decimal.from_float(4.2)
+_ = Decimal.from_float(float("inf"))
+_ = Decimal.from_float(float("-inf"))
+_ = Decimal.from_float(float("Infinity"))
+_ = Decimal.from_float(float("-Infinity"))
+_ = Decimal.from_float(float("nan"))
+
+# OK
+_ = Fraction(0.1)
+_ = Fraction(-0.5)
+_ = Fraction(5.0)
+_ = fractions.Fraction(4.2)
+_ = Fraction(Decimal("4.2"))
+_ = Fraction(Decimal("-4.2"))
+_ = Decimal(0.1)
+_ = Decimal(-0.5)
+_ = Decimal(5.0)
+_ = decimal.Decimal(4.2)

crates/ruff_linter/resources/test/fixtures/refurb/FURB166.py

@@ -0,0 +1,29 @@
+# Errors
+
+_ = int("0b1010"[2:], 2)
+_ = int("0o777"[2:], 8)
+_ = int("0xFFFF"[2:], 16)
+
+b = "0b11"
+_ = int(b[2:], 2)
+
+_ = int("0xFFFF"[2:], base=16)
+
+_ = int(b"0xFFFF"[2:], 16)
+
+
+def get_str():
+    return "0xFFF"
+
+
+_ = int(get_str()[2:], 16)
+
+# OK
+
+_ = int("0b1100", 0)
+_ = int("123", 3)
+_ = int("123", 10)
+_ = int("0b1010"[3:], 2)
+_ = int("0b1010"[:2], 2)
+_ = int("12345"[2:])
+_ = int("12345"[2:], xyz=1)  # type: ignore

crates/ruff_linter/resources/test/fixtures/refurb/FURB187.py

@@ -0,0 +1,62 @@
+# Errors
+
+
+def a():
+    l = []
+    l = reversed(l)
+
+
+def b():
+    l = []
+    l = list(reversed(l))
+
+
+def c():
+    l = []
+    l = l[::-1]
+
+
+# False negative
+def c2():
+    class Wrapper:
+        l: list[int]
+
+    w = Wrapper()
+    w.l = list(reversed(w.l))
+    w.l = w.l[::-1]
+    w.l = reversed(w.l)
+
+
+# OK
+
+
+def d():
+    l = []
+    _ = reversed(l)
+
+
+def e():
+    l = []
+    l = l[::-2]
+    l = l[1:]
+    l = l[1::-1]
+    l = l[:1:-1]
+
+
+def f():
+    d = {}
+
+    # Don't warn: `d` is a dictionary, which doesn't have a `reverse` method.
+    d = reversed(d)
+
+
+def g():
+    l = "abc"[::-1]
+
+
+def h():
+    l = reversed([1, 2, 3])
+
+
+def i():
+    l = list(reversed([1, 2, 3]))

crates/ruff_linter/resources/test/fixtures/ruff/RUF013_0.py

@@ -1,4 +1,3 @@
-import typing
 from typing import Annotated, Any, Literal, Optional, Tuple, Union, Hashable
 
 
@@ -26,10 +25,6 @@ def f(arg: str = None):  # RUF013
     pass
 
 
-def f(arg: typing.List[str] = None):  # RUF013
-    pass
-
-
 def f(arg: Tuple[str] = None):  # RUF013
     pass
 
@@ -41,10 +36,6 @@ def f(arg: Optional[int] = None):
     pass
 
 
-def f(arg: typing.Optional[int] = None):
-    pass
-
-
 # Union
 
 
@@ -60,10 +51,6 @@ def f(arg: Union[str, None] = None):
     pass
 
 
-def f(arg: typing.Union[int, str, None] = None):
-    pass
-
-
 def f(arg: Union[int, str, Any] = None):
     pass
 
@@ -80,10 +67,6 @@ def f(arg: Union[int, str] = None):  # RUF013
     pass
 
 
-def f(arg: typing.Union[int, str] = None):  # RUF013
-    pass
-
-
 # PEP 604 Union
 
 
@@ -130,10 +113,6 @@ def f(arg: Literal[1, "foo"] = None):  # RUF013
     pass
 
 
-def f(arg: typing.Literal[1, "foo", True] = None):  # RUF013
-    pass
-
-
 # Annotated
 
 

crates/ruff_linter/resources/test/fixtures/ruff/RUF013_1.py

@@ -1,5 +1,5 @@
 # No `typing.Optional` import
 
 
-def f(arg: int = None):  # RUF011
+def f(arg: int = None):  # RUF013
     pass

crates/ruff_linter/resources/test/fixtures/ruff/RUF013_3.py

@@ -0,0 +1,30 @@
+import typing
+
+
+def f(arg: typing.List[str] = None):  # RUF013
+    pass
+
+
+# Optional
+
+
+def f(arg: typing.Optional[int] = None):
+    pass
+
+
+# Union
+
+
+def f(arg: typing.Union[int, str, None] = None):
+    pass
+
+
+def f(arg: typing.Union[int, str] = None):  # RUF013
+    pass
+
+
+# Literal
+
+
+def f(arg: typing.Literal[1, "foo", True] = None):  # RUF013
+    pass

crates/ruff_linter/resources/test/fixtures/ruff/RUF100_0.py

@@ -100,3 +100,9 @@ def f():
 
     Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
     """  # noqa
+
+
+def f():
+    # Invalid - nonexistant error code with multibyte character
+    d = 1  #…noqa: F841, E50
+    e = 1  #…noqa: E50

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

@@ -3,13 +3,10 @@ Violation:
 Use '.exception' over '.error' inside except blocks
 """
 
-import logging
-import sys
-
-logger = logging.getLogger(__name__)
-
 
 def bad():
+    import logging
+
     try:
         a = 1
     except Exception:
@@ -20,6 +17,10 @@ def bad():
 
 
 def bad():
+    import logging
+
+    logger = logging.getLogger(__name__)
+
     try:
         a = 1
     except Exception:
@@ -50,6 +51,10 @@ def bad():
 
 
 def good():
+    import logging
+
+    logger = logging.getLogger(__name__)
+
     try:
         a = 1
     except Exception:
@@ -64,6 +69,10 @@ def good():
 
 
 def fine():
+    import logging
+
+    logger = logging.getLogger(__name__)
+
     try:
         a = 1
     except Exception:
@@ -71,16 +80,20 @@ def fine():
 
 
 def fine():
+    import logging
+    import sys
+
+    logger = logging.getLogger(__name__)
+
     try:
         a = 1
     except Exception:
         logger.error("Context message here", exc_info=sys.exc_info())
 
 
-from logging import error, exception
-
-
 def bad():
+    from logging import error, exception
+
     try:
         a = 1
     except Exception:
@@ -91,6 +104,8 @@ def bad():
 
 
 def good():
+    from logging import error, exception
+
     try:
         a = 1
     except Exception:
@@ -98,6 +113,8 @@ def good():
 
 
 def fine():
+    from logging import error, exception
+
     try:
         a = 1
     except Exception:
@@ -105,6 +122,9 @@ def fine():
 
 
 def fine():
+    from logging import error, exception
+    import sys
+
     try:
         a = 1
     except Exception:
@@ -112,6 +132,8 @@ def fine():
 
 
 def nested():
+    from logging import error, exception
+
     try:
         a = 1
     except Exception:

crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs

@@ -43,6 +43,7 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
         Rule::UnusedStaticMethodArgument,
         Rule::UnusedVariable,
         Rule::SingledispatchMethod,
+        Rule::SingledispatchmethodFunction,
     ]) {
         return;
     }
@@ -419,6 +420,10 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
                 pylint::rules::singledispatch_method(checker, scope, &mut diagnostics);
             }
 
+            if checker.enabled(Rule::SingledispatchmethodFunction) {
+                pylint::rules::singledispatchmethod_function(checker, scope, &mut diagnostics);
+            }
+
             if checker.any_enabled(&[
                 Rule::InvalidFirstArgumentNameForClassMethod,
                 Rule::InvalidFirstArgumentNameForMethod,

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

@@ -1,4 +1,4 @@
-use ruff_python_ast::str::raw_contents_range;
+use ruff_python_ast::{all::DunderAllName, str::raw_contents_range};
 use ruff_text_size::{Ranged, TextRange};
 
 use ruff_python_semantic::{
@@ -93,7 +93,7 @@ pub(crate) fn definitions(checker: &mut Checker) {
     }
 
     // Compute visibility of all definitions.
-    let exports: Option<Vec<&str>> = {
+    let exports: Option<Vec<DunderAllName>> = {
         checker
             .semantic
             .global_scope()

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

@@ -223,14 +223,10 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                         }
                     }
                     if checker.enabled(Rule::MixedCaseVariableInClassScope) {
-                        if let ScopeKind::Class(ast::StmtClassDef { arguments, .. }) =
-                            &checker.semantic.current_scope().kind
+                        if let ScopeKind::Class(class_def) = &checker.semantic.current_scope().kind
                         {
                             pep8_naming::rules::mixed_case_variable_in_class_scope(
-                                checker,
-                                expr,
-                                id,
-                                arguments.as_deref(),
+                                checker, expr, id, class_def,
                             );
                         }
                     }
@@ -709,8 +705,8 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                     args,
                 );
             }
-            if checker.enabled(Rule::UnnecessaryComprehensionAnyAll) {
-                flake8_comprehensions::rules::unnecessary_comprehension_any_all(
+            if checker.enabled(Rule::UnnecessaryComprehensionInCall) {
+                flake8_comprehensions::rules::unnecessary_comprehension_in_call(
                     checker, expr, func, args, keywords,
                 );
             }
@@ -926,6 +922,12 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::RedundantLogBase) {
                 refurb::rules::redundant_log_base(checker, call);
             }
+            if checker.enabled(Rule::VerboseDecimalConstructor) {
+                refurb::rules::verbose_decimal_constructor(checker, call);
+            }
+            if checker.enabled(Rule::UnnecessaryFromFloat) {
+                refurb::rules::unnecessary_from_float(checker, call);
+            }
             if checker.enabled(Rule::QuadraticListSummation) {
                 ruff::rules::quadratic_list_summation(checker, call);
             }
@@ -971,6 +973,9 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::UnnecessaryIterableAllocationForFirstElement) {
                 ruff::rules::unnecessary_iterable_allocation_for_first_element(checker, expr);
             }
+            if checker.enabled(Rule::IntOnSlicedStr) {
+                refurb::rules::int_on_sliced_str(checker, call);
+            }
         }
         Expr::Dict(dict) => {
             if checker.any_enabled(&[
@@ -1283,6 +1288,9 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::MagicValueComparison) {
                 pylint::rules::magic_value_comparison(checker, left, comparators);
             }
+            if checker.enabled(Rule::NanComparison) {
+                pylint::rules::nan_comparison(checker, left, comparators);
+            }
             if checker.enabled(Rule::InDictKeys) {
                 flake8_simplify::rules::key_in_dict_compare(checker, compare);
             }