WIP: Nightmare scenario warning on redirected deprecated rules

Similar to https://github.com/astral-sh/ruff/pull/9689 — retains removed
rules for better error messages and documentation but removed rules
_cannot_ be used in any context.

Removes PLR1706 as a useful test case and something we want to
accomplish in #9680 anyway. The rule was in preview so we do not need to
deprecate it first.

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

## Test plan

<img width="1110" alt="Rules table"
src="https://github.com/astral-sh/ruff/assets/2586601/ac9fa682-623c-44aa-8e51-d8ab0d308355">

<img width="1110" alt="Rule page"
src="https://github.com/astral-sh/ruff/assets/2586601/05850b2d-7ca5-49bb-8df8-bb931bab25cd">

.github/workflows/ci.yaml

@@ -76,6 +76,7 @@ jobs:
   cargo-fmt:
     name: "cargo fmt"
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - name: "Install Rust toolchain"
@@ -87,6 +88,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
       - name: "Install Rust toolchain"
@@ -100,10 +102,11 @@ jobs:
         run: cargo clippy -p ruff_wasm --target wasm32-unknown-unknown --all-features --locked -- -D warnings
 
   cargo-test-linux:
+    name: "cargo test (linux)"
     runs-on: ubuntu-latest
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    name: "cargo test (linux)"
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
       - name: "Install Rust toolchain"
@@ -126,10 +129,11 @@ jobs:
           path: target/debug/ruff
 
   cargo-test-windows:
+    name: "cargo test (windows)"
     runs-on: windows-latest
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    name: "cargo test (windows)"
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
       - name: "Install Rust toolchain"
@@ -145,10 +149,11 @@ jobs:
         run: cargo insta test --all --all-features
 
   cargo-test-wasm:
+    name: "cargo test (wasm)"
     runs-on: ubuntu-latest
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    name: "cargo test (wasm)"
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - name: "Install Rust toolchain"
@@ -166,10 +171,11 @@ jobs:
           wasm-pack test --node
 
   cargo-fuzz:
+    name: "cargo fuzz"
     runs-on: ubuntu-latest
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
-    name: "cargo fuzz"
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - name: "Install Rust toolchain"
@@ -188,6 +194,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
+    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
       - name: "Install Rust toolchain"
@@ -213,6 +220,7 @@ jobs:
     if: github.event_name == 'pull_request' && ${{
       needs.determine_changes.outputs.code == 'true'
       }}
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -322,6 +330,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
       - name: "Install nightly Rust toolchain"
@@ -336,6 +345,7 @@ jobs:
   python-package:
     name: "python package"
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -360,6 +370,7 @@ jobs:
   pre-commit:
     name: "pre-commit"
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -388,6 +399,7 @@ jobs:
   docs:
     name: "mkdocs"
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     env:
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
@@ -425,6 +437,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: determine_changes
     if: needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main'
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
       - name: "Install Rust toolchain"
@@ -441,6 +454,7 @@ jobs:
   check-ruff-lsp:
     name: "test ruff-lsp"
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     needs:
       - cargo-test-linux
       - determine_changes
@@ -484,6 +498,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: determine_changes
     if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
+    timeout-minutes: 20
     steps:
       - name: "Checkout Branch"
         uses: actions/checkout@v4

CHANGELOG.md

@@ -1,5 +1,50 @@
 # Changelog
 
+## 0.1.15
+
+### Preview features
+
+- Error when `NURSERY` selector is used with `--preview` ([#9682](https://github.com/astral-sh/ruff/pull/9682))
+- Preserve indentation around multiline strings in formatter ([#9637](https://github.com/astral-sh/ruff/pull/9637))
+- \[`flake8-return`\] Add fixes for all rules (`RET505`, `RET506`, `RET507`, `RET508`) ([#9595](https://github.com/astral-sh/ruff/pull/9595))
+- \[`flake8-simplify`\] Add fix for `if-with-same-arms` (`SIM114`) ([#9591](https://github.com/astral-sh/ruff/pull/9591))
+- \[`pycodestyle`\] Add fix for `multiple-imports-on-one-line` (`E401`) ([#9518](https://github.com/astral-sh/ruff/pull/9518))
+- \[`pylint`\] Add fix for `collapsible-else-if` (`PLR5501`) ([#9594](https://github.com/astral-sh/ruff/pull/9594))
+- \[`pylint`\] Add fix for `useless-else-on-loop` (`PLW0120`) ([#9590](https://github.com/astral-sh/ruff/pull/9590))
+- \[`pylint`\] Implement `assigning-non-slot` (`E0237`) ([#9623](https://github.com/astral-sh/ruff/pull/9623))
+- \[`pylint`\] Implement `potential-index-error` (`PLE0643`) ([#9545](https://github.com/astral-sh/ruff/pull/9545))
+- \[`pylint`\] Implement `too-many-nested-blocks` (`PLR1702`) ([#9172](https://github.com/astral-sh/ruff/pull/9172))
+- \[`ruff`\] Add rule to sort `__slots__` and `__match_args__` ([#9564](https://github.com/astral-sh/ruff/pull/9564))
+- \[`ruff`\] Detect unnecessary `dict` comprehensions for iterables (`RUF025`) ([#9613](https://github.com/astral-sh/ruff/pull/9613))
+- \[`ruff`\] Guard against use of `default_factory` as a keyword argument (`RUF026`) ([#9651](https://github.com/astral-sh/ruff/pull/9651))
+- \[`ruff`\] Implement `mutable-fromkeys-value` (`RUF024`) ([#9597](https://github.com/astral-sh/ruff/pull/9597))
+
+### CLI
+
+- Enable auto-wrapping of `--help` output ([#9633](https://github.com/astral-sh/ruff/pull/9633))
+
+### Bug fixes
+
+- Avoid rendering display-only rules as fixable ([#9649](https://github.com/astral-sh/ruff/pull/9649))
+- Detect automagic-like assignments in notebooks ([#9653](https://github.com/astral-sh/ruff/pull/9653))
+- Generate custom JSON schema for dynamic setting ([#9632](https://github.com/astral-sh/ruff/pull/9632))
+- \[`flake8-no-pep420`\] Include global `--config` when determining namespace packages ([#9603](https://github.com/astral-sh/ruff/pull/9603))
+- \[`flake8-pie`\] Omit bound tuples passed to `.startswith` or `.endswith` ([#9661](https://github.com/astral-sh/ruff/pull/9661))
+- \[`flake8-return`\] Avoid panic when fixing inlined else blocks ([#9657](https://github.com/astral-sh/ruff/pull/9657))
+- \[`flake8-return`\] Consider exception suppression in unnecessary assignment ([#9673](https://github.com/astral-sh/ruff/pull/9673))
+- \[`flake8-return`\] Take `NoReturn` annotation into account when analyzing implicit returns ([#9636](https://github.com/astral-sh/ruff/pull/9636))
+- \[`flake8-simplify`\] Support inverted returns in `needless-bool` (`SIM103`) ([#9619](https://github.com/astral-sh/ruff/pull/9619))
+- \[`flake8-type-checking`\] Add Pydantic's `BaseConfig` to default-copy list ([#9650](https://github.com/astral-sh/ruff/pull/9650))
+- \[`flake8-type-checking`\] Avoid marking `InitVar` as a typing-only annotation ([#9688](https://github.com/astral-sh/ruff/pull/9688))
+- \[`pycodestyle`\] Allow `dtype` comparisons in `type-comparison` ([#9676](https://github.com/astral-sh/ruff/pull/9676))
+- \[`pydocstyle`\] Re-implement `last-line-after-section` (`D413`) ([#9654](https://github.com/astral-sh/ruff/pull/9654))
+
+### Documentation
+
+- \[`flake8-pytest-style`\] Add fix safety documentation for `duplicate-parameterize-test-cases` ([#9678](https://github.com/astral-sh/ruff/pull/9678))
+- \[`pylint`\] Document `literal-membership` fix safety conditions ([#9677](https://github.com/astral-sh/ruff/pull/9677))
+- \[`isort`\] Fix reference to `isort` rule code ([#9598](https://github.com/astral-sh/ruff/pull/9598))
+
 ## 0.1.14
 
 ### Preview features

Cargo.lock

@@ -273,14 +273,14 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.31"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "num-traits",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -330,6 +330,7 @@ dependencies = [
  "anstyle",
  "clap_lex",
  "strsim",
+ "terminal_size",
 ]
 
 [[package]]
@@ -956,9 +957,9 @@ dependencies = [
 
 [[package]]
 name = "ignore"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060"
+checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
 dependencies = [
  "crossbeam-deque",
  "globset",
@@ -1855,9 +1856,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
 dependencies = [
  "either",
  "rayon-core",
@@ -1865,9 +1866,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -2004,7 +2005,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.1.14"
+version = "0.1.15"
 dependencies = [
  "anyhow",
  "argfile",
@@ -2164,7 +2165,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.1.14"
+version = "0.1.15"
 dependencies = [
  "aho-corasick",
  "annotate-snippets 0.9.2",
@@ -2416,7 +2417,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_shrinking"
-version = "0.1.14"
+version = "0.1.15"
 dependencies = [
  "anyhow",
  "clap",
@@ -2683,9 +2684,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.109"
+version = "1.0.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9"
+checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
 dependencies = [
  "itoa",
  "ryu",
@@ -2712,9 +2713,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.4.0"
+version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
+checksum = "f5c9fdb6b00a489875b22efd4b78fe2b363b72265cc5f6eb2e2b9ee270e6140c"
 dependencies = [
  "serde",
  "serde_with_macros",
@@ -2722,9 +2723,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.4.0"
+version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
+checksum = "dbff351eb4b33600a2e138dfa0b10b65a238ea8ff8fb2387c422c5022a3e8298"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -2752,9 +2753,9 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "similar"
@@ -2770,9 +2771,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
 [[package]]
 name = "smallvec"
-version = "1.11.2"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 
 [[package]]
 name = "spin"
@@ -2891,6 +2892,16 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "terminal_size"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+dependencies = [
+ "rustix",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "terminfo"
 version = "0.8.0"
@@ -3417,9 +3428,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.39"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
+checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3458,9 +3469,9 @@ checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.39"
+version = "0.3.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cf9242c0d27999b831eae4767b2a146feb0b27d332d553e605864acd2afd403"
+checksum = "139bd73305d50e1c1c4333210c0db43d989395b64a237bd35c10ef3832a7f70c"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
@@ -3472,9 +3483,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.39"
+version = "0.3.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89"
+checksum = "70072aebfe5da66d2716002c729a14e4aec4da0e23cc2ea66323dac541c93928"
 dependencies = [
  "proc-macro2",
  "quote",

Cargo.toml

@@ -20,7 +20,7 @@ assert_cmd = { version = "2.0.13" }
 bincode = { version = "1.3.3" }
 bitflags = { version = "2.4.1" }
 cachedir = { version = "0.3.1" }
-chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
+chrono = { version = "0.4.33", default-features = false, features = ["clock"] }
 clap = { version = "4.4.13", features = ["derive"] }
 clap_complete_command = { version = "0.5.1" }
 clearscreen = { version = "2.0.0" }
@@ -40,7 +40,7 @@ fs-err = { version ="2.11.0"}
 glob = { version = "0.3.1" }
 globset = { version = "0.4.14" }
 hexf-parse = { version ="0.2.1"}
-ignore = { version = "0.4.21" }
+ignore = { version = "0.4.22" }
 imara-diff ={ version = "0.1.5"}
 imperative = { version = "1.0.4" }
 indicatif ={ version = "0.17.7"}
@@ -69,7 +69,7 @@ pyproject-toml = { version = "0.8.1" }
 quick-junit = { version = "0.3.5" }
 quote = { version = "1.0.23" }
 rand = { version = "0.8.5" }
-rayon = { version = "1.8.0" }
+rayon = { version = "1.8.1" }
 regex = { version = "1.10.2" }
 result-like = { version = "0.5.0" }
 rustc-hash = { version = "1.1.0" }
@@ -78,13 +78,13 @@ seahash = { version ="4.1.0"}
 semver = { version = "1.0.21" }
 serde = { version = "1.0.195", features = ["derive"] }
 serde-wasm-bindgen = { version = "0.6.3" }
-serde_json = { version = "1.0.109" }
+serde_json = { version = "1.0.113" }
 serde_test = { version = "1.0.152" }
-serde_with = { version = "3.4.0", default-features = false, features = ["macros"] }
+serde_with = { version = "3.5.1", default-features = false, features = ["macros"] }
 shellexpand = { version = "3.0.0" }
-shlex = { version ="1.2.0"}
+shlex = { version ="1.3.0"}
 similar = { version = "2.4.0", features = ["inline"] }
-smallvec = { version = "1.11.2" }
+smallvec = { version = "1.13.1" }
 static_assertions = "1.1.0"
 strum = { version = "0.25.0", features = ["strum_macros"] }
 strum_macros = { version = "0.25.3" }
@@ -107,7 +107,7 @@ 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.84" }
-wasm-bindgen-test = { version = "0.3.39" }
+wasm-bindgen-test = { version = "0.3.40" }
 wild = { version = "2" }
 
 [workspace.lints.rust]

README.md

@@ -150,7 +150,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.1.14
+  rev: v0.1.15
   hooks:
     # Run the linter.
     - id: ruff

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.1.14"
+version = "0.1.15"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -30,7 +30,7 @@ bincode = { workspace = true }
 bitflags = { workspace = true }
 cachedir = { workspace = true }
 chrono = { workspace = true }
-clap = { workspace = true, features = ["derive", "env"] }
+clap = { workspace = true, features = ["derive", "env", "wrap_help"] }
 clap_complete_command = { workspace = true }
 clearscreen = { workspace = true }
 colored = { workspace = true }

crates/ruff/src/args.rs

@@ -11,7 +11,7 @@ use ruff_linter::settings::types::{
     ExtensionPair, FilePattern, PatternPrefixPair, PerFileIgnore, PreviewMode, PythonVersion,
     SerializationFormat, UnsafeFixes,
 };
-use ruff_linter::{RuleParser, RuleSelector, RuleSelectorParser};
+use ruff_linter::{warn_user, RuleParser, RuleSelector, RuleSelectorParser};
 use ruff_workspace::configuration::{Configuration, RuleSelection};
 use ruff_workspace::options::PycodestyleOptions;
 use ruff_workspace::resolver::ConfigurationTransformer;
@@ -104,6 +104,7 @@ pub struct CheckCommand {
     no_unsafe_fixes: bool,
     /// Show violations with source code.
     /// Use `--no-show-source` to disable.
+    /// (Deprecated: use `--output-format=full` or `--output-format=concise` instead of `--show-source` and `--no-show-source`, respectively)
     #[arg(long, overrides_with("no_show_source"))]
     show_source: bool,
     #[clap(long, overrides_with("show_source"), hide = true)]
@@ -131,6 +132,8 @@ pub struct CheckCommand {
     ignore_noqa: bool,
 
     /// Output serialization format for violations.
+    /// The default serialization format is "concise".
+    /// In preview mode, the default serialization format is "full".
     #[arg(long, value_enum, env = "RUFF_OUTPUT_FORMAT")]
     pub output_format: Option<SerializationFormat>,
 
@@ -533,7 +536,6 @@ impl CheckCommand {
                     self.no_respect_gitignore,
                 ),
                 select: self.select,
-                show_source: resolve_bool_arg(self.show_source, self.no_show_source),
                 target_version: self.target_version,
                 unfixable: self.unfixable,
                 // TODO(charlie): Included in `pyproject.toml`, but not inherited.
@@ -543,7 +545,11 @@ impl CheckCommand {
                 unsafe_fixes: resolve_bool_arg(self.unsafe_fixes, self.no_unsafe_fixes)
                     .map(UnsafeFixes::from),
                 force_exclude: resolve_bool_arg(self.force_exclude, self.no_force_exclude),
-                output_format: self.output_format,
+                output_format: resolve_output_format(
+                    self.output_format,
+                    resolve_bool_arg(self.show_source, self.no_show_source),
+                    resolve_bool_arg(self.preview, self.no_preview).unwrap_or_default(),
+                ),
                 show_fixes: resolve_bool_arg(self.show_fixes, self.no_show_fixes),
                 extension: self.extension,
             },
@@ -594,6 +600,43 @@ fn resolve_bool_arg(yes: bool, no: bool) -> Option<bool> {
     }
 }
 
+fn resolve_output_format(
+    output_format: Option<SerializationFormat>,
+    show_sources: Option<bool>,
+    preview: bool,
+) -> Option<SerializationFormat> {
+    Some(match (output_format, show_sources) {
+        (Some(o), None) => o,
+        (Some(SerializationFormat::Grouped), Some(true)) => {
+            warn_user!("`--show-source` with `--output-format=grouped` is deprecated, and will not show source files. Use `--output-format=full` to show source information.");
+            SerializationFormat::Grouped
+        }
+        (Some(fmt), Some(true)) => {
+            warn_user!("The `--show-source` argument is deprecated and has been ignored in favor of `--output-format={fmt}`.");
+            fmt
+        }
+        (Some(fmt), Some(false)) => {
+            warn_user!("The `--no-show-source` argument is deprecated and has been ignored in favor of `--output-format={fmt}`.");
+            fmt
+        }
+        (None, Some(true)) => {
+            warn_user!("The `--show-source` argument is deprecated. Use `--output-format=full` instead.");
+            SerializationFormat::Full
+        }
+        (None, Some(false)) => {
+            warn_user!("The `--no-show-source` argument is deprecated. Use `--output-format=concise` instead.");
+            SerializationFormat::Concise
+        }
+        (None, None) => return None
+    }).map(|format| match format {
+        SerializationFormat::Text => {
+            warn_user!("`--output-format=text` is deprecated. Use `--output-format=full` or `--output-format=concise` instead. `text` will be treated as `{}`.", SerializationFormat::default(preview));
+            SerializationFormat::default(preview)
+        },
+        other => other
+    })
+}
+
 /// CLI settings that are distinct from configuration (commands, lists of files,
 /// etc.).
 #[allow(clippy::struct_excessive_bools)]
@@ -648,7 +691,6 @@ pub struct CliOverrides {
     pub preview: Option<PreviewMode>,
     pub respect_gitignore: Option<bool>,
     pub select: Option<Vec<RuleSelector>>,
-    pub show_source: Option<bool>,
     pub target_version: Option<PythonVersion>,
     pub unfixable: Option<Vec<RuleSelector>>,
     // TODO(charlie): Captured in pyproject.toml as a default, but not part of `Settings`.
@@ -735,9 +777,6 @@ impl ConfigurationTransformer for CliOverrides {
         if let Some(respect_gitignore) = &self.respect_gitignore {
             config.respect_gitignore = Some(*respect_gitignore);
         }
-        if let Some(show_source) = &self.show_source {
-            config.show_source = Some(*show_source);
-        }
         if let Some(show_fixes) = &self.show_fixes {
             config.show_fixes = Some(*show_fixes);
         }

crates/ruff/src/lib.rs

@@ -255,7 +255,6 @@ pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
         unsafe_fixes,
         output_format,
         show_fixes,
-        show_source,
         ..
     } = pyproject_config.settings;
 
@@ -284,9 +283,6 @@ pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
     if show_fixes {
         printer_flags |= PrinterFlags::SHOW_FIX_SUMMARY;
     }
-    if show_source {
-        printer_flags |= PrinterFlags::SHOW_SOURCE;
-    }
     if cli.ecosystem_ci {
         warn_user!(
             "The formatting of fixes emitted by this option is a work-in-progress, subject to \
@@ -325,9 +321,14 @@ pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
         printer_flags,
     );
 
+    let preview = overrides.preview.unwrap_or_default().is_enabled();
+
     if cli.watch {
-        if output_format != SerializationFormat::Text {
-            warn_user!("`--output-format text` is always used in watch mode.");
+        if output_format != SerializationFormat::default(preview) {
+            warn_user!(
+                "`--output-format {}` is always used in watch mode.",
+                SerializationFormat::default(preview)
+            );
         }
 
         // Configure the file watcher.
@@ -353,7 +354,7 @@ pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
             fix_mode,
             unsafe_fixes,
         )?;
-        printer.write_continuously(&mut writer, &messages)?;
+        printer.write_continuously(&mut writer, &messages, preview)?;
 
         // In watch mode, we may need to re-resolve the configuration.
         // TODO(charlie): Re-compute other derivative values, like the `printer`.
@@ -386,7 +387,7 @@ pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
                         fix_mode,
                         unsafe_fixes,
                     )?;
-                    printer.write_continuously(&mut writer, &messages)?;
+                    printer.write_continuously(&mut writer, &messages, preview)?;
                 }
                 Err(err) => return Err(err.into()),
             }

crates/ruff/src/printer.rs

@@ -27,8 +27,6 @@ bitflags! {
     pub(crate) struct Flags: u8 {
         /// Whether to show violations when emitting diagnostics.
         const SHOW_VIOLATIONS = 0b0000_0001;
-        /// Whether to show the source code when emitting diagnostics.
-        const SHOW_SOURCE = 0b000_0010;
         /// Whether to show a summary of the fixed violations when emitting diagnostics.
         const SHOW_FIX_SUMMARY = 0b0000_0100;
         /// Whether to show a diff of each fixed violation when emitting diagnostics.
@@ -218,7 +216,10 @@ impl Printer {
         if !self.flags.intersects(Flags::SHOW_VIOLATIONS) {
             if matches!(
                 self.format,
-                SerializationFormat::Text | SerializationFormat::Grouped
+                SerializationFormat::Text
+                    | SerializationFormat::Full
+                    | SerializationFormat::Concise
+                    | SerializationFormat::Grouped
             ) {
                 if self.flags.intersects(Flags::SHOW_FIX_SUMMARY) {
                     if !diagnostics.fixed.is_empty() {
@@ -245,11 +246,12 @@ impl Printer {
             SerializationFormat::Junit => {
                 JunitEmitter.emit(writer, &diagnostics.messages, &context)?;
             }
-            SerializationFormat::Text => {
+            SerializationFormat::Concise
+            | SerializationFormat::Full => {
                 TextEmitter::default()
                     .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
                     .with_show_fix_diff(self.flags.intersects(Flags::SHOW_FIX_DIFF))
-                    .with_show_source(self.flags.intersects(Flags::SHOW_SOURCE))
+                    .with_show_source(self.format == SerializationFormat::Full)
                     .with_unsafe_fixes(self.unsafe_fixes)
                     .emit(writer, &diagnostics.messages, &context)?;
 
@@ -265,7 +267,6 @@ impl Printer {
             }
             SerializationFormat::Grouped => {
                 GroupedEmitter::default()
-                    .with_show_source(self.flags.intersects(Flags::SHOW_SOURCE))
                     .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
                     .with_unsafe_fixes(self.unsafe_fixes)
                     .emit(writer, &diagnostics.messages, &context)?;
@@ -294,6 +295,7 @@ impl Printer {
             SerializationFormat::Sarif => {
                 SarifEmitter.emit(writer, &diagnostics.messages, &context)?;
             }
+            SerializationFormat::Text => unreachable!("Text is deprecated and should have been automatically converted to the default serialization format")
         }
 
         writer.flush()?;
@@ -342,7 +344,9 @@ impl Printer {
         }
 
         match self.format {
-            SerializationFormat::Text => {
+            SerializationFormat::Text
+            | SerializationFormat::Full
+            | SerializationFormat::Concise => {
                 // Compute the maximum number of digits in the count and code, for all messages,
                 // to enable pretty-printing.
                 let count_width = num_digits(
@@ -403,6 +407,7 @@ impl Printer {
         &self,
         writer: &mut dyn Write,
         diagnostics: &Diagnostics,
+        preview: bool,
     ) -> Result<()> {
         if matches!(self.log_level, LogLevel::Silent) {
             return Ok(());
@@ -430,7 +435,7 @@ impl Printer {
             let context = EmitterContext::new(&diagnostics.notebook_indexes);
             TextEmitter::default()
                 .with_show_fix_status(show_fix_status(self.fix_mode, fixables.as_ref()))
-                .with_show_source(self.flags.intersects(Flags::SHOW_SOURCE))
+                .with_show_source(preview)
                 .with_unsafe_fixes(self.unsafe_fixes)
                 .emit(writer, &diagnostics.messages, &context)?;
         }

crates/ruff/tests/deprecation.rs

@@ -0,0 +1,149 @@
+//! A test suite that ensures deprecated command line options have appropriate warnings / behaviors
+
+use ruff_linter::settings::types::SerializationFormat;
+use std::process::Command;
+
+use insta_cmd::{assert_cmd_snapshot, get_cargo_bin};
+
+const BIN_NAME: &str = "ruff";
+
+const STDIN: &str = "l = 1";
+
+fn ruff_check(show_source: Option<bool>, output_format: Option<String>) -> Command {
+    let mut cmd = Command::new(get_cargo_bin(BIN_NAME));
+    let output_format = output_format.unwrap_or(format!("{}", SerializationFormat::default(false)));
+    cmd.arg("--output-format");
+    cmd.arg(output_format);
+    cmd.arg("--no-cache");
+    match show_source {
+        Some(true) => {
+            cmd.arg("--show-source");
+        }
+        Some(false) => {
+            cmd.arg("--no-show-source");
+        }
+        None => {}
+    }
+    cmd.arg("-");
+
+    cmd
+}
+
+#[test]
+fn ensure_show_source_is_deprecated() {
+    assert_cmd_snapshot!(ruff_check(Some(true), None).pass_stdin(STDIN), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:1: E741 Ambiguous variable name: `l`
+    Found 1 error.
+
+    ----- stderr -----
+    warning: The `--show-source` argument is deprecated and has been ignored in favor of `--output-format=concise`.
+    "###);
+}
+
+#[test]
+fn ensure_no_show_source_is_deprecated() {
+    assert_cmd_snapshot!(ruff_check(Some(false), None).pass_stdin(STDIN), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:1: E741 Ambiguous variable name: `l`
+    Found 1 error.
+
+    ----- stderr -----
+    warning: The `--no-show-source` argument is deprecated and has been ignored in favor of `--output-format=concise`.
+    "###);
+}
+
+#[test]
+fn ensure_output_format_is_deprecated() {
+    assert_cmd_snapshot!(ruff_check(None, Some("text".into())).pass_stdin(STDIN), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:1: E741 Ambiguous variable name: `l`
+    Found 1 error.
+
+    ----- stderr -----
+    warning: `--output-format=text` is deprecated. Use `--output-format=full` or `--output-format=concise` instead. `text` will be treated as `concise`.
+    "###);
+}
+
+#[test]
+fn ensure_output_format_overrides_show_source() {
+    assert_cmd_snapshot!(ruff_check(Some(true), Some("concise".into())).pass_stdin(STDIN), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:1: E741 Ambiguous variable name: `l`
+    Found 1 error.
+
+    ----- stderr -----
+    warning: The `--show-source` argument is deprecated and has been ignored in favor of `--output-format=concise`.
+    "###);
+}
+
+#[test]
+fn ensure_full_output_format_overrides_no_show_source() {
+    assert_cmd_snapshot!(ruff_check(Some(false), Some("full".into())).pass_stdin(STDIN), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:1: E741 Ambiguous variable name: `l`
+      |
+    1 | l = 1
+      | ^ E741
+      |
+
+    Found 1 error.
+
+    ----- stderr -----
+    warning: The `--no-show-source` argument is deprecated and has been ignored in favor of `--output-format=full`.
+    "###);
+}
+
+#[test]
+fn ensure_output_format_uses_concise_over_no_show_source() {
+    assert_cmd_snapshot!(ruff_check(Some(false), Some("concise".into())).pass_stdin(STDIN), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:1: E741 Ambiguous variable name: `l`
+    Found 1 error.
+
+    ----- stderr -----
+    warning: The `--no-show-source` argument is deprecated and has been ignored in favor of `--output-format=concise`.
+    "###);
+}
+
+#[test]
+fn ensure_deprecated_output_format_overrides_show_source() {
+    assert_cmd_snapshot!(ruff_check(Some(true), Some("text".into())).pass_stdin(STDIN), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:1: E741 Ambiguous variable name: `l`
+    Found 1 error.
+
+    ----- stderr -----
+    warning: The `--show-source` argument is deprecated and has been ignored in favor of `--output-format=text`.
+    warning: `--output-format=text` is deprecated. Use `--output-format=full` or `--output-format=concise` instead. `text` will be treated as `concise`.
+    "###);
+}
+
+#[test]
+fn ensure_deprecated_output_format_overrides_no_show_source() {
+    assert_cmd_snapshot!(ruff_check(Some(false), Some("text".into())).pass_stdin(STDIN), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:1: E741 Ambiguous variable name: `l`
+    Found 1 error.
+
+    ----- stderr -----
+    warning: The `--no-show-source` argument is deprecated and has been ignored in favor of `--output-format=text`.
+    warning: `--output-format=text` is deprecated. Use `--output-format=full` or `--output-format=concise` instead. `text` will be treated as `concise`.
+    "###);
+}

crates/ruff/tests/format.rs

@@ -508,6 +508,11 @@ if __name__ == '__main__':
         say_hy("dear Ruff contributor")
 
     ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
+      - 'extend-select' -> 'lint.extend-select'
+      - 'ignore' -> 'lint.ignore'
+
+
     "###);
     Ok(())
 }
@@ -546,6 +551,11 @@ if __name__ == '__main__':
         say_hy("dear Ruff contributor")
 
     ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
+      - 'extend-select' -> 'lint.extend-select'
+      - 'ignore' -> 'lint.ignore'
+
+
     "###);
     Ok(())
 }

crates/ruff/tests/integration_test.rs

@@ -31,25 +31,14 @@ fn ruff_cmd() -> Command {
 }
 
 /// Builder for `ruff check` commands.
-#[derive(Debug)]
+#[derive(Debug, Default)]
 struct RuffCheck<'a> {
-    output_format: &'a str,
+    output_format: Option<&'a str>,
     config: Option<&'a Path>,
     filename: Option<&'a str>,
     args: Vec<&'a str>,
 }
 
-impl<'a> Default for RuffCheck<'a> {
-    fn default() -> RuffCheck<'a> {
-        RuffCheck {
-            output_format: "text",
-            config: None,
-            filename: None,
-            args: vec![],
-        }
-    }
-}
-
 impl<'a> RuffCheck<'a> {
     /// Set the `--config` option.
     #[must_use]
@@ -61,7 +50,7 @@ impl<'a> RuffCheck<'a> {
     /// Set the `--output-format` option.
     #[must_use]
     fn output_format(mut self, format: &'a str) -> Self {
-        self.output_format = format;
+        self.output_format = Some(format);
         self
     }
 
@@ -82,7 +71,11 @@ impl<'a> RuffCheck<'a> {
     /// Generate a [`Command`] for the `ruff check` command.
     fn build(self) -> Command {
         let mut cmd = ruff_cmd();
-        cmd.args(["--output-format", self.output_format, "--no-cache"]);
+        if let Some(output_format) = self.output_format {
+            cmd.args(["--output-format", output_format]);
+        }
+        cmd.arg("--no-cache");
+
         if let Some(path) = self.config {
             cmd.arg("--config");
             cmd.arg(path);
@@ -743,8 +736,28 @@ fn stdin_parse_error() {
 }
 
 #[test]
-fn show_source() {
-    let mut cmd = RuffCheck::default().args(["--show-source"]).build();
+fn full_output_preview() {
+    let mut cmd = RuffCheck::default().args(["--preview"]).build();
+    assert_cmd_snapshot!(cmd
+        .pass_stdin("l = 1"), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:1:1: E741 Ambiguous variable name: `l`
+      |
+    1 | l = 1
+      | ^ E741
+      |
+
+    Found 1 error.
+
+    ----- stderr -----
+    "###);
+}
+
+#[test]
+fn full_output_format() {
+    let mut cmd = RuffCheck::default().output_format("full").build();
     assert_cmd_snapshot!(cmd
         .pass_stdin("l = 1"), @r###"
     success: false
@@ -839,14 +852,12 @@ fn nursery_direct() {
     assert_cmd_snapshot!(cmd
         .pass_stdin("I=42\n"), @r###"
     success: false
-    exit_code: 1
+    exit_code: 2
     ----- stdout -----
-    -:1:2: E225 [*] Missing whitespace around operator
-    Found 1 error.
-    [*] 1 fixable with the `--fix` option.
 
     ----- stderr -----
-    warning: Selection of nursery rule `E225` without the `--preview` flag is deprecated.
+    ruff failed
+      Cause: Selection of unstable rule `E225` without the `--preview` flag is not allowed.
     "###);
 }
 
@@ -857,15 +868,12 @@ fn nursery_group_selector() {
     assert_cmd_snapshot!(cmd
         .pass_stdin("I=42\n"), @r###"
     success: false
-    exit_code: 1
+    exit_code: 2
     ----- stdout -----
-    -:1:1: CPY001 Missing copyright notice at top of file
-    -:1:2: E225 [*] Missing whitespace around operator
-    Found 2 errors.
-    [*] 1 fixable with the `--fix` option.
 
     ----- stderr -----
-    warning: The `NURSERY` selector has been deprecated. Use the `--preview` flag instead.
+    ruff failed
+      Cause: The `NURSERY` selector was removed. Use the `--preview` flag instead.
     "###);
 }
 
@@ -878,15 +886,12 @@ fn nursery_group_selector_preview_enabled() {
     assert_cmd_snapshot!(cmd
         .pass_stdin("I=42\n"), @r###"
     success: false
-    exit_code: 1
+    exit_code: 2
     ----- stdout -----
-    -:1:1: CPY001 Missing copyright notice at top of file
-    -:1:2: E225 [*] Missing whitespace around operator
-    Found 2 errors.
-    [*] 1 fixable with the `--fix` option.
 
     ----- stderr -----
-    warning: The `NURSERY` selector has been deprecated.
+    ruff failed
+      Cause: The `NURSERY` selector was removed. Unstable rules should be selected individually or by their respective groups.
     "###);
 }
 
@@ -902,7 +907,18 @@ fn preview_enabled_prefix() {
     exit_code: 1
     ----- stdout -----
     -:1:1: E741 Ambiguous variable name: `I`
+      |
+    1 | I=42
+      | ^ E741
+      |
+
     -:1:2: E225 [*] Missing whitespace around operator
+      |
+    1 | I=42
+      |  ^ E225
+      |
+      = help: Add missing whitespace
+
     Found 2 errors.
     [*] 1 fixable with the `--fix` option.
 
@@ -921,9 +937,30 @@ fn preview_enabled_all() {
     exit_code: 1
     ----- stdout -----
     -:1:1: E741 Ambiguous variable name: `I`
+      |
+    1 | I=42
+      | ^ E741
+      |
+
     -:1:1: D100 Missing docstring in public module
+      |
+    1 | I=42
+      |  D100
+      |
+
     -:1:1: CPY001 Missing copyright notice at top of file
+      |
+    1 | I=42
+      |  CPY001
+      |
+
     -:1:2: E225 [*] Missing whitespace around operator
+      |
+    1 | I=42
+      |  ^ E225
+      |
+      = help: Add missing whitespace
+
     Found 4 errors.
     [*] 1 fixable with the `--fix` option.
 
@@ -945,6 +982,12 @@ fn preview_enabled_direct() {
     exit_code: 1
     ----- stdout -----
     -:1:2: E225 [*] Missing whitespace around operator
+      |
+    1 | I=42
+      |  ^ E225
+      |
+      = help: Add missing whitespace
+
     Found 1 error.
     [*] 1 fixable with the `--fix` option.
 
@@ -963,7 +1006,7 @@ fn preview_disabled_direct() {
     ----- stdout -----
 
     ----- stderr -----
-    warning: Selection `FURB145` has no effect because the `--preview` flag was not included.
+    warning: Selection `FURB145` has no effect because preview is not enabled.
     "###);
 }
 
@@ -978,7 +1021,7 @@ fn preview_disabled_prefix_empty() {
     ----- stdout -----
 
     ----- stderr -----
-    warning: Selection `CPY` has no effect because the `--preview` flag was not included.
+    warning: Selection `CPY` has no effect because preview is not enabled.
     "###);
 }
 
@@ -1052,6 +1095,369 @@ fn preview_enabled_group_ignore() {
     "###);
 }
 
+#[test]
+fn removed_direct() {
+    // Selection of a removed rule should fail
+    let mut cmd = RuffCheck::default().args(["--select", "PLR1706"]).build();
+    assert_cmd_snapshot!(cmd, @r###"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Rule `PLR1706` was removed and cannot be selected.
+    "###);
+}
+
+#[test]
+fn removed_indirect() {
+    // Selection _including_ a removed rule without matching should not fail
+    // nor should the rule be used
+    let mut cmd = RuffCheck::default().args(["--select", "PLR"]).build();
+    assert_cmd_snapshot!(cmd.pass_stdin(r###"
+# This would have been a PLR1706 violation
+x, y = 1, 2
+maximum = x >= y and x or y
+"""###), @r###"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    ----- stderr -----
+    "###);
+}
+
+#[test]
+fn deprecated_direct() {
+    // Selection of a deprecated rule without preview enabled should still work
+    // but a warning should be displayed
+    let mut cmd = RuffCheck::default().args(["--select", "TRY200"]).build();
+    assert_cmd_snapshot!(cmd
+        .pass_stdin(r###"
+def reciprocal(n):
+    try:
+        return 1 / n
+    except ZeroDivisionError:
+        raise ValueError
+"###), @r###"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    ----- stderr -----
+    warning: Rule `TRY200` is deprecated and will be removed in a future release.
+    "###);
+}
+
+#[test]
+fn deprecated_multiple_direct() {
+    let mut cmd = RuffCheck::default()
+        .args(["--select", "ANN101", "--select", "ANN102"])
+        .build();
+    assert_cmd_snapshot!(cmd
+        .pass_stdin(r###"
+class Foo:
+    def a(self):
+        pass
+    
+    @classmethod
+    def b(cls):
+        pass
+"###), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:3:11: ANN101 Missing type annotation for `self` in method
+    -:7:11: ANN102 Missing type annotation for `cls` in classmethod
+    Found 2 errors.
+
+    ----- stderr -----
+    warning: Rule `ANN102` is deprecated and will be removed in a future release.
+    warning: Rule `ANN101` is deprecated and will be removed in a future release.
+    "###);
+}
+
+#[test]
+fn deprecated_indirect() {
+    // `ANN` includes deprecated rules `ANN101` and `ANN102` but should not warn
+    // since it is not a "direct" selection
+    let mut cmd = RuffCheck::default().args(["--select", "ANN1"]).build();
+    assert_cmd_snapshot!(cmd
+        .pass_stdin(r###"
+class Foo:
+    def a(self):
+        pass
+    
+    @classmethod
+    def b(cls):
+        pass
+"###), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:3:11: ANN101 Missing type annotation for `self` in method
+    -:7:11: ANN102 Missing type annotation for `cls` in classmethod
+    Found 2 errors.
+
+    ----- stderr -----
+    "###);
+}
+
+#[test]
+fn deprecated_redirected() {
+    // Selection of a redirected deprecated rule without preview enabled should still work
+    // but a warning should be displayed
+    let mut cmd = RuffCheck::default().args(["--select", "PGH001"]).build();
+    assert_cmd_snapshot!(cmd
+        .pass_stdin(r###"
+x = eval(input("Enter a number: "))
+"###), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:2:5: S307 Use of possibly insecure function; consider using `ast.literal_eval`
+    Found 1 error.
+
+    ----- stderr -----
+    warning: Rule `PGH001` is deprecated and will be removed in a future release. Use `S307` instead.
+    "###);
+}
+
+#[test]
+fn deprecated_indirect_redirect() {
+    // e.g. `PGH001` is deprecated and redirected, we see a violation in stable
+    // without any warnings
+    let mut cmd = RuffCheck::default().args(["--select", "PGH"]).build();
+    assert_cmd_snapshot!(cmd
+        .pass_stdin(r###"
+x = eval(input("Enter a number: "))
+"###), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:2:5: S307 Use of possibly insecure function; consider using `ast.literal_eval`
+    Found 1 error.
+
+    ----- stderr -----
+    warning: Selection `PGH` includes deprecated rule `PGH001` and will be removed in a future release; use `S307` instead.
+    warning: Selection `PGH` includes deprecated rule `PGH002` and will be removed in a future release; use `G010` instead.
+    "###);
+}
+
+#[test]
+fn deprecated_indirect_redirect_select_new_code() {
+    // e.g. `PGH001` is deprecated and redirected
+    //      but the user has moved to the new code so we should not see a warning
+    let mut cmd = RuffCheck::default()
+        .args(["--select", "PGH", "--select", "S307"])
+        .build();
+    assert_cmd_snapshot!(cmd
+        .pass_stdin(r###"
+x = eval(input("Enter a number: "))
+"###), @r###"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    -:2:5: S307 Use of possibly insecure function; consider using `ast.literal_eval`
+    Found 1 error.
+
+    ----- stderr -----
+    warning: Selection `PGH` includes deprecated rule `PGH001` and will be removed in a future release; use `S307` instead.
+    warning: Selection `PGH` includes deprecated rule `PGH002` and will be removed in a future release; use `G010` instead.
+    "###);
+}
+
+#[test]
+fn deprecated_indirect_redirect_ignore_new_code() {
+    let mut cmd = RuffCheck::default()
+        .args(["--select", "PGH", "--ignore", "S307"])
+        .build();
+    assert_cmd_snapshot!(cmd
+        .pass_stdin(r###"
+x = eval(input("Enter a number: "))
+"###), @r###"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    ----- stderr -----
+    warning: Selection `PGH` includes deprecated rule `PGH001` and will be removed in a future release; use `S307` instead.
+    warning: Selection `PGH` includes deprecated rule `PGH002` and will be removed in a future release; use `G010` instead.
+    "###);
+}
+
+#[test]
+fn deprecated_indirect_redirect_ignore_old_code() {
+    let mut cmd = RuffCheck::default()
+        .args(["--select", "PGH", "--ignore", "PGH001"])
+        .build();
+    assert_cmd_snapshot!(cmd
+        .pass_stdin(r###"
+x = eval(input("Enter a number: "))
+"###), @r###"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    ----- stderr -----
+    warning: Selection `PGH` includes deprecated rule `PGH001` and will be removed in a future release; use `S307` instead.
+    warning: Selection `PGH` includes deprecated rule `PGH002` and will be removed in a future release; use `G010` instead.
+    "###);
+}
+
+#[test]
+fn deprecated_direct_preview_enabled() {
+    // Direct selection of a deprecated rule in preview should fail
+    let mut cmd = RuffCheck::default()
+        .args(["--select", "TRY200", "--preview"])
+        .build();
+    assert_cmd_snapshot!(cmd
+        .pass_stdin(r###"
+def reciprocal(n):
+    try:
+        return 1 / n
+    except ZeroDivisionError:
+        raise ValueError
+"###), @r###"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Selection of deprecated rule `TRY200` is not allowed when preview is enabled.
+    "###);
+}
+
+#[test]
+fn deprecated_redirect_preview_enabled() {
+    // Direct selection of a deprecated rule in preview should fail
+    let mut cmd = RuffCheck::default()
+        .args(["--select", "PGH001", "--preview"])
+        .build();
+    assert_cmd_snapshot!(cmd
+        .pass_stdin(r###"
+x = eval(input("Enter a number: "))
+"###), @r###"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Selection of deprecated rule `PGH001` is not allowed when preview is enabled. Use `S307` instead.
+    "###);
+}
+
+#[test]
+fn deprecated_indirect_preview_enabled() {
+    // `TRY200` is deprecated and should be off by default in preview.
+    let mut cmd = RuffCheck::default()
+        .args(["--select", "TRY", "--preview"])
+        .build();
+    assert_cmd_snapshot!(cmd
+        .pass_stdin(r###"
+def reciprocal(n):
+    try:
+        return 1 / n
+    except ZeroDivisionError:
+        raise ValueError
+"###), @r###"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    ----- stderr -----
+    "###);
+}
+
+#[test]
+fn deprecated_indirect_redirect_preview_enabled() {
+    // e.g. `PGH001` is deprecated and redirected and should be off by default in preview.
+    let mut cmd = RuffCheck::default()
+        .args(["--select", "PGH", "--preview"])
+        .build();
+    assert_cmd_snapshot!(cmd
+        .pass_stdin(r###"
+x = eval(input("Enter a number: "))
+"###), @r###"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+
+    ----- stderr -----
+    "###);
+}
+
+#[test]
+fn deprecated_multiple_direct_preview_enabled() {
+    // Direct selection of the deprecated rules in preview should fail with
+    // a message listing all of the rule codes
+    let mut cmd = RuffCheck::default()
+        .args(["--select", "ANN101", "--select", "ANN102", "--preview"])
+        .build();
+    assert_cmd_snapshot!(cmd
+        .pass_stdin(r###"
+def reciprocal(n):
+    try:
+        return 1 / n
+    except ZeroDivisionError:
+        raise ValueError
+"###), @r###"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Selection of deprecated rules is not allowed when preview is enabled. Remove selection of:
+    	- ANN102
+    	- ANN101
+
+    "###);
+}
+
+#[test]
+fn deprecated_multiple_direct_and_redirected_preview_enabled() {
+    // Direct selection of the deprecated rules in preview should fail with
+    // a message listing all of the rule codes
+    // The redirected rules should include an alternative
+    let mut cmd = RuffCheck::default()
+        .args([
+            "--select",
+            "ANN101",
+            "--select",
+            "ANN102",
+            "--select",
+            "PGH001",
+            "--preview",
+        ])
+        .build();
+    assert_cmd_snapshot!(cmd
+        .pass_stdin(r###"
+x = eval(input("Enter a number: "))
+
+def reciprocal(n):
+    try:
+        return 1 / n
+    except ZeroDivisionError:
+        raise ValueError
+"###), @r###"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    ruff failed
+      Cause: Selection of deprecated rules is not allowed when preview is enabled. Remove selection of:
+    	- ANN102
+    	- ANN101
+    	- PGH001 (use `S307` instead)
+
+    "###);
+}
+
 /// An unreadable pyproject.toml in non-isolated mode causes ruff to hard-error trying to build up
 /// configuration globs
 #[cfg(unix)]

crates/ruff/tests/lint.rs

@@ -11,7 +11,7 @@ use insta_cmd::{assert_cmd_snapshot, get_cargo_bin};
 use tempfile::TempDir;
 
 const BIN_NAME: &str = "ruff";
-const STDIN_BASE_OPTIONS: &[&str] = &["--no-cache", "--output-format", "text"];
+const STDIN_BASE_OPTIONS: &[&str] = &["--no-cache", "--output-format", "concise"];
 
 #[test]
 fn top_level_options() -> Result<()> {
@@ -44,6 +44,11 @@ inline-quotes = "single"
     [*] 2 fixable with the `--fix` option.
 
     ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
+      - 'extend-select' -> 'lint.extend-select'
+      - 'flake8-quotes' -> 'lint.flake8-quotes'
+
+
     "###);
     Ok(())
 }
@@ -114,6 +119,10 @@ inline-quotes = "single"
     [*] 2 fixable with the `--fix` option.
 
     ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
+      - 'extend-select' -> 'lint.extend-select'
+
+
     "###);
     Ok(())
 }
@@ -153,6 +162,10 @@ inline-quotes = "single"
     [*] 2 fixable with the `--fix` option.
 
     ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
+      - 'flake8-quotes' -> 'lint.flake8-quotes'
+
+
     "###);
     Ok(())
 }
@@ -228,6 +241,10 @@ OTHER = "OTHER"
     [*] 3 fixable with the `--fix` option.
 
     ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
+      - 'extend-select' -> 'lint.extend-select'
+
+
     "###);
     Ok(())
 }
@@ -271,6 +288,10 @@ if __name__ == "__main__":
     [*] 2 fixable with the `--fix` option.
 
     ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
+      - 'extend-select' -> 'lint.extend-select'
+
+
     "###);
     Ok(())
 }
@@ -309,6 +330,11 @@ _ = "---------------------------------------------------------------------------
     Found 1 error.
 
     ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
+      - 'select' -> 'lint.select'
+      - 'pycodestyle' -> 'lint.pycodestyle'
+
+
     "###);
     Ok(())
 }
@@ -351,6 +377,10 @@ if __name__ == "__main__":
     [*] 1 fixable with the `--fix` option.
 
     ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
+      - 'extend-select' -> 'lint.extend-select'
+
+
     "###);
     Ok(())
 }
@@ -393,6 +423,10 @@ if __name__ == "__main__":
     [*] 1 fixable with the `--fix` option.
 
     ----- stderr -----
+    warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
+      - 'extend-select' -> 'lint.extend-select'
+
+
     "###);
     Ok(())
 }

crates/ruff/tests/resolve_files.rs

@@ -39,6 +39,10 @@ fn check_project_include_defaults() {
         [BASEPATH]/include-test/subdirectory/c.py
 
         ----- stderr -----
+        warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in your configuration:
+          - 'select' -> 'lint.select'
+
+
         "###);
     });
 }

crates/ruff/tests/snapshots/integration_test__explain_status_codes_f401.snap

@@ -51,7 +51,7 @@ else:
 ```
 
 ## Options
-- `pyflakes.extend-generics`
+- `lint.pyflakes.extend-generics`
 
 ## References
 - [Python documentation: `import`](https://docs.python.org/3/reference/simple_stmts.html#the-import-statement)

crates/ruff/tests/snapshots/show_settings__display_default_settings.snap

@@ -17,9 +17,8 @@ Settings path: "[BASEPATH]/pyproject.toml"
 cache_dir = "[BASEPATH]/.ruff_cache"
 fix = false
 fix_only = false
-output_format = text
+output_format = concise
 show_fixes = false
-show_source = false
 unsafe_fixes = hint
 
 # File Resolver Settings

crates/ruff_dev/Cargo.toml

@@ -25,7 +25,7 @@ ruff_python_trivia = { path = "../ruff_python_trivia" }
 ruff_workspace = { path = "../ruff_workspace", features = ["schemars"]}
 
 anyhow = { workspace = true }
-clap = { workspace = true }
+clap = { workspace = true, features = ["wrap_help"] }
 ignore = { workspace = true }
 imara-diff = { workspace = true }
 indicatif = { workspace = true }

crates/ruff_dev/src/generate_cli_help.rs

@@ -114,12 +114,15 @@ pub(super) fn main(args: &Args) -> Result<()> {
 
 /// Returns the output of `ruff help`.
 fn help_text() -> String {
-    args::Args::command().render_help().to_string()
+    args::Args::command()
+        .term_width(79)
+        .render_help()
+        .to_string()
 }
 
 /// Returns the output of a given subcommand (e.g., `ruff help check`).
 fn subcommand_help_text(subcommand: &str) -> Result<String> {
-    let mut cmd = args::Args::command();
+    let mut cmd = args::Args::command().term_width(79);
 
     // The build call is necessary for the help output to contain `Usage: ruff
     // check` instead of `Usage: check` see https://github.com/clap-rs/clap/issues/4685

crates/ruff_dev/src/generate_docs.rs

@@ -26,9 +26,9 @@ pub(crate) fn main(args: &Args) -> Result<()> {
     for rule in Rule::iter() {
         if let Some(explanation) = rule.explanation() {
             let mut output = String::new();
+
             output.push_str(&format!("# {} ({})", rule.as_ref(), rule.noqa_code()));
             output.push('\n');
-            output.push('\n');
 
             let (linter, _) = Linter::parse_code(&rule.noqa_code().to_string()).unwrap();
             if linter.url().is_some() {
@@ -37,6 +37,22 @@ pub(crate) fn main(args: &Args) -> Result<()> {
                 output.push('\n');
             }
 
+            if rule.is_deprecated() {
+                output.push_str(
+                    r"**Warning: This rule is deprecated and will be removed in a future release.**",
+                );
+                output.push('\n');
+                output.push('\n');
+            }
+
+            if rule.is_removed() {
+                output.push_str(
+                    r"**Warning: This rule has been removed and its documentation is only available for historical reasons.**",
+                );
+                output.push('\n');
+                output.push('\n');
+            }
+
             let fix_availability = rule.fixable();
             if matches!(
                 fix_availability,
@@ -116,7 +132,7 @@ fn process_documentation(documentation: &str, out: &mut String, rule_name: &str)
                     }
                 }
 
-                let anchor = option.replace('.', "-");
+                let anchor = option.replace('.', "_");
                 out.push_str(&format!("- [`{option}`][{option}]\n"));
                 after.push_str(&format!("[{option}]: ../settings.md#{anchor}\n"));
 
@@ -142,13 +158,13 @@ mod tests {
         let mut output = String::new();
         process_documentation(
             "
-See also [`mccabe.max-complexity`] and [`task-tags`].
+See also [`lint.mccabe.max-complexity`] and [`lint.task-tags`].
 Something [`else`][other].
 
 ## Options
 
-- `task-tags`
-- `mccabe.max-complexity`
+- `lint.task-tags`
+- `lint.mccabe.max-complexity`
 
 [other]: http://example.com.",
             &mut output,
@@ -157,18 +173,18 @@ Something [`else`][other].
         assert_eq!(
             output,
             "
-See also [`mccabe.max-complexity`][mccabe.max-complexity] and [`task-tags`][task-tags].
+See also [`lint.mccabe.max-complexity`][lint.mccabe.max-complexity] and [`lint.task-tags`][lint.task-tags].
 Something [`else`][other].
 
 ## Options
 
-- [`task-tags`][task-tags]
-- [`mccabe.max-complexity`][mccabe.max-complexity]
+- [`lint.task-tags`][lint.task-tags]
+- [`lint.mccabe.max-complexity`][lint.mccabe.max-complexity]
 
 [other]: http://example.com.
 
-[task-tags]: ../settings.md#task-tags
-[mccabe.max-complexity]: ../settings.md#mccabe-max-complexity
+[lint.task-tags]: ../settings.md#lint_task-tags
+[lint.mccabe.max-complexity]: ../settings.md#lint_mccabe_max-complexity
 "
         );
     }

crates/ruff_dev/src/generate_options.rs

@@ -1,6 +1,7 @@
 //! Generate a Markdown-compatible listing of configuration options for `pyproject.toml`.
 //!
 //! Used for <https://docs.astral.sh/ruff/settings/>.
+use itertools::Itertools;
 use std::fmt::Write;
 
 use ruff_python_trivia::textwrap;
@@ -9,16 +10,29 @@ use ruff_workspace::options_base::{OptionField, OptionSet, OptionsMetadata, Visi
 
 pub(crate) fn generate() -> String {
     let mut output = String::new();
-    generate_set(&mut output, &Set::Toplevel(Options::metadata()));
+
+    generate_set(
+        &mut output,
+        Set::Toplevel(Options::metadata()),
+        &mut Vec::new(),
+    );
 
     output
 }
 
-fn generate_set(output: &mut String, set: &Set) {
-    if set.level() < 2 {
-        writeln!(output, "### {title}\n", title = set.title()).unwrap();
-    } else {
-        writeln!(output, "#### {title}\n", title = set.title()).unwrap();
+fn generate_set(output: &mut String, set: Set, parents: &mut Vec<Set>) {
+    match &set {
+        Set::Toplevel(_) => {
+            output.push_str("### Top-level\n");
+        }
+        Set::Named { name, .. } => {
+            let title = parents
+                .iter()
+                .filter_map(|set| set.name())
+                .chain(std::iter::once(name.as_str()))
+                .join(".");
+            writeln!(output, "#### `{title}`\n",).unwrap();
+        }
     }
 
     if let Some(documentation) = set.metadata().documentation() {
@@ -35,72 +49,68 @@ fn generate_set(output: &mut String, set: &Set) {
     fields.sort_unstable_by(|(name, _), (name2, _)| name.cmp(name2));
     sets.sort_unstable_by(|(name, _), (name2, _)| name.cmp(name2));
 
+    parents.push(set);
+
     // Generate the fields.
     for (name, field) in &fields {
-        emit_field(output, name, field, set);
+        emit_field(output, name, field, parents.as_slice());
         output.push_str("---\n\n");
     }
 
     // Generate all the sub-sets.
     for (set_name, sub_set) in &sets {
-        generate_set(output, &Set::Named(set_name, *sub_set, set.level() + 1));
+        generate_set(
+            output,
+            Set::Named {
+                name: set_name.to_string(),
+                set: *sub_set,
+            },
+            parents,
+        );
     }
+
+    parents.pop();
 }
 
-enum Set<'a> {
+enum Set {
     Toplevel(OptionSet),
-    Named(&'a str, OptionSet, u32),
+    Named { name: String, set: OptionSet },
 }
 
-impl<'a> Set<'a> {
-    fn name(&self) -> Option<&'a str> {
+impl Set {
+    fn name(&self) -> Option<&str> {
         match self {
             Set::Toplevel(_) => None,
-            Set::Named(name, _, _) => Some(name),
-        }
-    }
-
-    fn title(&self) -> &'a str {
-        match self {
-            Set::Toplevel(_) => "Top-level",
-            Set::Named(name, _, _) => name,
+            Set::Named { name, .. } => Some(name),
         }
     }
 
     fn metadata(&self) -> &OptionSet {
         match self {
             Set::Toplevel(set) => set,
-            Set::Named(_, set, _) => set,
-        }
-    }
-
-    fn level(&self) -> u32 {
-        match self {
-            Set::Toplevel(_) => 0,
-            Set::Named(_, _, level) => *level,
+            Set::Named { set, .. } => set,
         }
     }
 }
 
-fn emit_field(output: &mut String, name: &str, field: &OptionField, parent_set: &Set) {
-    let header_level = if parent_set.level() < 2 {
-        "####"
-    } else {
-        "#####"
-    };
+fn emit_field(output: &mut String, name: &str, field: &OptionField, parents: &[Set]) {
+    let header_level = if parents.is_empty() { "####" } else { "#####" };
+    let parents_anchor = parents.iter().filter_map(|parent| parent.name()).join("_");
+
+    if parents_anchor.is_empty() {
+        output.push_str(&format!(
+            "{header_level} [`{name}`](#{name}) {{: #{name} }}\n"
+        ));
+    } else {
+        output.push_str(&format!(
+            "{header_level} [`{name}`](#{parents_anchor}_{name}) {{: #{parents_anchor}_{name} }}\n"
+        ));
 
-    // if there's a set name, we need to add it to the anchor
-    if let Some(set_name) = parent_set.name() {
         // the anchor used to just be the name, but now it's the group name
         // for backwards compatibility, we need to keep the old anchor
         output.push_str(&format!("<span id=\"{name}\"></span>\n"));
-
-        output.push_str(&format!(
-            "{header_level} [`{name}`](#{set_name}-{name}) {{: #{set_name}-{name} }}\n"
-        ));
-    } else {
-        output.push_str(&format!("{header_level} [`{name}`](#{name})\n"));
     }
+
     output.push('\n');
 
     if let Some(deprecated) = &field.deprecated {
@@ -129,12 +139,12 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parent_set:
     output.push_str("**Example usage**:\n\n");
     output.push_str(&format_tab(
         "pyproject.toml",
-        &format_header(field.scope, parent_set, ConfigurationFile::PyprojectToml),
+        &format_header(field.scope, parents, ConfigurationFile::PyprojectToml),
         field.example,
     ));
     output.push_str(&format_tab(
         "ruff.toml",
-        &format_header(field.scope, parent_set, ConfigurationFile::RuffToml),
+        &format_header(field.scope, parents, ConfigurationFile::RuffToml),
         field.example,
     ));
     output.push('\n');
@@ -152,52 +162,22 @@ fn format_tab(tab_name: &str, header: &str, content: &str) -> String {
 /// Format the TOML header for the example usage for a given option.
 ///
 /// For example: `[tool.ruff.format]` or `[tool.ruff.lint.isort]`.
-fn format_header(
-    scope: Option<&str>,
-    parent_set: &Set,
-    configuration: ConfigurationFile,
-) -> String {
-    match configuration {
-        ConfigurationFile::PyprojectToml => {
-            let mut header = if let Some(set_name) = parent_set.name() {
-                if set_name == "format" {
-                    String::from("tool.ruff.format")
-                } else {
-                    format!("tool.ruff.lint.{set_name}")
-                }
-            } else {
-                "tool.ruff".to_string()
-            };
-            if let Some(scope) = scope {
-                if !header.is_empty() {
-                    header.push('.');
-                }
-                header.push_str(scope);
-            }
-            format!("[{header}]")
-        }
-        ConfigurationFile::RuffToml => {
-            let mut header = if let Some(set_name) = parent_set.name() {
-                if set_name == "format" {
-                    String::from("format")
-                } else {
-                    format!("lint.{set_name}")
-                }
-            } else {
-                String::new()
-            };
-            if let Some(scope) = scope {
-                if !header.is_empty() {
-                    header.push('.');
-                }
-                header.push_str(scope);
-            }
-            if header.is_empty() {
-                String::new()
-            } else {
-                format!("[{header}]")
-            }
-        }
+fn format_header(scope: Option<&str>, parents: &[Set], configuration: ConfigurationFile) -> String {
+    let tool_parent = match configuration {
+        ConfigurationFile::PyprojectToml => Some("tool.ruff"),
+        ConfigurationFile::RuffToml => None,
+    };
+
+    let header = tool_parent
+        .into_iter()
+        .chain(parents.iter().filter_map(|parent| parent.name()))
+        .chain(scope)
+        .join(".");
+
+    if header.is_empty() {
+        String::new()
+    } else {
+        format!("[{header}]")
     }
 }
 

crates/ruff_dev/src/generate_rules_table.rs

@@ -3,6 +3,7 @@
 //! Used for <https://docs.astral.sh/ruff/rules/>.
 
 use itertools::Itertools;
+use ruff_linter::codes::RuleGroup;
 use std::borrow::Cow;
 use strum::IntoEnumIterator;
 
@@ -14,6 +15,10 @@ use ruff_workspace::options_base::OptionsMetadata;
 
 const FIX_SYMBOL: &str = "🛠️";
 const PREVIEW_SYMBOL: &str = "🧪";
+const REMOVED_SYMBOL: &str = "❌";
+const WARNING_SYMBOL: &str = "⚠️";
+const STABLE_SYMBOL: &str = "✔️";
+const SPACER: &str = "&nbsp;&nbsp;&nbsp;&nbsp;";
 
 fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>, linter: &Linter) {
     table_out.push_str("| Code | Name | Message | |");
@@ -21,20 +26,33 @@ fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>,
     table_out.push_str("| ---- | ---- | ------- | ------: |");
     table_out.push('\n');
     for rule in rules {
+        let status_token = match rule.group() {
+            RuleGroup::Removed => {
+                format!("<span title='Rule has been removed'>{REMOVED_SYMBOL}</span>")
+            }
+            RuleGroup::Deprecated => {
+                format!("<span title='Rule has been deprecated'>{WARNING_SYMBOL}</span>")
+            }
+            #[allow(deprecated)]
+            RuleGroup::Preview | RuleGroup::Nursery => {
+                format!("<span title='Rule is in preview'>{PREVIEW_SYMBOL}</span>")
+            }
+            RuleGroup::Stable => {
+                // A full opacity checkmark is a bit aggressive for indicating stable
+                format!("<span title='Rule is stable' style='opacity: 0.6'>{STABLE_SYMBOL}</span>")
+            }
+        };
+
         let fix_token = match rule.fixable() {
             FixAvailability::Always | FixAvailability::Sometimes => {
                 format!("<span title='Automatic fix available'>{FIX_SYMBOL}</span>")
             }
             FixAvailability::None => {
-                format!("<span style='opacity: 0.1' aria-hidden='true'>{FIX_SYMBOL}</span>")
+                format!("<span title='Automatic fix not available' style='opacity: 0.1' aria-hidden='true'>{FIX_SYMBOL}</span>")
             }
         };
-        let preview_token = if rule.is_preview() || rule.is_nursery() {
-            format!("<span title='Rule is in preview'>{PREVIEW_SYMBOL}</span>")
-        } else {
-            format!("<span style='opacity: 0.1' aria-hidden='true'>{PREVIEW_SYMBOL}</span>")
-        };
-        let status_token = format!("{fix_token} {preview_token}");
+
+        let tokens = format!("{status_token} {fix_token}");
 
         let rule_name = rule.as_ref();
 
@@ -48,9 +66,20 @@ fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>,
             Cow::Borrowed(message)
         };
 
+        // Start and end of style spans
+        let mut ss = "";
+        let mut se = "";
+        if rule.is_removed() {
+            ss = "<span style='opacity: 0.5', title='This rule has been removed'>";
+            se = "</span>";
+        } else if rule.is_deprecated() {
+            ss = "<span style='opacity: 0.8', title='This rule has been deprecated'>";
+            se = "</span>";
+        }
+
         #[allow(clippy::or_fun_call)]
         table_out.push_str(&format!(
-            "| {0}{1} {{ #{0}{1} }} | {2} | {3} | {4} |",
+            "| {ss}{0}{1}{se} {{ #{0}{1} }} | {ss}{2}{se} | {ss}{3}{se} | {ss}{4}{se} |",
             linter.common_prefix(),
             linter.code_for_rule(rule).unwrap(),
             rule.explanation()
@@ -58,7 +87,7 @@ fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>,
                 .then_some(format_args!("[{rule_name}](rules/{rule_name}.md)"))
                 .unwrap_or(format_args!("{rule_name}")),
             message,
-            status_token,
+            tokens,
         ));
         table_out.push('\n');
     }
@@ -69,15 +98,33 @@ pub(crate) fn generate() -> String {
     // Generate the table string.
     let mut table_out = String::new();
 
-    table_out.push_str(&format!(
-        "The {FIX_SYMBOL} emoji indicates that a rule is automatically fixable by the `--fix` command-line option."));
-    table_out.push('\n');
+    table_out.push_str("### Legend");
     table_out.push('\n');
 
     table_out.push_str(&format!(
-        "The {PREVIEW_SYMBOL} emoji indicates that a rule is in [\"preview\"](faq.md#what-is-preview)."
+        "{SPACER}{STABLE_SYMBOL}{SPACER} The rule is stable."
     ));
-    table_out.push('\n');
+    table_out.push_str("<br />");
+
+    table_out.push_str(&format!(
+        "{SPACER}{PREVIEW_SYMBOL}{SPACER} The rule is unstable and is in [\"preview\"](faq.md#what-is-preview)."
+    ));
+    table_out.push_str("<br />");
+
+    table_out.push_str(&format!(
+        "{SPACER}{WARNING_SYMBOL}{SPACER} The rule has been deprecated and will be removed in a future release."
+    ));
+    table_out.push_str("<br />");
+
+    table_out.push_str(&format!(
+        "{SPACER}{REMOVED_SYMBOL}{SPACER} The rule has been removed only the documentation is available."
+    ));
+    table_out.push_str("<br />");
+
+    table_out.push_str(&format!(
+        "{SPACER}{FIX_SYMBOL}{SPACER} The rule is automatically fixable by the `--fix` command-line option."
+    ));
+    table_out.push_str("<br />");
     table_out.push('\n');
 
     for linter in Linter::iter() {

crates/ruff_linter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.1.14"
+version = "0.1.15"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }

crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC101.py

@@ -1,31 +1,87 @@
 import os
 import subprocess
 import time
+from pathlib import Path
+
+# Violation cases:
 
 
-async def foo():
+async def func():
     open("foo")
 
 
-async def foo():
+async def func():
     time.sleep(1)
 
 
-async def foo():
+async def func():
     subprocess.run("foo")
 
 
-async def foo():
+async def func():
     subprocess.call("foo")
 
 
-async def foo():
+async def func():
     subprocess.foo(0)
 
 
-async def foo():
+async def func():
     os.wait4(10)
 
 
-async def foo():
+async def func():
     os.wait(12)
+
+
+# Violation cases for pathlib:
+
+
+async def func():
+    Path("foo").open()  # ASYNC101
+
+
+async def func():
+    p = Path("foo")
+    p.open()  # ASYNC101
+
+
+async def func():
+    with Path("foo").open() as f:  # ASYNC101
+        pass
+
+
+async def func() -> None:
+    p = Path("foo")
+
+    async def bar():
+        p.open()  # ASYNC101
+
+
+async def func() -> None:
+    (p1, p2) = (Path("foo"), Path("bar"))
+
+    p1.open()  # ASYNC101
+
+
+# Non-violation cases for pathlib:
+
+
+class Foo:
+    def open(self):
+        pass
+
+
+async def func():
+    Foo().open()  # OK
+
+
+async def func():
+    def open():
+        pass
+
+    open()  # OK
+
+
+def func():
+    Path("foo").open()  # OK

crates/ruff_linter/resources/test/fixtures/flake8_pie/PIE810.py

@@ -9,6 +9,22 @@ obj.startswith(foo) or obj.startswith("foo")
 # error
 obj.endswith(foo) or obj.startswith(foo) or obj.startswith("foo")
 
+def func():
+    msg = "hello world"
+
+    x = "h"
+    y = ("h", "e", "l", "l", "o")  
+    z = "w"
+
+    if msg.startswith(x) or msg.startswith(y) or msg.startswith(z): # Error
+        print("yes") 
+
+def func():
+    msg = "hello world"
+
+    if msg.startswith(("h", "e", "l", "l", "o")) or msg.startswith("h") or msg.startswith("w"): # Error
+        print("yes") 
+
 # ok
 obj.startswith(("foo",  "bar"))
 # ok
@@ -17,3 +33,46 @@ obj.endswith(("foo",  "bar"))
 obj.startswith("foo") or obj.endswith("bar")
 # ok
 obj.startswith("foo") or abc.startswith("bar")
+
+def func():
+    msg = "hello world"
+
+    x = "h"
+    y = ("h", "e", "l", "l", "o")  
+
+    if msg.startswith(x) or msg.startswith(y): # OK
+        print("yes") 
+
+def func():
+    msg = "hello world"
+
+    y = ("h", "e", "l", "l", "o")  
+
+    if msg.startswith(y): # OK
+        print("yes") 
+
+def func():
+    msg = "hello world"
+
+    y = ("h", "e", "l", "l", "o")  
+
+    if msg.startswith(y) or msg.startswith(y): # OK
+        print("yes") 
+
+def func():
+    msg = "hello world"
+
+    y = ("h", "e", "l", "l", "o")  
+    x = ("w", "o", "r", "l", "d")
+
+    if msg.startswith(y) or msg.startswith(x) or msg.startswith("h"): # OK
+        print("yes") 
+
+def func():
+    msg = "hello world"
+
+    y = ("h", "e", "l", "l", "o")  
+    x = ("w", "o", "r", "l", "d")
+
+    if msg.startswith(y) or msg.endswith(x) or msg.startswith("h"): # OK
+        print("yes")

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

@@ -1,14 +1,15 @@
+import _thread
 import builtins
 import os
 import posix
-from posix import abort
 import sys as std_sys
 import typing
-import typing_extensions
-import _thread
-import _winapi
+from posix import abort
+from typing import NoReturn
 
+import _winapi
 import pytest
+import typing_extensions
 from pytest import xfail as py_xfail
 
 ###
@@ -326,3 +327,44 @@ def end_of_file():
     if False:
         return 1
     x = 2 \
+
+
+
+# function return type annotation NoReturn
+def foo(x: int) -> int:
+    def bar() -> NoReturn:
+        abort()
+    if x == 5:
+        return 5
+    bar()
+
+
+def foo(string: str) -> str:
+    def raises(value: str) -> NoReturn:
+        raise RuntimeError("something went wrong")
+
+    match string:
+        case "a":
+            return "first"
+        case "b":
+            return "second"
+        case "c":
+            return "third"
+        case _:
+            raises(string)
+
+
+def foo() -> int:
+    def baz() -> int:
+        return 1
+
+
+    def bar() -> NoReturn:
+        a = 1 + 2
+        raise AssertionError("Very bad")
+
+
+
+    if baz() > 3:
+        return 1
+    bar()

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

@@ -363,3 +363,46 @@ def foo():
 def mavko_debari(P_kbar):
     D=0.4853881 + 3.6006116*P - 0.0117368*(P-1.3822)**2
     return D
+
+
+# contextlib suppress in with statement
+import contextlib
+
+
+def foo():
+    x = 2
+    with contextlib.suppress(Exception):
+        x = x + 1
+    return x
+
+
+def foo(data):
+    with open("in.txt") as file_out, contextlib.suppress(IOError):
+        file_out.write(data)
+        data = 10
+    return data
+
+
+def foo(data):
+    with open("in.txt") as file_out:
+        file_out.write(data)
+        with contextlib.suppress(IOError):
+            data = 10
+    return data
+
+
+def foo():
+    y = 1
+    x = 2
+    with contextlib.suppress(Exception):
+        x = 1
+    y = y + 2
+    return y  # RET504
+
+
+def foo():
+    y = 1
+    if y > 0:
+        with contextlib.suppress(Exception):
+            y = 2
+        return y

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

@@ -103,6 +103,14 @@ def bar4(x):
             return None
 
 
+def fibo(n):
+    if n<2:
+        return n;
+    else:
+        last = 1;
+        last2 = 0;
+
+
 ###
 # Non-error
 ###
@@ -131,6 +139,51 @@ def bar3(x, y, z):
     return None
 
 
+def bar4(x):
+    if True:
+        return
+    else:
+        # comment
+        pass
+
+
+def bar5():
+    if True:
+        return
+    else:  # comment
+        pass
+
+
+def bar6():
+    if True:
+        return
+    else\
+        :\
+        # comment
+        pass
+
+
+def bar7():
+    if True:
+        return
+    else\
+        :  # comment
+        pass
+
+
+def bar8():
+    if True:
+        return
+    else: pass
+
+
+def bar9():
+    if True:
+        return
+    else:\
+        pass
+
+
 x = 0
 
 if x == 1:

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

@@ -4,6 +4,11 @@ if a:
 elif c:
     b
 
+if a:  # we preserve comments, too!
+    b
+elif c:  # but not on the second branch
+    b
+
 if x == 1:
     for _ in range(20):
         print("hello")
@@ -63,6 +68,10 @@ elif result.eofs == "F":
     errors = 1
 elif result.eofs == "E":
     errors = 1
+elif result.eofs == "X":
+    errors = 1
+elif result.eofs == "C":
+    errors = 1
 
 
 # OK
@@ -70,7 +79,7 @@ def complicated_calc(*arg, **kwargs):
     return 42
 
 
-def foo(p):
+def func(p):
     if p == 2:
         return complicated_calc(microsecond=0)
     elif p == 3:
@@ -103,7 +112,7 @@ elif c:
     x = 1
 
 
-def foo():
+def func():
     a = True
     b = False
     if a > b:  # end-of-line
@@ -114,3 +123,28 @@ def foo():
         return 4
     elif b is None:
         return 4
+
+
+def func():
+    """Ensure that the named expression is parenthesized when merged."""
+    a = True
+    b = False
+    if a > b:  # end-of-line
+        return 3
+    elif a := 1:
+        return 3
+
+
+if a:  # we preserve comments, too!
+    b
+elif c:  # but not on the second branch
+    b
+
+
+if a: b  # here's a comment
+elif c: b
+
+
+if(x > 200): pass
+elif(100 < x and x < 200 and 300 < y and y < 800):
+	pass

crates/ruff_linter/resources/test/fixtures/flake8_type_checking/init_var.py

@@ -0,0 +1,18 @@
+"""Test: avoid marking an `InitVar` as typing-only."""
+
+from __future__ import annotations
+
+from dataclasses import FrozenInstanceError, InitVar, dataclass
+from pathlib import Path
+
+
+@dataclass
+class C:
+    i: int
+    j: int = None
+    database: InitVar[Path] = None
+
+    err: FrozenInstanceError = None
+
+    def __post_init__(self, database):
+        ...

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

@@ -1,5 +1,6 @@
 #: E401
 import os, sys
+
 #: Okay
 import os
 import sys
@@ -59,3 +60,21 @@ import foo
 a = 1
 
 import bar
+
+#: E401
+import re as regex, string  # also with a comment!
+import re as regex, string; x = 1
+
+x = 1; import re as regex, string
+
+
+def blah():
+    import datetime as dt, copy
+
+    def nested_and_tested():
+        import builtins, textwrap as tw
+
+        x = 1; import re as regex, string
+        import re as regex, string; x = 1
+
+    if True: import re as regex, string

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

@@ -126,3 +126,15 @@ class Foo:
         # Okay
         if type(value) is str:
             ...
+
+
+import numpy as np
+
+#: Okay
+x.dtype == float
+
+#: Okay
+np.dtype(int) == float
+
+#: E721
+dtype == float

crates/ruff_linter/resources/test/fixtures/pydocstyle/D413.py

@@ -0,0 +1,59 @@
+"""Do something.
+
+Args:
+    x: the value
+        with a hanging indent
+
+Returns:
+    the value
+"""
+
+
+def func():
+    """Do something.
+
+    Args:
+        x: the value
+            with a hanging indent
+
+    Returns:
+        the value
+    """
+
+
+def func():
+    """Do something.
+
+    Args:
+        x: the value
+            with a hanging indent
+
+    Returns:
+        the value
+
+    """
+
+
+def func():
+    """Do something.
+
+    Args:
+        x: the value
+            with a hanging indent
+
+    Returns:
+        the value
+
+
+    """
+
+
+def func():
+    """Do something.
+
+    Args:
+        x: the value
+            with a hanging indent
+
+    Returns:
+        the value"""

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

@@ -1,73 +0,0 @@
-# OK
-
-1<2 and 'b' and 'c'
-
-1<2 or 'a' and 'b'
-
-1<2 and 'a'
-
-1<2 or 'a'
-
-2>1
-
-1<2 and 'a' or 'b' and 'c'
-
-1<2 and 'a' or 'b' or 'c'
-
-1<2 and 'a' or 'b' or 'c' or (lambda x: x+1)
-
-1<2 and 'a' or 'b' or (lambda x: x+1) or 'c'
-
-default = 'default'
-if (not isinstance(default, bool) and isinstance(default, int)) \
-        or (isinstance(default, str) and default):
-    pass
-
-docid, token = None, None
-(docid is None and token is None) or (docid is not None and token is not None)
-
-vendor, os_version = 'darwin', '14'
-vendor == "debian" and os_version in ["12"] or vendor == "ubuntu" and os_version in []
-
-# Don't emit if the parent is an `if` statement.
-if (task_id in task_dict and task_dict[task_id] is not task) \
-        or task_id in used_group_ids:
-    pass
-
-no_target, is_x64, target = True, False, 'target'
-if (no_target and not is_x64) or target == 'ARM_APPL_RUST_TARGET':
-    pass
-
-# Don't emit if the parent is a `bool_op` expression.
-isinstance(val, str) and ((len(val) == 7 and val[0] == "#") or val in enums.NamedColor)
-
-# Errors
-
-1<2 and 'a' or 'b'
-
-(lambda x: x+1) and 'a' or 'b'
-
-'a' and (lambda x: x+1) or 'orange'
-
-val = '#0000FF'
-(len(val) == 7 and val[0] == "#") or val in {'green'}
-
-marker = 'marker'
-isinstance(marker, dict) and 'field' in marker or marker in {}
-
-def has_oranges(oranges, apples=None) -> bool:
-    return apples and False or oranges
-
-[x for x in l if a and b or c]
-
-{x: y for x in l if a and b or c}
-
-{x for x in l if a and b or c}
-
-new_list = [
-    x
-    for sublist in all_lists
-    if a and b or c
-    for x in sublist
-    if (isinstance(operator, list) and x in operator) or x != operator
-]

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

@@ -91,6 +91,9 @@ class Apples:
     def __prepare__():
         pass
 
+    def __mro_entries__(self, bases):
+        pass
+
 
 def __foo_bar__():  # this is not checked by the [bad-dunder-name] rule
     ...

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

@@ -49,6 +49,17 @@ def not_ok1():
             pass
 
 
+def not_ok1_with_comments():
+    if 1:
+        pass
+    else:
+        # inner comment
+        if 2:
+            pass
+        else:
+            pass  # final pass comment
+
+
 # Regression test for https://github.com/apache/airflow/blob/f1e1cdcc3b2826e68ba133f350300b5065bbca33/airflow/models/dag.py#L1737
 def not_ok2():
     if True:
@@ -61,3 +72,28 @@ def not_ok2():
         else:
             print(4)
 
+
+def not_ok3():
+    if 1:
+        pass
+    else:
+        if 2: pass
+        else: pass
+
+
+def not_ok4():
+    if 1:
+        pass
+    else:
+        if 2: pass
+        else:
+            pass
+
+
+def not_ok5():
+    if 1:
+        pass
+    else:
+        if 2:
+            pass
+        else: pass

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

@@ -68,6 +68,9 @@ if pi_estimation == 3.141592653589793238:  # [magic-value-comparison]
 if pi_estimation == PI:  # correct
     pass
 
+if pi_estimation == 0x3:  # [magic-value-comparison]
+    pass
+
 HELLO_WORLD = b"Hello, World!"
 user_input = b"Hello, There!"
 

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

@@ -0,0 +1,56 @@
+class StudentA:
+    __slots__ = ("name",)
+
+    def __init__(self, name, surname):
+        self.name = name
+        self.surname = surname  # [assigning-non-slot]
+        self.setup()
+
+    def setup(self):
+        pass
+
+
+class StudentB:
+    __slots__ = ("name", "surname")
+
+    def __init__(self, name, middle_name):
+        self.name = name
+        self.middle_name = middle_name  # [assigning-non-slot]
+        self.setup()
+
+    def setup(self):
+        pass
+
+
+class StudentC:
+    __slots__ = ("name", "surname")
+
+    def __init__(self, name, surname):
+        self.name = name
+        self.surname = surname  # OK
+        self.setup()
+
+    def setup(self):
+        pass
+
+
+class StudentD(object):
+    __slots__ = ("name", "surname")
+
+    def __init__(self, name, middle_name):
+        self.name = name
+        self.middle_name = middle_name  # [assigning-non-slot]
+        self.setup()
+
+    def setup(self):
+        pass
+
+
+class StudentE(StudentD):
+    def __init__(self, name, middle_name):
+        self.name = name
+        self.middle_name = middle_name  # OK
+        self.setup()
+
+    def setup(self):
+        pass

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

@@ -0,0 +1,9 @@
+print([1, 2, 3][3])  # PLE0643
+print([1, 2, 3][-4])  # PLE0643
+print([1, 2, 3][999999999999999999999999999999999999999999])  # PLE0643
+print([1, 2, 3][-999999999999999999999999999999999999999999])  # PLE0643
+
+print([1, 2, 3][2])  # OK
+print([1, 2, 3][0])  # OK
+print([1, 2, 3][-3])  # OK
+print([1, 2, 3][3:])  # OK

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

@@ -0,0 +1,21 @@
+def correct_fruits(fruits) -> bool:
+    if len(fruits) > 1:  # PLR1702
+        if "apple" in fruits:
+            if "orange" in fruits:
+                count = fruits["orange"]
+                if count % 2:
+                    if "kiwi" in fruits:
+                        if count == 2:
+                            return True
+    return False
+
+# Ok
+def correct_fruits(fruits) -> bool:
+    if len(fruits) > 1:
+        if "apple" in fruits:
+            if "orange" in fruits:
+                count = fruits["orange"]
+                if count % 2:
+                    if "kiwi" in fruits:
+                        return True
+    return False

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

@@ -135,3 +135,14 @@ def test_break_in_match():
     else:
         return True
     return False
+
+
+def test_retain_comment():
+    """Retain the comment within the `else` block"""
+    for j in range(10):
+        pass
+    else:
+        # [useless-else-on-loop]
+        print("fat chance")
+        for j in range(10):
+            break

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

@@ -67,3 +67,15 @@ class G(F):
     without_annotation = []
     class_variable: ClassVar[list[int]] = []
     final_variable: Final[list[int]] = []
+
+
+from pydantic import BaseConfig
+
+
+class H(BaseModel):
+    class Config(BaseConfig):
+        mutable_default: list[int] = []
+        immutable_annotation: Sequence[int] = []
+        without_annotation = []
+        class_variable: ClassVar[list[int]] = []
+        final_variable: Final[list[int]] = []

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

@@ -218,6 +218,38 @@ __all__ = (
 
 __all__ = ("don't" "care" "about", "__all__" "with", "concatenated" "strings")
 
+############################################################
+# Trailing-comma edge cases that should be flagged and fixed
+############################################################
+
+__all__ = (
+    "loads",
+    "dumps",)
+
+__all__ = [
+    "loads",
+    "dumps"       ,     ]
+
+__all__ = ['xp', 'yp',
+                'canvas'
+
+                # very strangely placed comment
+
+                ,
+
+                # another strangely placed comment
+                ]
+
+__all__ = (
+    "foo"
+    # strange comment 1
+    ,
+    # comment about bar
+    "bar"
+    # strange comment 2
+    ,
+)
+
 ###################################
 # These should all not get flagged:
 ###################################
@@ -306,3 +338,5 @@ __all__ = (
 __all__ = [
     "foo", (), "bar"
 ]
+
+__all__ = "foo", "an" "implicitly_concatenated_second_item", not_a_string_literal

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

@@ -0,0 +1,268 @@
+#########################
+# Single-line definitions
+#########################
+
+class Klass:
+    __slots__ = ["d", "c", "b", "a"]  # a comment that is untouched
+    __match_args__ = ("d", "c", "b", "a")
+
+    # Quoting style is retained,
+    # but unnecessary parens are not
+    __slots__: set = {'b', "c", ((('a')))}
+    # Trailing commas are also not retained for single-line definitions
+    # (but they are in multiline definitions)
+    __match_args__: tuple = ("b", "c", "a",)
+
+class Klass2:
+    if bool():
+        __slots__ = {"x": "docs for x", "m": "docs for m", "a": "docs for a"}
+    else:
+        __slots__ = "foo3", "foo2", "foo1"  # NB: an implicit tuple (without parens)
+
+    __match_args__: list[str] = ["the", "three", "little", "pigs"]
+    __slots__ = ("parenthesized_item"), "in", ("an_unparenthesized_tuple")
+    # we use natural sort,
+    # not alphabetical sort or "isort-style" sort
+    __slots__ = {"aadvark237", "aadvark10092", "aadvark174", "aadvark532"}
+
+############################
+# Neat multiline definitions
+############################
+
+class Klass3:
+    __slots__ = (
+        "d0",
+        "c0",  # a comment regarding 'c0'
+        "b0",
+        # a comment regarding 'a0':
+        "a0"
+    )
+    __match_args__ = [
+        "d",
+        "c",  # a comment regarding 'c'
+        "b",
+        # a comment regarding 'a':
+        "a"
+    ]
+
+##################################
+# Messier multiline definitions...
+##################################
+
+class Klass4:
+    # comment0
+    __slots__ = ("d", "a",  # comment1
+            # comment2
+            "f", "b",
+                                            "strangely",  # comment3
+                # comment4
+        "formatted",
+        # comment5
+    )  # comment6
+    # comment7
+
+    __match_args__ = [  # comment0
+        # comment1
+        # comment2
+        "dx", "cx", "bx", "ax"  # comment3
+        # comment4
+        # comment5
+        # comment6
+    ]  # comment7
+
+# from cpython/Lib/pathlib/__init__.py
+class PurePath:
+    __slots__ = (
+        # The `_raw_paths` slot stores unnormalized string paths. This is set
+        # in the `__init__()` method.
+        '_raw_paths',
+
+        # The `_drv`, `_root` and `_tail_cached` slots store parsed and
+        # normalized parts of the path. They are set when any of the `drive`,
+        # `root` or `_tail` properties are accessed for the first time. The
+        # three-part division corresponds to the result of
+        # `os.path.splitroot()`, except that the tail is further split on path
+        # separators (i.e. it is a list of strings), and that the root and
+        # tail are normalized.
+        '_drv', '_root', '_tail_cached',
+
+        # The `_str` slot stores the string representation of the path,
+        # computed from the drive, root and tail when `__str__()` is called
+        # for the first time. It's used to implement `_str_normcase`
+        '_str',
+
+        # The `_str_normcase_cached` slot stores the string path with
+        # normalized case. It is set when the `_str_normcase` property is
+        # accessed for the first time. It's used to implement `__eq__()`
+        # `__hash__()`, and `_parts_normcase`
+        '_str_normcase_cached',
+
+        # The `_parts_normcase_cached` slot stores the case-normalized
+        # string path after splitting on path separators. It's set when the
+        # `_parts_normcase` property is accessed for the first time. It's used
+        # to implement comparison methods like `__lt__()`.
+        '_parts_normcase_cached',
+
+        # The `_hash` slot stores the hash of the case-normalized string
+        # path. It's set when `__hash__()` is called for the first time.
+        '_hash',
+    )
+
+# From cpython/Lib/pickletools.py
+class ArgumentDescriptor(object):
+    __slots__ = (
+        # name of descriptor record, also a module global name; a string
+        'name',
+
+        # length of argument, in bytes; an int; UP_TO_NEWLINE and
+        # TAKEN_FROM_ARGUMENT{1,4,8} are negative values for variable-length
+        # cases
+        'n',
+
+        # a function taking a file-like object, reading this kind of argument
+        # from the object at the current position, advancing the current
+        # position by n bytes, and returning the value of the argument
+        'reader',
+
+        # human-readable docs for this arg descriptor; a string
+        'doc',
+    )
+
+####################################
+# Should be flagged, but not fixed
+####################################
+
+# from cpython/Lib/test/test_inspect.py.
+# Multiline dicts are out of scope.
+class SlotUser:
+    __slots__ = {'power': 'measured in kilowatts',
+                 'distance': 'measured in kilometers'}
+
+class Klass5:
+    __match_args__ = (
+        "look",
+        (
+            "a_veeeeeeeeeeeeeeeeeeery_long_parenthesized_item"
+        ),
+    )
+    __slots__ = (
+        "b",
+        ((
+            "c"
+        )),
+        "a"
+    )
+    __slots__ = ("don't" "care" "about", "__slots__" "with", "concatenated" "strings")
+
+############################################################
+# Trailing-comma edge cases that should be flagged and fixed
+############################################################
+
+class BezierBuilder:
+    __slots__ = ('xp', 'yp',
+                 'canvas',)
+
+class BezierBuilder2:
+    __slots__ = {'xp', 'yp',
+                 'canvas'      ,          }
+
+class BezierBuilder3:
+    __slots__ = ['xp', 'yp',
+                 'canvas'
+
+                 # very strangely placed comment
+
+                 ,
+
+                 # another strangely placed comment
+                 ]
+
+class BezierBuilder4:
+    __slots__ = (
+        "foo"
+        # strange comment 1
+        ,
+        # comment about bar
+        "bar"
+        # strange comment 2
+        ,
+    )
+
+###################################
+# These should all not get flagged:
+###################################
+
+class Klass6:
+    __slots__ = ()
+    __match_args__ = []
+    __slots__ = ("single_item",)
+    __match_args__ = (
+        "single_item_multiline",
+    )
+    __slots__ = {"single_item",}
+    __slots__ = {"single_item_no_trailing_comma": "docs for that"}
+    __match_args__ = [
+        "single_item_multiline_no_trailing_comma"
+    ]
+    __slots__ = ("not_a_tuple_just_a_string")
+    __slots__ = ["a", "b", "c", "d"]
+    __slots__ += ["e", "f", "g"]
+    __slots__ = ("a", "b", "c", "d")
+
+    if bool():
+        __slots__ += ("e", "f", "g")
+    else:
+        __slots__ += ["alpha", "omega"]
+
+    __slots__ = {"not": "sorted", "but": "includes", **a_kwarg_splat}
+
+__slots__ = ("b", "a", "e", "d")
+__slots__ = ["b", "a", "e", "d"]
+__match_args__ = ["foo", "bar", "antipasti"]
+
+class Klass6:
+    __slots__ = (9, 8, 7)
+    __match_args__ = (  # This is just an empty tuple,
+        # but,
+        # it's very well
+    )  # documented
+
+    # We don't deduplicate elements;
+    # this just ensures that duplicate elements aren't unnecessarily
+    # reordered by an autofix:
+    __slots__ = (
+        "duplicate_element",  # comment1
+        "duplicate_element",  # comment3
+        "duplicate_element",  # comment2
+        "duplicate_element",  # comment0
+    )
+
+    __slots__ = "foo", "an" "implicitly_concatenated_second_item", not_a_string_literal
+
+    __slots__ =[
+        []
+    ]
+    __slots__ = [
+        ()
+    ]
+    __match_args__ = (
+        ()
+    )
+    __match_args__ = (
+        []
+    )
+    __slots__ = (
+        (),
+    )
+    __slots__ = (
+        [],
+    )
+    __match_args__ = (
+        "foo", [], "bar"
+    )
+    __match_args__ = [
+        "foo", (), "bar"
+    ]
+
+    __match_args__ = {"a", "set", "for", "__match_args__", "is invalid"}
+    __match_args__ = {"this": "is", "also": "invalid"}

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

@@ -0,0 +1,32 @@
+pierogi_fillings = [
+    "cabbage",
+    "strawberry",
+    "cheese",
+    "blueberry",
+]
+
+# Errors.
+dict.fromkeys(pierogi_fillings, [])
+dict.fromkeys(pierogi_fillings, list())
+dict.fromkeys(pierogi_fillings, {})
+dict.fromkeys(pierogi_fillings, set())
+dict.fromkeys(pierogi_fillings, {"pre": "populated!"})
+dict.fromkeys(pierogi_fillings, dict())
+
+# Okay.
+dict.fromkeys(pierogi_fillings)
+dict.fromkeys(pierogi_fillings, None)
+dict.fromkeys(pierogi_fillings, 1)
+dict.fromkeys(pierogi_fillings)
+dict.fromkeys(pierogi_fillings, ("blessed", "tuples", "don't", "mutate"))
+dict.fromkeys(pierogi_fillings, "neither do strings")
+
+class MysteryBox: ...
+
+dict.fromkeys(pierogi_fillings, MysteryBox)
+bar.fromkeys(pierogi_fillings, [])
+
+
+def bad_dict() -> None:
+    dict = MysteryBox()
+    dict.fromkeys(pierogi_fillings, [])

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

@@ -0,0 +1,92 @@
+# Violation cases: RUF025
+
+
+def func():
+    numbers = [1, 2, 3]
+    {n: None for n in numbers}  # RUF025
+
+
+def func():
+    for key, value in {n: 1 for n in [1, 2, 3]}.items():  # RUF025
+        pass
+
+
+def func():
+    {n: 1.1 for n in [1, 2, 3]}  # RUF025
+
+
+def func():
+    {n: complex(3, 5) for n in [1, 2, 3]}  # RUF025
+
+
+def func():
+    def f(data):
+        return data
+
+    f({c: "a" for c in "12345"})  # RUF025
+
+
+def func():
+    {n: True for n in [1, 2, 2]}  # RUF025
+
+
+def func():
+    {n: b"hello" for n in (1, 2, 2)}  # RUF025
+
+
+def func():
+    {n: ... for n in [1, 2, 3]}  # RUF025
+
+
+def func():
+    {n: False for n in {1: "a", 2: "b"}}  # RUF025
+
+
+def func():
+    {(a, b): 1 for (a, b) in [(1, 2), (3, 4)]}  # RUF025
+
+
+def func():
+    def f():
+        return 1
+
+    a = f()
+    {n: a for n in [1, 2, 3]}  # RUF025
+
+
+def func():
+    values = ["a", "b", "c"]
+    [{n: values for n in [1, 2, 3]}]  # RUF025
+
+
+# Non-violation cases: RUF025
+
+
+def func():
+    {n: 1 for n in [1, 2, 3, 4, 5] if n < 3}  # OK
+
+
+def func():
+    {n: 1 for c in [1, 2, 3, 4, 5] for n in [1, 2, 3] if c < 3}  # OK
+
+
+def func():
+    def f():
+        pass
+
+    {n: f() for n in [1, 2, 3]}  # OK
+
+
+def func():
+    {n: n for n in [1, 2, 3, 4, 5]}  # OK
+
+
+def func():
+    def f():
+        return {n: 1 for c in [1, 2, 3, 4, 5] for n in [1, 2, 3]}  # OK
+
+    f()
+
+
+def func():
+    {(a, b): a + b for (a, b) in [(1, 2), (3, 4)]}  # OK

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

@@ -0,0 +1,120 @@
+from collections import defaultdict
+
+# Violation cases: RUF026
+
+
+def func():
+    defaultdict(default_factory=None)  # RUF026
+
+
+def func():
+    defaultdict(default_factory=int)  # RUF026
+
+
+def func():
+    defaultdict(default_factory=float)  # RUF026
+
+
+def func():
+    defaultdict(default_factory=dict)  # RUF026
+
+
+def func():
+    defaultdict(default_factory=list)  # RUF026
+
+
+def func():
+    defaultdict(default_factory=tuple)  # RUF026
+
+
+def func():
+    def foo():
+        pass
+
+    defaultdict(default_factory=foo)  # RUF026
+
+
+def func():
+    defaultdict(default_factory=lambda: 1)  # RUF026
+
+
+def func():
+    from collections import deque
+
+    defaultdict(default_factory=deque)  # RUF026
+
+
+def func():
+    class MyCallable:
+        def __call__(self):
+            pass
+
+    defaultdict(default_factory=MyCallable())  # RUF026
+
+
+def func():
+    defaultdict(default_factory=tuple, member=1)  # RUF026
+
+
+def func():
+    defaultdict(member=1, default_factory=tuple)  # RUF026
+
+
+def func():
+    defaultdict(member=1, default_factory=tuple,)  # RUF026
+
+
+def func():
+    defaultdict(
+        member=1,
+        default_factory=tuple,
+    )  # RUF026
+
+
+def func():
+    defaultdict(
+        default_factory=tuple,
+        member=1,
+    )  # RUF026
+
+
+# Non-violation cases: RUF026
+
+
+def func():
+    defaultdict(default_factory=1)  # OK
+
+
+def func():
+    defaultdict(default_factory="wdefwef")  # OK
+
+
+def func():
+    defaultdict(default_factory=[1, 2, 3])  # OK
+
+
+def func():
+    defaultdict()  # OK
+
+
+def func():
+    defaultdict(int)  # OK
+
+
+def func():
+    defaultdict(list)  # OK
+
+
+def func():
+    defaultdict(dict)  # OK
+
+
+def func():
+    defaultdict(dict, defaultdict=list)  # OK
+
+
+def func():
+    def constant_factory(value):
+        return lambda: value
+
+    defaultdict(constant_factory("<missing>"))

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

@@ -256,25 +256,23 @@ pub(crate) fn deferred_scopes(checker: &mut Checker) {
                         diagnostic.set_parent(range.start());
                     }
 
-                    if checker.settings.preview.is_enabled() {
-                        if let Some(import) = binding.as_any_import() {
-                            if let Some(source) = binding.source {
-                                diagnostic.try_set_fix(|| {
-                                    let statement = checker.semantic().statement(source);
-                                    let parent = checker.semantic().parent_statement(source);
-                                    let edit = fix::edits::remove_unused_imports(
-                                        std::iter::once(import.member_name().as_ref()),
-                                        statement,
-                                        parent,
-                                        checker.locator(),
-                                        checker.stylist(),
-                                        checker.indexer(),
-                                    )?;
-                                    Ok(Fix::safe_edit(edit).isolate(Checker::isolation(
-                                        checker.semantic().parent_statement_id(source),
-                                    )))
-                                });
-                            }
+                    if let Some(import) = binding.as_any_import() {
+                        if let Some(source) = binding.source {
+                            diagnostic.try_set_fix(|| {
+                                let statement = checker.semantic().statement(source);
+                                let parent = checker.semantic().parent_statement(source);
+                                let edit = fix::edits::remove_unused_imports(
+                                    std::iter::once(import.member_name().as_ref()),
+                                    statement,
+                                    parent,
+                                    checker.locator(),
+                                    checker.stylist(),
+                                    checker.indexer(),
+                                )?;
+                                Ok(Fix::safe_edit(edit).isolate(Checker::isolation(
+                                    checker.semantic().parent_statement_id(source),
+                                )))
+                            });
                         }
                     }
 

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

@@ -125,6 +125,9 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::SliceCopy) {
                 refurb::rules::slice_copy(checker, subscript);
             }
+            if checker.enabled(Rule::PotentialIndexError) {
+                pylint::rules::potential_index_error(checker, value, slice);
+            }
 
             pandas_vet::rules::subscript(checker, value, expr);
         }
@@ -974,9 +977,16 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::SslInsecureVersion) {
                 flake8_bandit::rules::ssl_insecure_version(checker, call);
             }
+            if checker.enabled(Rule::MutableFromkeysValue) {
+                ruff::rules::mutable_fromkeys_value(checker, call);
+            }
             if checker.enabled(Rule::UnsortedDunderAll) {
                 ruff::rules::sort_dunder_all_extend_call(checker, call);
             }
+
+            if checker.enabled(Rule::DefaultFactoryKwarg) {
+                ruff::rules::default_factory_kwarg(checker, call);
+            }
         }
         Expr::Dict(dict) => {
             if checker.any_enabled(&[
@@ -1416,11 +1426,17 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::UnnecessaryDictIndexLookup) {
                 pylint::rules::unnecessary_dict_index_lookup_comprehension(checker, expr);
             }
+
             if checker.enabled(Rule::UnnecessaryComprehension) {
                 flake8_comprehensions::rules::unnecessary_dict_comprehension(
                     checker, expr, key, value, generators,
                 );
             }
+
+            if checker.enabled(Rule::UnnecessaryDictComprehensionForIterable) {
+                ruff::rules::unnecessary_dict_comprehension_for_iterable(checker, dict_comp);
+            }
+
             if checker.enabled(Rule::FunctionUsesLoopVariable) {
                 flake8_bugbear::rules::function_uses_loop_variable(checker, &Node::Expr(expr));
             }
@@ -1430,7 +1446,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 }
             }
             if checker.enabled(Rule::StaticKeyDictComprehension) {
-                ruff::rules::static_key_dict_comprehension(checker, dict_comp);
+                flake8_bugbear::rules::static_key_dict_comprehension(checker, dict_comp);
             }
         }
         Expr::GeneratorExp(
@@ -1492,9 +1508,6 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::RepeatedEqualityComparison) {
                 pylint::rules::repeated_equality_comparison(checker, bool_op);
             }
-            if checker.enabled(Rule::AndOrTernary) {
-                pylint::rules::and_or_ternary(checker, bool_op);
-            }
             if checker.enabled(Rule::UnnecessaryKeyCheck) {
                 ruff::rules::unnecessary_key_check(checker, expr);
             }

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

@@ -507,6 +507,9 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             if checker.enabled(Rule::NoSlotsInNamedtupleSubclass) {
                 flake8_slots::rules::no_slots_in_namedtuple_subclass(checker, stmt, class_def);
             }
+            if checker.enabled(Rule::NonSlotAssignment) {
+                pylint::rules::non_slot_assignment(checker, class_def);
+            }
             if checker.enabled(Rule::SingleStringSlots) {
                 pylint::rules::single_string_slots(checker, class_def);
             }
@@ -1069,13 +1072,10 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 ruff::rules::sort_dunder_all_aug_assign(checker, aug_assign);
             }
         }
-        Stmt::If(
-            if_ @ ast::StmtIf {
-                test,
-                elif_else_clauses,
-                ..
-            },
-        ) => {
+        Stmt::If(if_ @ ast::StmtIf { test, .. }) => {
+            if checker.enabled(Rule::TooManyNestedBlocks) {
+                pylint::rules::too_many_nested_blocks(checker, stmt);
+            }
             if checker.enabled(Rule::EmptyTypeCheckingBlock) {
                 if typing::is_type_checking_block(if_, &checker.semantic) {
                     flake8_type_checking::rules::empty_type_checking_block(checker, if_);
@@ -1092,7 +1092,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 );
             }
             if checker.enabled(Rule::IfWithSameArms) {
-                flake8_simplify::rules::if_with_same_arms(checker, checker.locator, if_);
+                flake8_simplify::rules::if_with_same_arms(checker, if_);
             }
             if checker.enabled(Rule::NeedlessBool) {
                 flake8_simplify::rules::needless_bool(checker, if_);
@@ -1117,9 +1117,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pyupgrade::rules::outdated_version_block(checker, if_);
             }
             if checker.enabled(Rule::CollapsibleElseIf) {
-                if let Some(diagnostic) = pylint::rules::collapsible_else_if(elif_else_clauses) {
-                    checker.diagnostics.push(diagnostic);
-                }
+                pylint::rules::collapsible_else_if(checker, stmt);
             }
             if checker.enabled(Rule::CheckAndRemoveFromSet) {
                 refurb::rules::check_and_remove_from_set(checker, if_);
@@ -1210,6 +1208,9 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             }
         }
         Stmt::With(with_stmt @ ast::StmtWith { items, body, .. }) => {
+            if checker.enabled(Rule::TooManyNestedBlocks) {
+                pylint::rules::too_many_nested_blocks(checker, stmt);
+            }
             if checker.enabled(Rule::AssertRaisesException) {
                 flake8_bugbear::rules::assert_raises_exception(checker, items);
             }
@@ -1237,6 +1238,9 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             }
         }
         Stmt::While(while_stmt @ ast::StmtWhile { body, orelse, .. }) => {
+            if checker.enabled(Rule::TooManyNestedBlocks) {
+                pylint::rules::too_many_nested_blocks(checker, stmt);
+            }
             if checker.enabled(Rule::FunctionUsesLoopVariable) {
                 flake8_bugbear::rules::function_uses_loop_variable(checker, &Node::Stmt(stmt));
             }
@@ -1260,6 +1264,9 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 range: _,
             },
         ) => {
+            if checker.enabled(Rule::TooManyNestedBlocks) {
+                pylint::rules::too_many_nested_blocks(checker, stmt);
+            }
             if checker.any_enabled(&[
                 Rule::EnumerateForLoop,
                 Rule::IncorrectDictIterator,
@@ -1324,6 +1331,9 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             finalbody,
             ..
         }) => {
+            if checker.enabled(Rule::TooManyNestedBlocks) {
+                pylint::rules::too_many_nested_blocks(checker, stmt);
+            }
             if checker.enabled(Rule::JumpStatementInFinally) {
                 flake8_bugbear::rules::jump_statement_in_finally(checker, finalbody);
             }
@@ -1458,6 +1468,9 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             if checker.settings.rules.enabled(Rule::UnsortedDunderAll) {
                 ruff::rules::sort_dunder_all_assign(checker, assign);
             }
+            if checker.enabled(Rule::UnsortedDunderSlots) {
+                ruff::rules::sort_dunder_slots_assign(checker, assign);
+            }
             if checker.source_type.is_stub() {
                 if checker.any_enabled(&[
                     Rule::UnprefixedTypeParam,
@@ -1531,6 +1544,9 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             if checker.settings.rules.enabled(Rule::UnsortedDunderAll) {
                 ruff::rules::sort_dunder_all_ann_assign(checker, assign_stmt);
             }
+            if checker.enabled(Rule::UnsortedDunderSlots) {
+                ruff::rules::sort_dunder_slots_ann_assign(checker, assign_stmt);
+            }
             if checker.source_type.is_stub() {
                 if let Some(value) = value {
                     if checker.enabled(Rule::AssignmentDefaultInStub) {

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

@@ -342,8 +342,7 @@ where
                     || helpers::is_assignment_to_a_dunder(stmt)
                     || helpers::in_nested_block(self.semantic.current_statements())
                     || imports::is_matplotlib_activation(stmt, self.semantic())
-                    || self.settings.preview.is_enabled()
-                        && imports::is_sys_path_modification(stmt, self.semantic()))
+                    || imports::is_sys_path_modification(stmt, self.semantic()))
                 {
                     self.semantic.flags |= SemanticModelFlags::IMPORT_BOUNDARY;
                 }
@@ -721,6 +720,21 @@ where
                     AnnotationContext::RuntimeEvaluated => {
                         self.visit_runtime_evaluated_annotation(annotation);
                     }
+                    AnnotationContext::TypingOnly
+                        if flake8_type_checking::helpers::is_dataclass_meta_annotation(
+                            annotation,
+                            self.semantic(),
+                        ) =>
+                    {
+                        if let Expr::Subscript(subscript) = &**annotation {
+                            // Ex) `InitVar[str]`
+                            self.visit_runtime_required_annotation(&subscript.value);
+                            self.visit_annotation(&subscript.slice);
+                        } else {
+                            // Ex) `InitVar`
+                            self.visit_runtime_required_annotation(annotation);
+                        }
+                    }
                     AnnotationContext::TypingOnly => self.visit_annotation(annotation),
                 }
 

crates/ruff_linter/src/codes.rs

@@ -52,6 +52,11 @@ pub enum RuleGroup {
     Stable,
     /// The rule is unstable, and preview mode must be enabled for usage.
     Preview,
+    /// The rule has been deprecated, warnings will be displayed during selection in stable
+    /// and errors will be raised if used with preview mode enabled.
+    Deprecated,
+    /// The rule has been removed, errors will be displayed on use.
+    Removed,
     /// Legacy category for unstable rules, supports backwards compatible selection.
     #[deprecated(note = "Use `RuleGroup::Preview` for new rules instead")]
     Nursery,
@@ -224,11 +229,13 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pylint, "E0116") => (RuleGroup::Stable, rules::pylint::rules::ContinueInFinally),
         (Pylint, "E0117") => (RuleGroup::Stable, rules::pylint::rules::NonlocalWithoutBinding),
         (Pylint, "E0118") => (RuleGroup::Stable, rules::pylint::rules::LoadBeforeGlobalDeclaration),
+        (Pylint, "E0237") => (RuleGroup::Stable, rules::pylint::rules::NonSlotAssignment),
         (Pylint, "E0241") => (RuleGroup::Stable, rules::pylint::rules::DuplicateBases),
         (Pylint, "E0302") => (RuleGroup::Stable, rules::pylint::rules::UnexpectedSpecialMethodSignature),
         (Pylint, "E0307") => (RuleGroup::Stable, rules::pylint::rules::InvalidStrReturnType),
         (Pylint, "E0604") => (RuleGroup::Stable, rules::pylint::rules::InvalidAllObject),
         (Pylint, "E0605") => (RuleGroup::Stable, rules::pylint::rules::InvalidAllFormat),
+        (Pylint, "E0643") => (RuleGroup::Preview, rules::pylint::rules::PotentialIndexError),
         (Pylint, "E0704") => (RuleGroup::Preview, rules::pylint::rules::MisplacedBareRaise),
         (Pylint, "E1132") => (RuleGroup::Preview, rules::pylint::rules::RepeatedKeywordArgument),
         (Pylint, "E1142") => (RuleGroup::Stable, rules::pylint::rules::AwaitOutsideAsync),
@@ -259,10 +266,11 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pylint, "R0916") => (RuleGroup::Preview, rules::pylint::rules::TooManyBooleanExpressions),
         (Pylint, "R0917") => (RuleGroup::Preview, rules::pylint::rules::TooManyPositional),
         (Pylint, "R1701") => (RuleGroup::Stable, rules::pylint::rules::RepeatedIsinstanceCalls),
+        (Pylint, "R1702") => (RuleGroup::Preview, rules::pylint::rules::TooManyNestedBlocks),
         (Pylint, "R1704") => (RuleGroup::Preview, rules::pylint::rules::RedefinedArgumentFromLocal),
         (Pylint, "R1711") => (RuleGroup::Stable, rules::pylint::rules::UselessReturn),
         (Pylint, "R1714") => (RuleGroup::Stable, rules::pylint::rules::RepeatedEqualityComparison),
-        (Pylint, "R1706") => (RuleGroup::Preview, rules::pylint::rules::AndOrTernary),
+        (Pylint, "R1706") => (RuleGroup::Removed, rules::pylint::rules::AndOrTernary),
         (Pylint, "R1722") => (RuleGroup::Stable, rules::pylint::rules::SysExitAlias),
         (Pylint, "R1733") => (RuleGroup::Preview, rules::pylint::rules::UnnecessaryDictIndexLookup),
         (Pylint, "R1736") => (RuleGroup::Preview, rules::pylint::rules::UnnecessaryListIndexLookup),
@@ -348,6 +356,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Bugbear, "032") => (RuleGroup::Stable, rules::flake8_bugbear::rules::UnintentionalTypeAnnotation),
         (Flake8Bugbear, "033") => (RuleGroup::Stable, rules::flake8_bugbear::rules::DuplicateValue),
         (Flake8Bugbear, "034") => (RuleGroup::Stable, rules::flake8_bugbear::rules::ReSubPositionalArgs),
+        (Flake8Bugbear, "035") => (RuleGroup::Stable, rules::flake8_bugbear::rules::StaticKeyDictComprehension),
         (Flake8Bugbear, "904") => (RuleGroup::Stable, rules::flake8_bugbear::rules::RaiseWithoutFromInsideExcept),
         (Flake8Bugbear, "905") => (RuleGroup::Stable, rules::flake8_bugbear::rules::ZipWithoutExplicitStrict),
 
@@ -420,8 +429,8 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Annotations, "001") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingTypeFunctionArgument),
         (Flake8Annotations, "002") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingTypeArgs),
         (Flake8Annotations, "003") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingTypeKwargs),
-        (Flake8Annotations, "101") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingTypeSelf),
-        (Flake8Annotations, "102") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingTypeCls),
+        (Flake8Annotations, "101") => (RuleGroup::Deprecated, rules::flake8_annotations::rules::MissingTypeSelf),
+        (Flake8Annotations, "102") => (RuleGroup::Deprecated, rules::flake8_annotations::rules::MissingTypeCls),
         (Flake8Annotations, "201") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingReturnTypeUndocumentedPublicFunction),
         (Flake8Annotations, "202") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingReturnTypePrivateFunction),
         (Flake8Annotations, "204") => (RuleGroup::Stable, rules::flake8_annotations::rules::MissingReturnTypeSpecialMethod),
@@ -696,11 +705,11 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Datetimez, "012") => (RuleGroup::Stable, rules::flake8_datetimez::rules::CallDateFromtimestamp),
 
         // pygrep-hooks
-        (PygrepHooks, "001") => (RuleGroup::Stable, rules::pygrep_hooks::rules::Eval),
-        (PygrepHooks, "002") => (RuleGroup::Stable, rules::pygrep_hooks::rules::DeprecatedLogWarn),
-        (PygrepHooks, "003") => (RuleGroup::Stable, rules::pygrep_hooks::rules::BlanketTypeIgnore),
-        (PygrepHooks, "004") => (RuleGroup::Stable, rules::pygrep_hooks::rules::BlanketNOQA),
-        (PygrepHooks, "005") => (RuleGroup::Stable, rules::pygrep_hooks::rules::InvalidMockAccess),
+        (PygrepHooks, "001") => (RuleGroup::Deprecated, rules::pygrep_hooks::rules::Eval),
+        (PygrepHooks, "002") => (RuleGroup::Deprecated, rules::pygrep_hooks::rules::DeprecatedLogWarn),
+        (PygrepHooks, "003") => (RuleGroup::Deprecated, rules::pygrep_hooks::rules::BlanketTypeIgnore),
+        (PygrepHooks, "004") => (RuleGroup::Deprecated, rules::pygrep_hooks::rules::BlanketNOQA),
+        (PygrepHooks, "005") => (RuleGroup::Deprecated, rules::pygrep_hooks::rules::InvalidMockAccess),
 
         // pandas-vet
         (PandasVet, "002") => (RuleGroup::Stable, rules::pandas_vet::rules::PandasUseOfInplaceArgument),
@@ -838,7 +847,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Tryceratops, "002") => (RuleGroup::Stable, rules::tryceratops::rules::RaiseVanillaClass),
         (Tryceratops, "003") => (RuleGroup::Stable, rules::tryceratops::rules::RaiseVanillaArgs),
         (Tryceratops, "004") => (RuleGroup::Stable, rules::tryceratops::rules::TypeCheckWithoutTypeError),
-        (Tryceratops, "200") => (RuleGroup::Stable, rules::tryceratops::rules::ReraiseNoCause),
+        (Tryceratops, "200") => (RuleGroup::Deprecated, rules::tryceratops::rules::ReraiseNoCause),
         (Tryceratops, "201") => (RuleGroup::Stable, rules::tryceratops::rules::VerboseRaise),
         (Tryceratops, "300") => (RuleGroup::Stable, rules::tryceratops::rules::TryConsiderElse),
         (Tryceratops, "301") => (RuleGroup::Stable, rules::tryceratops::rules::RaiseWithinTry),
@@ -913,7 +922,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Ruff, "008") => (RuleGroup::Stable, rules::ruff::rules::MutableDataclassDefault),
         (Ruff, "009") => (RuleGroup::Stable, rules::ruff::rules::FunctionCallInDataclassDefaultArgument),
         (Ruff, "010") => (RuleGroup::Stable, rules::ruff::rules::ExplicitFStringTypeConversion),
-        (Ruff, "011") => (RuleGroup::Stable, rules::ruff::rules::StaticKeyDictComprehension),
         (Ruff, "012") => (RuleGroup::Stable, rules::ruff::rules::MutableClassDefault),
         (Ruff, "013") => (RuleGroup::Stable, rules::ruff::rules::ImplicitOptional),
         (Ruff, "015") => (RuleGroup::Stable, rules::ruff::rules::UnnecessaryIterableAllocationForFirstElement),
@@ -925,6 +933,10 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Ruff, "020") => (RuleGroup::Preview, rules::ruff::rules::NeverUnion),
         (Ruff, "021") => (RuleGroup::Preview, rules::ruff::rules::ParenthesizeChainedOperators),
         (Ruff, "022") => (RuleGroup::Preview, rules::ruff::rules::UnsortedDunderAll),
+        (Ruff, "023") => (RuleGroup::Preview, rules::ruff::rules::UnsortedDunderSlots),
+        (Ruff, "024") => (RuleGroup::Preview, rules::ruff::rules::MutableFromkeysValue),
+        (Ruff, "025") => (RuleGroup::Preview, rules::ruff::rules::UnnecessaryDictComprehensionForIterable),
+        (Ruff, "026") => (RuleGroup::Preview, rules::ruff::rules::DefaultFactoryKwarg),
         (Ruff, "100") => (RuleGroup::Stable, rules::ruff::rules::UnusedNOQA),
         (Ruff, "200") => (RuleGroup::Stable, rules::ruff::rules::InvalidPyprojectToml),
 

crates/ruff_linter/src/lib.rs

@@ -34,7 +34,7 @@ pub mod packaging;
 pub mod pyproject_toml;
 pub mod registry;
 mod renamer;
-mod rule_redirects;
+pub mod rule_redirects;
 pub mod rule_selector;
 pub mod rules;
 pub mod settings;

crates/ruff_linter/src/linter.rs

@@ -795,6 +795,23 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn test_undefined_name() -> Result<(), NotebookError> {
+        let actual = notebook_path("undefined_name.ipynb");
+        let expected = notebook_path("undefined_name.ipynb");
+        let TestedNotebook {
+            messages,
+            source_notebook,
+            ..
+        } = assert_notebook_path(
+            &actual,
+            expected,
+            &settings::LinterSettings::for_rule(Rule::UndefinedName),
+        )?;
+        assert_messages!(messages, actual, source_notebook);
+        Ok(())
+    }
+
     #[test]
     fn test_json_consistency() -> Result<()> {
         let actual_path = notebook_path("before_fix.ipynb");

crates/ruff_linter/src/registry.rs

@@ -31,7 +31,7 @@ pub enum FromCodeError {
     Unknown,
 }
 
-#[derive(EnumIter, Debug, PartialEq, Eq, Clone, Hash, RuleNamespace)]
+#[derive(EnumIter, Debug, PartialEq, Eq, Clone, Hash, Copy, RuleNamespace)]
 pub enum Linter {
     /// [Pyflakes](https://pypi.org/project/pyflakes/)
     #[prefix = "F"]

crates/ruff_linter/src/rule_redirects.rs

@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use once_cell::sync::Lazy;
 
 /// Returns the redirect target for the given code.
-pub(crate) fn get_redirect_target(code: &str) -> Option<&'static str> {
+pub fn get_redirect_target(code: &str) -> Option<&'static str> {
     REDIRECTS.get(code).copied()
 }
 
@@ -98,5 +98,6 @@ static REDIRECTS: Lazy<HashMap<&'static str, &'static str>> = Lazy::new(|| {
         ("T002", "FIX002"),
         ("T003", "FIX003"),
         ("T004", "FIX004"),
+        ("RUF011", "B035"),
     ])
 });

crates/ruff_linter/src/rule_selector.rs

@@ -8,7 +8,7 @@ use strum_macros::EnumIter;
 use crate::codes::RuleCodePrefix;
 use crate::codes::RuleIter;
 use crate::registry::{Linter, Rule, RuleNamespace};
-use crate::rule_redirects::get_redirect;
+use crate::rule_redirects::{get_redirect, get_redirect_target};
 use crate::settings::types::PreviewMode;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -126,6 +126,41 @@ impl RuleSelector {
             RuleSelector::Linter(l) => (l.common_prefix(), ""),
         }
     }
+
+    /// Parse [`RuleSelector`] from a string; but do not follow redirects.
+    pub fn from_str_no_redirect(s: &str) -> Result<Self, ParseError> {
+        match s {
+            "ALL" => Ok(Self::All),
+            #[allow(deprecated)]
+            "NURSERY" => Ok(Self::Nursery),
+            "C" => Ok(Self::C),
+            "T" => Ok(Self::T),
+            _ => {
+                let (linter, code) =
+                    Linter::parse_code(s).ok_or_else(|| ParseError::Unknown(s.to_string()))?;
+
+                if code.is_empty() {
+                    return Ok(Self::Linter(linter));
+                }
+
+                // Does the selector select a single rule?
+                let prefix = RuleCodePrefix::parse(&linter, code)
+                    .map_err(|_| ParseError::Unknown(s.to_string()))?;
+
+                if is_single_rule_selector(&prefix) {
+                    Ok(Self::Rule {
+                        prefix,
+                        redirected_from: None,
+                    })
+                } else {
+                    Ok(Self::Prefix {
+                        prefix,
+                        redirected_from: None,
+                    })
+                }
+            }
+        }
+    }
 }
 
 impl Serialize for RuleSelector {
@@ -172,7 +207,7 @@ impl Visitor<'_> for SelectorVisitor {
 }
 
 impl RuleSelector {
-    /// Return all matching rules, regardless of whether they're in preview.
+    /// Return all matching rules, regardless of rule group filters like preview and deprecated.
     pub fn all_rules(&self) -> impl Iterator<Item = Rule> + '_ {
         match self {
             RuleSelector::All => RuleSelectorIter::All(Rule::iter()),
@@ -198,21 +233,52 @@ impl RuleSelector {
         }
     }
 
-    /// Returns rules matching the selector, taking into account preview options enabled.
+    /// Returns rules matching the selector, taking into account rule groups like preview and deprecated.
     pub fn rules<'a>(&'a self, preview: &PreviewOptions) -> impl Iterator<Item = Rule> + 'a {
         let preview_enabled = preview.mode.is_enabled();
         let preview_require_explicit = preview.require_explicit;
         #[allow(deprecated)]
         self.all_rules().filter(move |rule| {
-            // Always include rules that are not in preview or the nursery
-            !(rule.is_preview() || rule.is_nursery())
+            // Always include stable rules
+            rule.is_stable()
             // Backwards compatibility allows selection of nursery rules by exact code or dedicated group
-            || ((matches!(self, RuleSelector::Rule { .. }) || matches!(self, RuleSelector::Nursery { .. })) && rule.is_nursery())
+            || ((self.is_exact() || matches!(self, RuleSelector::Nursery { .. })) && rule.is_nursery())
             // Enabling preview includes all preview or nursery rules unless explicit selection
             // is turned on
-            || (preview_enabled && (matches!(self, RuleSelector::Rule { .. }) || !preview_require_explicit))
+            || ((rule.is_preview() || rule.is_nursery()) && preview_enabled && (self.is_exact() || !preview_require_explicit))
+            // Deprecated rules are excluded in preview mode unless explicitly selected
+            || (rule.is_deprecated() && (!preview_enabled || self.is_exact()))
+            // Removed rules are included if explicitly selected but will error downstream
+            || (rule.is_removed() && self.is_exact())
         })
     }
+
+    /// Returns the selector string that this selector is a redirect of (if any)
+    ///
+    /// # Panics
+    ///
+    /// If a redirect is not a valid rule selector
+    pub fn redirected_from(&self) -> Option<RuleSelector> {
+        match self {
+            Self::Rule {
+                prefix: _,
+                redirected_from,
+            }
+            | Self::Prefix {
+                prefix: _,
+                redirected_from,
+            } => redirected_from.map(|literal| {
+                RuleSelector::from_str_no_redirect(literal)
+                    .expect("Redirects should always be valid selectors")
+            }),
+            _ => None,
+        }
+    }
+
+    /// Returns true if this selector is exact i.e. selects a single rule by code
+    pub fn is_exact(&self) -> bool {
+        matches!(self, Self::Rule { .. })
+    }
 }
 
 pub enum RuleSelectorIter {
@@ -245,6 +311,8 @@ pub struct PreviewOptions {
 
 #[cfg(feature = "schemars")]
 mod schema {
+    use std::str::FromStr;
+
     use itertools::Itertools;
     use schemars::JsonSchema;
     use schemars::_serde_json::Value;
@@ -267,7 +335,6 @@ mod schema {
                     [
                         // Include the non-standard "ALL" and "NURSERY" selectors.
                         "ALL".to_string(),
-                        "NURSERY".to_string(),
                         // Include the legacy "C" and "T" selectors.
                         "C".to_string(),
                         "T".to_string(),
@@ -289,6 +356,16 @@ mod schema {
                                 (!prefix.is_empty()).then(|| prefix.to_string())
                             })),
                     )
+                    .filter(|p| {
+                        // Exclude any prefixes where all of the rules are removed
+                        if let Ok(Self::Rule { prefix, .. } | Self::Prefix { prefix, .. }) =
+                            RuleSelector::from_str(p)
+                        {
+                            !prefix.rules().all(|rule| rule.is_removed())
+                        } else {
+                            true
+                        }
+                    })
                     .sorted()
                     .map(Value::String)
                     .collect(),

crates/ruff_linter/src/rules/eradicate/rules/commented_out_code.rs

@@ -1,4 +1,4 @@
-use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix};
+use ruff_diagnostics::{Diagnostic, Edit, Fix, FixAvailability, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_index::Indexer;
 use ruff_source_file::Locator;
@@ -24,20 +24,22 @@ use super::super::detection::comment_contains_code;
 /// ```
 ///
 /// ## Options
-/// - `task-tags`
+/// - `lint.task-tags`
 ///
 /// [#4845]: https://github.com/astral-sh/ruff/issues/4845
 #[violation]
 pub struct CommentedOutCode;
 
-impl AlwaysFixableViolation for CommentedOutCode {
+impl Violation for CommentedOutCode {
+    const FIX_AVAILABILITY: FixAvailability = FixAvailability::None;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         format!("Found commented-out code")
     }
 
-    fn fix_title(&self) -> String {
-        "Remove commented-out code".to_string()
+    fn fix_title(&self) -> Option<String> {
+        Some(format!("Remove commented-out code"))
     }
 }
 
@@ -65,7 +67,6 @@ pub(crate) fn commented_out_code(
         // Verify that the comment is on its own line, and that it contains code.
         if is_standalone_comment(line) && comment_contains_code(line, &settings.task_tags[..]) {
             let mut diagnostic = Diagnostic::new(CommentedOutCode, *range);
-
             diagnostic.set_fix(Fix::display_only_edit(Edit::range_deletion(
                 locator.full_lines_range(*range),
             )));

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

@@ -111,6 +111,10 @@ impl Violation for MissingTypeKwargs {
     }
 }
 
+/// ## Deprecation
+/// This rule is commonly disabled because type checkers can infer this type without annotation.
+/// It will be removed in a future release.
+///
 /// ## What it does
 /// Checks that instance method `self` arguments have type annotations.
 ///
@@ -148,6 +152,10 @@ impl Violation for MissingTypeSelf {
     }
 }
 
+/// ## Deprecation
+/// This rule is commonly disabled because type checkers can infer this type without annotation.
+/// It will be removed in a future release.
+///
 /// ## What it does
 /// Checks that class method `cls` arguments have type annotations.
 ///

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

@@ -1,8 +1,7 @@
-use ruff_python_ast::ExprCall;
-
 use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{derive_message_formats, violation};
-use ruff_python_ast::call_path::CallPath;
+use ruff_python_ast::{self as ast, Expr};
+use ruff_python_semantic::{analyze, SemanticModel};
 use ruff_text_size::Ranged;
 
 use crate::checkers::ast::Checker;
@@ -41,37 +40,90 @@ impl Violation for OpenSleepOrSubprocessInAsyncFunction {
 }
 
 /// ASYNC101
-pub(crate) fn open_sleep_or_subprocess_call(checker: &mut Checker, call: &ExprCall) {
-    if checker.semantic().in_async_context() {
-        if checker
-            .semantic()
-            .resolve_call_path(call.func.as_ref())
-            .as_ref()
-            .is_some_and(is_open_sleep_or_subprocess_call)
-        {
-            checker.diagnostics.push(Diagnostic::new(
-                OpenSleepOrSubprocessInAsyncFunction,
-                call.func.range(),
-            ));
-        }
+pub(crate) fn open_sleep_or_subprocess_call(checker: &mut Checker, call: &ast::ExprCall) {
+    if !checker.semantic().in_async_context() {
+        return;
+    }
+
+    if is_open_sleep_or_subprocess_call(&call.func, checker.semantic())
+        || is_open_call_from_pathlib(call.func.as_ref(), checker.semantic())
+    {
+        checker.diagnostics.push(Diagnostic::new(
+            OpenSleepOrSubprocessInAsyncFunction,
+            call.func.range(),
+        ));
     }
 }
 
-fn is_open_sleep_or_subprocess_call(call_path: &CallPath) -> bool {
-    matches!(
-        call_path.as_slice(),
-        ["", "open"]
-            | ["time", "sleep"]
-            | [
-                "subprocess",
-                "run"
-                    | "Popen"
-                    | "call"
-                    | "check_call"
-                    | "check_output"
-                    | "getoutput"
-                    | "getstatusoutput"
-            ]
-            | ["os", "wait" | "wait3" | "wait4" | "waitid" | "waitpid"]
-    )
+/// Returns `true` if the expression resolves to a blocking call, like `time.sleep` or
+/// `subprocess.run`.
+fn is_open_sleep_or_subprocess_call(func: &Expr, semantic: &SemanticModel) -> bool {
+    semantic.resolve_call_path(func).is_some_and(|call_path| {
+        matches!(
+            call_path.as_slice(),
+            ["", "open"]
+                | ["time", "sleep"]
+                | [
+                    "subprocess",
+                    "run"
+                        | "Popen"
+                        | "call"
+                        | "check_call"
+                        | "check_output"
+                        | "getoutput"
+                        | "getstatusoutput"
+                ]
+                | ["os", "wait" | "wait3" | "wait4" | "waitid" | "waitpid"]
+        )
+    })
+}
+
+/// Returns `true` if an expression resolves to a call to `pathlib.Path.open`.
+fn is_open_call_from_pathlib(func: &Expr, semantic: &SemanticModel) -> bool {
+    let Expr::Attribute(ast::ExprAttribute { attr, value, .. }) = func else {
+        return false;
+    };
+
+    if attr.as_str() != "open" {
+        return false;
+    }
+
+    // First: is this an inlined call to `pathlib.Path.open`?
+    // ```python
+    // from pathlib import Path
+    // Path("foo").open()
+    // ```
+    if let Expr::Call(call) = value.as_ref() {
+        let Some(call_path) = semantic.resolve_call_path(call.func.as_ref()) else {
+            return false;
+        };
+        if call_path.as_slice() == ["pathlib", "Path"] {
+            return true;
+        }
+    }
+
+    // Second, is this a call to `pathlib.Path.open` via a variable?
+    // ```python
+    // from pathlib import Path
+    // path = Path("foo")
+    // path.open()
+    // ```
+    let Expr::Name(name) = value.as_ref() else {
+        return false;
+    };
+
+    let Some(binding_id) = semantic.resolve_name(name) else {
+        return false;
+    };
+
+    let binding = semantic.binding(binding_id);
+
+    let Some(Expr::Call(call)) = analyze::typing::find_binding_value(&name.id, binding, semantic)
+    else {
+        return false;
+    };
+
+    semantic
+        .resolve_call_path(call.func.as_ref())
+        .is_some_and(|call_path| call_path.as_slice() == ["pathlib", "Path"])
 }

crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linter__rules__flake8_async__tests__ASYNC101_ASYNC101.py.snap

@@ -1,45 +1,83 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_async/mod.rs
 ---
-ASYNC101.py:7:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
-  |
-6 | async def foo():
-7 |     open("foo")
-  |     ^^^^ ASYNC101
-  |
-
-ASYNC101.py:11:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+ASYNC101.py:10:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
    |
-10 | async def foo():
-11 |     time.sleep(1)
+ 9 | async def func():
+10 |     open("foo")
+   |     ^^^^ ASYNC101
+   |
+
+ASYNC101.py:14:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+   |
+13 | async def func():
+14 |     time.sleep(1)
    |     ^^^^^^^^^^ ASYNC101
    |
 
-ASYNC101.py:15:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+ASYNC101.py:18:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
    |
-14 | async def foo():
-15 |     subprocess.run("foo")
+17 | async def func():
+18 |     subprocess.run("foo")
    |     ^^^^^^^^^^^^^^ ASYNC101
    |
 
-ASYNC101.py:19:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+ASYNC101.py:22:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
    |
-18 | async def foo():
-19 |     subprocess.call("foo")
+21 | async def func():
+22 |     subprocess.call("foo")
    |     ^^^^^^^^^^^^^^^ ASYNC101
    |
 
-ASYNC101.py:27:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+ASYNC101.py:30:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
    |
-26 | async def foo():
-27 |     os.wait4(10)
+29 | async def func():
+30 |     os.wait4(10)
    |     ^^^^^^^^ ASYNC101
    |
 
-ASYNC101.py:31:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+ASYNC101.py:34:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
    |
-30 | async def foo():
-31 |     os.wait(12)
+33 | async def func():
+34 |     os.wait(12)
+   |     ^^^^^^^ ASYNC101
+   |
+
+ASYNC101.py:41:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+   |
+40 | async def func():
+41 |     Path("foo").open()  # ASYNC101
+   |     ^^^^^^^^^^^^^^^^ ASYNC101
+   |
+
+ASYNC101.py:46:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+   |
+44 | async def func():
+45 |     p = Path("foo")
+46 |     p.open()  # ASYNC101
+   |     ^^^^^^ ASYNC101
+   |
+
+ASYNC101.py:50:10: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+   |
+49 | async def func():
+50 |     with Path("foo").open() as f:  # ASYNC101
+   |          ^^^^^^^^^^^^^^^^ ASYNC101
+51 |         pass
+   |
+
+ASYNC101.py:58:9: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+   |
+57 |     async def bar():
+58 |         p.open()  # ASYNC101
+   |         ^^^^^^ ASYNC101
+   |
+
+ASYNC101.py:64:5: ASYNC101 Async functions should not call `open`, `time.sleep`, or `subprocess` methods
+   |
+62 |     (p1, p2) = (Path("foo"), Path("bar"))
+63 | 
+64 |     p1.open()  # ASYNC101
    |     ^^^^^^^ ASYNC101
    |
 

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

@@ -12,7 +12,7 @@ mod tests {
 
     use crate::assert_messages;
     use crate::registry::Rule;
-    use crate::settings::types::PreviewMode;
+
     use crate::settings::LinterSettings;
     use crate::test::test_path;
 
@@ -34,7 +34,6 @@ mod tests {
     #[test_case(Rule::GetAttrWithConstant, Path::new("B009_B010.py"))]
     #[test_case(Rule::JumpStatementInFinally, Path::new("B012.py"))]
     #[test_case(Rule::LoopVariableOverridesIterator, Path::new("B020.py"))]
-    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_B008.py"))]
     #[test_case(Rule::MutableArgumentDefault, Path::new("B006_1.py"))]
     #[test_case(Rule::MutableArgumentDefault, Path::new("B006_2.py"))]
     #[test_case(Rule::MutableArgumentDefault, Path::new("B006_3.py"))]
@@ -42,6 +41,7 @@ mod tests {
     #[test_case(Rule::MutableArgumentDefault, Path::new("B006_5.py"))]
     #[test_case(Rule::MutableArgumentDefault, Path::new("B006_6.py"))]
     #[test_case(Rule::MutableArgumentDefault, Path::new("B006_7.py"))]
+    #[test_case(Rule::MutableArgumentDefault, Path::new("B006_B008.py"))]
     #[test_case(Rule::NoExplicitStacklevel, Path::new("B028.py"))]
     #[test_case(Rule::RaiseLiteral, Path::new("B016.py"))]
     #[test_case(Rule::RaiseWithoutFromInsideExcept, Path::new("B904.py"))]
@@ -50,16 +50,17 @@ mod tests {
     #[test_case(Rule::ReuseOfGroupbyGenerator, Path::new("B031.py"))]
     #[test_case(Rule::SetAttrWithConstant, Path::new("B009_B010.py"))]
     #[test_case(Rule::StarArgUnpackingAfterKeywordArg, Path::new("B026.py"))]
+    #[test_case(Rule::StaticKeyDictComprehension, Path::new("B035.py"))]
     #[test_case(Rule::StripWithMultiCharacters, Path::new("B005.py"))]
     #[test_case(Rule::UnaryPrefixIncrementDecrement, Path::new("B002.py"))]
     #[test_case(Rule::UnintentionalTypeAnnotation, Path::new("B032.py"))]
     #[test_case(Rule::UnreliableCallableCheck, Path::new("B004.py"))]
     #[test_case(Rule::UnusedLoopControlVariable, Path::new("B007.py"))]
-    #[test_case(Rule::UselessComparison, Path::new("B015.py"))]
     #[test_case(Rule::UselessComparison, Path::new("B015.ipynb"))]
+    #[test_case(Rule::UselessComparison, Path::new("B015.py"))]
     #[test_case(Rule::UselessContextlibSuppress, Path::new("B022.py"))]
-    #[test_case(Rule::UselessExpression, Path::new("B018.py"))]
     #[test_case(Rule::UselessExpression, Path::new("B018.ipynb"))]
+    #[test_case(Rule::UselessExpression, Path::new("B018.py"))]
     fn rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(
@@ -70,24 +71,6 @@ mod tests {
         Ok(())
     }
 
-    #[test_case(Rule::DuplicateValue, Path::new("B033.py"))]
-    fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
-        let snapshot = format!(
-            "preview__{}_{}",
-            rule_code.noqa_code(),
-            path.to_string_lossy()
-        );
-        let diagnostics = test_path(
-            Path::new("flake8_bugbear").join(path).as_path(),
-            &LinterSettings {
-                preview: PreviewMode::Enabled,
-                ..LinterSettings::for_rule(rule_code)
-            },
-        )?;
-        assert_messages!(snapshot, diagnostics);
-        Ok(())
-    }
-
     #[test]
     fn zip_without_explicit_strict() -> Result<()> {
         let snapshot = "B905.py";

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

@@ -61,11 +61,9 @@ pub(crate) fn duplicate_value(checker: &mut Checker, set: &ast::ExprSet) {
                     elt.range(),
                 );
 
-                if checker.settings.preview.is_enabled() {
-                    diagnostic.try_set_fix(|| {
-                        remove_member(set, index, checker.locator().contents()).map(Fix::safe_edit)
-                    });
-                }
+                diagnostic.try_set_fix(|| {
+                    remove_member(set, index, checker.locator().contents()).map(Fix::safe_edit)
+                });
 
                 checker.diagnostics.push(diagnostic);
             }

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

@@ -23,11 +23,11 @@ use crate::checkers::ast::Checker;
 /// calls to the function, which can lead to unexpected behaviour.
 ///
 /// Calls can be marked as an exception to this rule with the
-/// [`flake8-bugbear.extend-immutable-calls`] configuration option.
+/// [`lint.flake8-bugbear.extend-immutable-calls`] configuration option.
 ///
 /// Arguments with immutable type annotations will be ignored by this rule.
 /// Types outside of the standard library can be marked as immutable with the
-/// [`flake8-bugbear.extend-immutable-calls`] configuration option as well.
+/// [`lint.flake8-bugbear.extend-immutable-calls`] configuration option as well.
 ///
 /// ## Example
 /// ```python
@@ -61,7 +61,7 @@ use crate::checkers::ast::Checker;
 /// ```
 ///
 /// ## Options
-/// - `flake8-bugbear.extend-immutable-calls`
+/// - `lint.flake8-bugbear.extend-immutable-calls`
 #[violation]
 pub struct FunctionCallInDefaultArgument {
     name: Option<String>,

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

@@ -22,6 +22,7 @@ pub(crate) use redundant_tuple_in_exception_handler::*;
 pub(crate) use reuse_of_groupby_generator::*;
 pub(crate) use setattr_with_constant::*;
 pub(crate) use star_arg_unpacking_after_keyword_arg::*;
+pub(crate) use static_key_dict_comprehension::*;
 pub(crate) use strip_with_multi_characters::*;
 pub(crate) use unary_prefix_increment_decrement::*;
 pub(crate) use unintentional_type_annotation::*;
@@ -56,6 +57,7 @@ mod redundant_tuple_in_exception_handler;
 mod reuse_of_groupby_generator;
 mod setattr_with_constant;
 mod star_arg_unpacking_after_keyword_arg;
+mod static_key_dict_comprehension;
 mod strip_with_multi_characters;
 mod unary_prefix_increment_decrement;
 mod unintentional_type_annotation;

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

@@ -28,7 +28,7 @@ use crate::checkers::ast::Checker;
 ///
 /// Arguments with immutable type annotations will be ignored by this rule.
 /// Types outside of the standard library can be marked as immutable with the
-/// [`flake8-bugbear.extend-immutable-calls`] configuration option.
+/// [`lint.flake8-bugbear.extend-immutable-calls`] configuration option.
 ///
 /// ## Known problems
 /// Mutable argument defaults can be used intentionally to cache computation
@@ -61,7 +61,7 @@ use crate::checkers::ast::Checker;
 /// ```
 ///
 /// ## Options
-/// - `flake8-bugbear.extend-immutable-calls`
+/// - `lint.flake8-bugbear.extend-immutable-calls`
 ///
 /// ## References
 /// - [Python documentation: Default Argument Values](https://docs.python.org/3/tutorial/controlflow.html#default-argument-values)

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B033_B033.py.snap

@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
 ---
-B033.py:4:35: B033 Sets should not contain duplicate item `"value1"`
+B033.py:4:35: B033 [*] Sets should not contain duplicate item `"value1"`
   |
 2 | # Errors.
 3 | ###
@@ -12,7 +12,17 @@ B033.py:4:35: B033 Sets should not contain duplicate item `"value1"`
   |
   = help: Remove duplicate item
 
-B033.py:5:21: B033 Sets should not contain duplicate item `1`
+ℹ Safe fix
+1 1 | ###
+2 2 | # Errors.
+3 3 | ###
+4   |-incorrect_set = {"value1", 23, 5, "value1"}
+  4 |+incorrect_set = {"value1", 23, 5}
+5 5 | incorrect_set = {1, 1, 2}
+6 6 | incorrect_set_multiline = {
+7 7 |     "value1",
+
+B033.py:5:21: B033 [*] Sets should not contain duplicate item `1`
   |
 3 | ###
 4 | incorrect_set = {"value1", 23, 5, "value1"}
@@ -23,7 +33,17 @@ B033.py:5:21: B033 Sets should not contain duplicate item `1`
   |
   = help: Remove duplicate item
 
-B033.py:10:5: B033 Sets should not contain duplicate item `"value1"`
+ℹ Safe fix
+2 2 | # Errors.
+3 3 | ###
+4 4 | incorrect_set = {"value1", 23, 5, "value1"}
+5   |-incorrect_set = {1, 1, 2}
+  5 |+incorrect_set = {1, 2}
+6 6 | incorrect_set_multiline = {
+7 7 |     "value1",
+8 8 |     23,
+
+B033.py:10:5: B033 [*] Sets should not contain duplicate item `"value1"`
    |
  8 |     23,
  9 |     5,
@@ -34,7 +54,16 @@ B033.py:10:5: B033 Sets should not contain duplicate item `"value1"`
    |
    = help: Remove duplicate item
 
-B033.py:13:21: B033 Sets should not contain duplicate item `1`
+ℹ Safe fix
+7  7  |     "value1",
+8  8  |     23,
+9  9  |     5,
+10    |-    "value1",
+11 10 |     # B033
+12 11 | }
+13 12 | incorrect_set = {1, 1}
+
+B033.py:13:21: B033 [*] Sets should not contain duplicate item `1`
    |
 11 |     # B033
 12 | }
@@ -45,7 +74,17 @@ B033.py:13:21: B033 Sets should not contain duplicate item `1`
    |
    = help: Remove duplicate item
 
-B033.py:14:21: B033 Sets should not contain duplicate item `1`
+ℹ Safe fix
+10 10 |     "value1",
+11 11 |     # B033
+12 12 | }
+13    |-incorrect_set = {1, 1}
+   13 |+incorrect_set = {1}
+14 14 | incorrect_set = {1, 1,}
+15 15 | incorrect_set = {0, 1, 1,}
+16 16 | incorrect_set = {0, 1, 1}
+
+B033.py:14:21: B033 [*] Sets should not contain duplicate item `1`
    |
 12 | }
 13 | incorrect_set = {1, 1}
@@ -56,7 +95,17 @@ B033.py:14:21: B033 Sets should not contain duplicate item `1`
    |
    = help: Remove duplicate item
 
-B033.py:15:24: B033 Sets should not contain duplicate item `1`
+ℹ Safe fix
+11 11 |     # B033
+12 12 | }
+13 13 | incorrect_set = {1, 1}
+14    |-incorrect_set = {1, 1,}
+   14 |+incorrect_set = {1,}
+15 15 | incorrect_set = {0, 1, 1,}
+16 16 | incorrect_set = {0, 1, 1}
+17 17 | incorrect_set = {
+
+B033.py:15:24: B033 [*] Sets should not contain duplicate item `1`
    |
 13 | incorrect_set = {1, 1}
 14 | incorrect_set = {1, 1,}
@@ -67,7 +116,17 @@ B033.py:15:24: B033 Sets should not contain duplicate item `1`
    |
    = help: Remove duplicate item
 
-B033.py:16:24: B033 Sets should not contain duplicate item `1`
+ℹ Safe fix
+12 12 | }
+13 13 | incorrect_set = {1, 1}
+14 14 | incorrect_set = {1, 1,}
+15    |-incorrect_set = {0, 1, 1,}
+   15 |+incorrect_set = {0, 1,}
+16 16 | incorrect_set = {0, 1, 1}
+17 17 | incorrect_set = {
+18 18 |     0,
+
+B033.py:16:24: B033 [*] Sets should not contain duplicate item `1`
    |
 14 | incorrect_set = {1, 1,}
 15 | incorrect_set = {0, 1, 1,}
@@ -78,7 +137,17 @@ B033.py:16:24: B033 Sets should not contain duplicate item `1`
    |
    = help: Remove duplicate item
 
-B033.py:20:5: B033 Sets should not contain duplicate item `1`
+ℹ Safe fix
+13 13 | incorrect_set = {1, 1}
+14 14 | incorrect_set = {1, 1,}
+15 15 | incorrect_set = {0, 1, 1,}
+16    |-incorrect_set = {0, 1, 1}
+   16 |+incorrect_set = {0, 1}
+17 17 | incorrect_set = {
+18 18 |     0,
+19 19 |     1,
+
+B033.py:20:5: B033 [*] Sets should not contain duplicate item `1`
    |
 18 |     0,
 19 |     1,
@@ -88,4 +157,13 @@ B033.py:20:5: B033 Sets should not contain duplicate item `1`
    |
    = help: Remove duplicate item
 
+ℹ Safe fix
+17 17 | incorrect_set = {
+18 18 |     0,
+19 19 |     1,
+20    |-    1,
+21 20 | }
+22 21 | 
+23 22 | ###
+
 

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__B035_B035.py.snap

@@ -1,90 +1,90 @@
 ---
-source: crates/ruff_linter/src/rules/ruff/mod.rs
+source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
 ---
-RUF011.py:17:2: RUF011 Dictionary comprehension uses static key: `"key"`
+B035.py:17:2: B035 Dictionary comprehension uses static key: `"key"`
    |
 16 | # Errors
 17 | {"key": value.upper() for value in data}
-   |  ^^^^^ RUF011
+   |  ^^^^^ B035
 18 | {True: value.upper() for value in data}
 19 | {0: value.upper() for value in data}
    |
 
-RUF011.py:18:2: RUF011 Dictionary comprehension uses static key: `True`
+B035.py:18:2: B035 Dictionary comprehension uses static key: `True`
    |
 16 | # Errors
 17 | {"key": value.upper() for value in data}
 18 | {True: value.upper() for value in data}
-   |  ^^^^ RUF011
+   |  ^^^^ B035
 19 | {0: value.upper() for value in data}
 20 | {(1, "a"): value.upper() for value in data}  # Constant tuple
    |
 
-RUF011.py:19:2: RUF011 Dictionary comprehension uses static key: `0`
+B035.py:19:2: B035 Dictionary comprehension uses static key: `0`
    |
 17 | {"key": value.upper() for value in data}
 18 | {True: value.upper() for value in data}
 19 | {0: value.upper() for value in data}
-   |  ^ RUF011
+   |  ^ B035
 20 | {(1, "a"): value.upper() for value in data}  # Constant tuple
 21 | {constant: value.upper() for value in data}
    |
 
-RUF011.py:20:2: RUF011 Dictionary comprehension uses static key: `(1, "a")`
+B035.py:20:2: B035 Dictionary comprehension uses static key: `(1, "a")`
    |
 18 | {True: value.upper() for value in data}
 19 | {0: value.upper() for value in data}
 20 | {(1, "a"): value.upper() for value in data}  # Constant tuple
-   |  ^^^^^^^^ RUF011
+   |  ^^^^^^^^ B035
 21 | {constant: value.upper() for value in data}
 22 | {constant + constant: value.upper() for value in data}
    |
 
-RUF011.py:21:2: RUF011 Dictionary comprehension uses static key: `constant`
+B035.py:21:2: B035 Dictionary comprehension uses static key: `constant`
    |
 19 | {0: value.upper() for value in data}
 20 | {(1, "a"): value.upper() for value in data}  # Constant tuple
 21 | {constant: value.upper() for value in data}
-   |  ^^^^^^^^ RUF011
+   |  ^^^^^^^^ B035
 22 | {constant + constant: value.upper() for value in data}
 23 | {constant.attribute: value.upper() for value in data}
    |
 
-RUF011.py:22:2: RUF011 Dictionary comprehension uses static key: `constant + constant`
+B035.py:22:2: B035 Dictionary comprehension uses static key: `constant + constant`
    |
 20 | {(1, "a"): value.upper() for value in data}  # Constant tuple
 21 | {constant: value.upper() for value in data}
 22 | {constant + constant: value.upper() for value in data}
-   |  ^^^^^^^^^^^^^^^^^^^ RUF011
+   |  ^^^^^^^^^^^^^^^^^^^ B035
 23 | {constant.attribute: value.upper() for value in data}
 24 | {constant[0]: value.upper() for value in data}
    |
 
-RUF011.py:23:2: RUF011 Dictionary comprehension uses static key: `constant.attribute`
+B035.py:23:2: B035 Dictionary comprehension uses static key: `constant.attribute`
    |
 21 | {constant: value.upper() for value in data}
 22 | {constant + constant: value.upper() for value in data}
 23 | {constant.attribute: value.upper() for value in data}
-   |  ^^^^^^^^^^^^^^^^^^ RUF011
+   |  ^^^^^^^^^^^^^^^^^^ B035
 24 | {constant[0]: value.upper() for value in data}
 25 | {tokens: token for token in tokens}
    |
 
-RUF011.py:24:2: RUF011 Dictionary comprehension uses static key: `constant[0]`
+B035.py:24:2: B035 Dictionary comprehension uses static key: `constant[0]`
    |
 22 | {constant + constant: value.upper() for value in data}
 23 | {constant.attribute: value.upper() for value in data}
 24 | {constant[0]: value.upper() for value in data}
-   |  ^^^^^^^^^^^ RUF011
+   |  ^^^^^^^^^^^ B035
 25 | {tokens: token for token in tokens}
    |
 
-RUF011.py:25:2: RUF011 Dictionary comprehension uses static key: `tokens`
+B035.py:25:2: B035 Dictionary comprehension uses static key: `tokens`
    |
 23 | {constant.attribute: value.upper() for value in data}
 24 | {constant[0]: value.upper() for value in data}
 25 | {tokens: token for token in tokens}
-   |  ^^^^^^ RUF011
+   |  ^^^^^^ B035
    |
 
 

crates/ruff_linter/src/rules/flake8_bugbear/snapshots/ruff_linter__rules__flake8_bugbear__tests__preview__B033_B033.py.snap

@@ -1,169 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_bugbear/mod.rs
----
-B033.py:4:35: B033 [*] Sets should not contain duplicate item `"value1"`
-  |
-2 | # Errors.
-3 | ###
-4 | incorrect_set = {"value1", 23, 5, "value1"}
-  |                                   ^^^^^^^^ B033
-5 | incorrect_set = {1, 1, 2}
-6 | incorrect_set_multiline = {
-  |
-  = help: Remove duplicate item
-
-ℹ Safe fix
-1 1 | ###
-2 2 | # Errors.
-3 3 | ###
-4   |-incorrect_set = {"value1", 23, 5, "value1"}
-  4 |+incorrect_set = {"value1", 23, 5}
-5 5 | incorrect_set = {1, 1, 2}
-6 6 | incorrect_set_multiline = {
-7 7 |     "value1",
-
-B033.py:5:21: B033 [*] Sets should not contain duplicate item `1`
-  |
-3 | ###
-4 | incorrect_set = {"value1", 23, 5, "value1"}
-5 | incorrect_set = {1, 1, 2}
-  |                     ^ B033
-6 | incorrect_set_multiline = {
-7 |     "value1",
-  |
-  = help: Remove duplicate item
-
-ℹ Safe fix
-2 2 | # Errors.
-3 3 | ###
-4 4 | incorrect_set = {"value1", 23, 5, "value1"}
-5   |-incorrect_set = {1, 1, 2}
-  5 |+incorrect_set = {1, 2}
-6 6 | incorrect_set_multiline = {
-7 7 |     "value1",
-8 8 |     23,
-
-B033.py:10:5: B033 [*] Sets should not contain duplicate item `"value1"`
-   |
- 8 |     23,
- 9 |     5,
-10 |     "value1",
-   |     ^^^^^^^^ B033
-11 |     # B033
-12 | }
-   |
-   = help: Remove duplicate item
-
-ℹ Safe fix
-7  7  |     "value1",
-8  8  |     23,
-9  9  |     5,
-10    |-    "value1",
-11 10 |     # B033
-12 11 | }
-13 12 | incorrect_set = {1, 1}
-
-B033.py:13:21: B033 [*] Sets should not contain duplicate item `1`
-   |
-11 |     # B033
-12 | }
-13 | incorrect_set = {1, 1}
-   |                     ^ B033
-14 | incorrect_set = {1, 1,}
-15 | incorrect_set = {0, 1, 1,}
-   |
-   = help: Remove duplicate item
-
-ℹ Safe fix
-10 10 |     "value1",
-11 11 |     # B033
-12 12 | }
-13    |-incorrect_set = {1, 1}
-   13 |+incorrect_set = {1}
-14 14 | incorrect_set = {1, 1,}
-15 15 | incorrect_set = {0, 1, 1,}
-16 16 | incorrect_set = {0, 1, 1}
-
-B033.py:14:21: B033 [*] Sets should not contain duplicate item `1`
-   |
-12 | }
-13 | incorrect_set = {1, 1}
-14 | incorrect_set = {1, 1,}
-   |                     ^ B033
-15 | incorrect_set = {0, 1, 1,}
-16 | incorrect_set = {0, 1, 1}
-   |
-   = help: Remove duplicate item
-
-ℹ Safe fix
-11 11 |     # B033
-12 12 | }
-13 13 | incorrect_set = {1, 1}
-14    |-incorrect_set = {1, 1,}
-   14 |+incorrect_set = {1,}
-15 15 | incorrect_set = {0, 1, 1,}
-16 16 | incorrect_set = {0, 1, 1}
-17 17 | incorrect_set = {
-
-B033.py:15:24: B033 [*] Sets should not contain duplicate item `1`
-   |
-13 | incorrect_set = {1, 1}
-14 | incorrect_set = {1, 1,}
-15 | incorrect_set = {0, 1, 1,}
-   |                        ^ B033
-16 | incorrect_set = {0, 1, 1}
-17 | incorrect_set = {
-   |
-   = help: Remove duplicate item
-
-ℹ Safe fix
-12 12 | }
-13 13 | incorrect_set = {1, 1}
-14 14 | incorrect_set = {1, 1,}
-15    |-incorrect_set = {0, 1, 1,}
-   15 |+incorrect_set = {0, 1,}
-16 16 | incorrect_set = {0, 1, 1}
-17 17 | incorrect_set = {
-18 18 |     0,
-
-B033.py:16:24: B033 [*] Sets should not contain duplicate item `1`
-   |
-14 | incorrect_set = {1, 1,}
-15 | incorrect_set = {0, 1, 1,}
-16 | incorrect_set = {0, 1, 1}
-   |                        ^ B033
-17 | incorrect_set = {
-18 |     0,
-   |
-   = help: Remove duplicate item
-
-ℹ Safe fix
-13 13 | incorrect_set = {1, 1}
-14 14 | incorrect_set = {1, 1,}
-15 15 | incorrect_set = {0, 1, 1,}
-16    |-incorrect_set = {0, 1, 1}
-   16 |+incorrect_set = {0, 1}
-17 17 | incorrect_set = {
-18 18 |     0,
-19 19 |     1,
-
-B033.py:20:5: B033 [*] Sets should not contain duplicate item `1`
-   |
-18 |     0,
-19 |     1,
-20 |     1,
-   |     ^ B033
-21 | }
-   |
-   = help: Remove duplicate item
-
-ℹ Safe fix
-17 17 | incorrect_set = {
-18 18 |     0,
-19 19 |     1,
-20    |-    1,
-21 20 | }
-22 21 | 
-23 22 | ###
-
-

crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_argument_shadowing.rs

@@ -19,7 +19,7 @@ use super::super::helpers::shadows_builtin;
 /// builtin and vice versa.
 ///
 /// Builtins can be marked as exceptions to this rule via the
-/// [`flake8-builtins.builtins-ignorelist`] configuration option.
+/// [`lint.flake8-builtins.builtins-ignorelist`] configuration option.
 ///
 /// ## Example
 /// ```python
@@ -44,7 +44,7 @@ use super::super::helpers::shadows_builtin;
 /// ```
 ///
 /// ## Options
-/// - `flake8-builtins.builtins-ignorelist`
+/// - `lint.flake8-builtins.builtins-ignorelist`
 ///
 /// ## References
 /// - [_Is it bad practice to use a built-in function name as an attribute or method identifier?_](https://stackoverflow.com/questions/9109333/is-it-bad-practice-to-use-a-built-in-function-name-as-an-attribute-or-method-ide)

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

@@ -37,7 +37,7 @@ use crate::rules::flake8_builtins::helpers::shadows_builtin;
 /// ```
 ///
 /// Builtins can be marked as exceptions to this rule via the
-/// [`flake8-builtins.builtins-ignorelist`] configuration option, or
+/// [`lint.flake8-builtins.builtins-ignorelist`] configuration option, or
 /// converted to the appropriate dunder method. Methods decorated with
 /// `@typing.override` or `@typing_extensions.override` are also
 /// ignored.
@@ -55,7 +55,7 @@ use crate::rules::flake8_builtins::helpers::shadows_builtin;
 /// ```
 ///
 /// ## Options
-/// - `flake8-builtins.builtins-ignorelist`
+/// - `lint.flake8-builtins.builtins-ignorelist`
 #[violation]
 pub struct BuiltinAttributeShadowing {
     kind: Kind,

crates/ruff_linter/src/rules/flake8_builtins/rules/builtin_variable_shadowing.rs

@@ -18,7 +18,7 @@ use crate::rules::flake8_builtins::helpers::shadows_builtin;
 /// builtin and vice versa.
 ///
 /// Builtins can be marked as exceptions to this rule via the
-/// [`flake8-builtins.builtins-ignorelist`] configuration option.
+/// [`lint.flake8-builtins.builtins-ignorelist`] configuration option.
 ///
 /// ## Example
 /// ```python
@@ -41,7 +41,7 @@ use crate::rules::flake8_builtins::helpers::shadows_builtin;
 /// ```
 ///
 /// ## Options
-/// - `flake8-builtins.builtins-ignorelist`
+/// - `lint.flake8-builtins.builtins-ignorelist`
 ///
 /// ## References
 /// - [_Why is it a bad idea to name a variable `id` in Python?_](https://stackoverflow.com/questions/77552/id-is-a-bad-variable-name-in-python)

crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE001_1.py.snap

@@ -9,4 +9,3 @@ EXE001_1.py:1:1: EXE001 Shebang is present but file is not executable
 3 | if __name__ == '__main__':
   |
 
-

crates/ruff_linter/src/rules/flake8_executable/snapshots/ruff_linter__rules__flake8_executable__tests__EXE002_1.py.snap

@@ -7,5 +7,3 @@ EXE002_1.py:1:1: EXE002 The file is executable but no shebang is present
   |  EXE002
 2 |     print('I should be executable.')
   |
-
-

crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/implicit.rs

@@ -59,7 +59,7 @@ impl Violation for SingleLineImplicitStringConcatenation {
 ///
 /// By default, this rule will only trigger if the string literal is
 /// concatenated via a backslash. To disallow implicit string concatenation
-/// altogether, set the [`flake8-implicit-str-concat.allow-multiline`] option
+/// altogether, set the [`lint.flake8-implicit-str-concat.allow-multiline`] option
 /// to `false`.
 ///
 /// ## Example
@@ -77,7 +77,7 @@ impl Violation for SingleLineImplicitStringConcatenation {
 /// ```
 ///
 /// ## Options
-/// - `flake8-implicit-str-concat.allow-multiline`
+/// - `lint.flake8-implicit-str-concat.allow-multiline`
 ///
 /// [PEP 8]: https://peps.python.org/pep-0008/#maximum-line-length
 #[violation]

crates/ruff_linter/src/rules/flake8_import_conventions/rules/banned_import_alias.rs

@@ -29,7 +29,7 @@ use ruff_text_size::Ranged;
 /// ```
 ///
 /// ## Options
-/// - `flake8-import-conventions.banned-aliases`
+/// - `lint.flake8-import-conventions.banned-aliases`
 #[violation]
 pub struct BannedImportAlias {
     name: String,

crates/ruff_linter/src/rules/flake8_import_conventions/rules/banned_import_from.rs

@@ -30,7 +30,7 @@ use ruff_text_size::Ranged;
 /// ```
 ///
 /// ## Options
-/// - `flake8-import-conventions.banned-from`
+/// - `lint.flake8-import-conventions.banned-from`
 #[violation]
 pub struct BannedImportFrom {
     name: String,

crates/ruff_linter/src/rules/flake8_import_conventions/rules/unconventional_import_alias.rs

@@ -32,8 +32,8 @@ use crate::renamer::Renamer;
 /// ```
 ///
 /// ## Options
-/// - `flake8-import-conventions.aliases`
-/// - `flake8-import-conventions.extend-aliases`
+/// - `lint.flake8-import-conventions.aliases`
+/// - `lint.flake8-import-conventions.extend-aliases`
 #[violation]
 pub struct UnconventionalImportAlias {
     name: String,

crates/ruff_linter/src/rules/flake8_logging_format/violations.rs

@@ -30,9 +30,9 @@ use ruff_macros::{derive_message_formats, violation};
 /// - Uses of `flask.current_app.logger` (e.g., `from flask import current_app; current_app.logger.info(...)`).
 /// - Objects whose name starts with `log` or ends with `logger` or `logging`,
 ///   when used in the same file in which they are defined (e.g., `logger = logging.getLogger(); logger.info(...)`).
-/// - Imported objects marked as loggers via the [`logger-objects`] setting, which can be
+/// - Imported objects marked as loggers via the [`lint.logger-objects`] setting, which can be
 ///   used to enforce these rules against shared logger objects (e.g., `from module import logger; logger.info(...)`,
-///   when [`logger-objects`] is set to `["module.logger"]`).
+///   when [`lint.logger-objects`] is set to `["module.logger"]`).
 ///
 /// ## Example
 /// ```python
@@ -68,7 +68,7 @@ use ruff_macros::{derive_message_formats, violation};
 /// ```
 ///
 /// ## Options
-/// - `logger-objects`
+/// - `lint.logger-objects`
 ///
 /// ## References
 /// - [Python documentation: `logging`](https://docs.python.org/3/library/logging.html)
@@ -114,9 +114,9 @@ impl Violation for LoggingStringFormat {
 /// - Uses of `flask.current_app.logger` (e.g., `from flask import current_app; current_app.logger.info(...)`).
 /// - Objects whose name starts with `log` or ends with `logger` or `logging`,
 ///   when used in the same file in which they are defined (e.g., `logger = logging.getLogger(); logger.info(...)`).
-/// - Imported objects marked as loggers via the [`logger-objects`] setting, which can be
+/// - Imported objects marked as loggers via the [`lint.logger-objects`] setting, which can be
 ///   used to enforce these rules against shared logger objects (e.g., `from module import logger; logger.info(...)`,
-///   when [`logger-objects`] is set to `["module.logger"]`).
+///   when [`lint.logger-objects`] is set to `["module.logger"]`).
 ///
 /// ## Example
 /// ```python
@@ -152,7 +152,7 @@ impl Violation for LoggingStringFormat {
 /// ```
 ///
 /// ## Options
-/// - `logger-objects`
+/// - `lint.logger-objects`
 ///
 /// ## References
 /// - [Python documentation: `logging`](https://docs.python.org/3/library/logging.html)
@@ -197,9 +197,9 @@ impl Violation for LoggingPercentFormat {
 /// - Uses of `flask.current_app.logger` (e.g., `from flask import current_app; current_app.logger.info(...)`).
 /// - Objects whose name starts with `log` or ends with `logger` or `logging`,
 ///   when used in the same file in which they are defined (e.g., `logger = logging.getLogger(); logger.info(...)`).
-/// - Imported objects marked as loggers via the [`logger-objects`] setting, which can be
+/// - Imported objects marked as loggers via the [`lint.logger-objects`] setting, which can be
 ///   used to enforce these rules against shared logger objects (e.g., `from module import logger; logger.info(...)`,
-///   when [`logger-objects`] is set to `["module.logger"]`).
+///   when [`lint.logger-objects`] is set to `["module.logger"]`).
 ///
 /// ## Example
 /// ```python
@@ -235,7 +235,7 @@ impl Violation for LoggingPercentFormat {
 /// ```
 ///
 /// ## Options
-/// - `logger-objects`
+/// - `lint.logger-objects`
 ///
 /// ## References
 /// - [Python documentation: `logging`](https://docs.python.org/3/library/logging.html)
@@ -279,9 +279,9 @@ impl Violation for LoggingStringConcat {
 /// - Uses of `flask.current_app.logger` (e.g., `from flask import current_app; current_app.logger.info(...)`).
 /// - Objects whose name starts with `log` or ends with `logger` or `logging`,
 ///   when used in the same file in which they are defined (e.g., `logger = logging.getLogger(); logger.info(...)`).
-/// - Imported objects marked as loggers via the [`logger-objects`] setting, which can be
+/// - Imported objects marked as loggers via the [`lint.logger-objects`] setting, which can be
 ///   used to enforce these rules against shared logger objects (e.g., `from module import logger; logger.info(...)`,
-///   when [`logger-objects`] is set to `["module.logger"]`).
+///   when [`lint.logger-objects`] is set to `["module.logger"]`).
 ///
 /// ## Example
 /// ```python
@@ -317,7 +317,7 @@ impl Violation for LoggingStringConcat {
 /// ```
 ///
 /// ## Options
-/// - `logger-objects`
+/// - `lint.logger-objects`
 ///
 /// ## References
 /// - [Python documentation: `logging`](https://docs.python.org/3/library/logging.html)
@@ -349,9 +349,9 @@ impl Violation for LoggingFString {
 /// - Uses of `flask.current_app.logger` (e.g., `from flask import current_app; current_app.logger.info(...)`).
 /// - Objects whose name starts with `log` or ends with `logger` or `logging`,
 ///   when used in the same file in which they are defined (e.g., `logger = logging.getLogger(); logger.info(...)`).
-/// - Imported objects marked as loggers via the [`logger-objects`] setting, which can be
+/// - Imported objects marked as loggers via the [`lint.logger-objects`] setting, which can be
 ///   used to enforce these rules against shared logger objects (e.g., `from module import logger; logger.info(...)`,
-///   when [`logger-objects`] is set to `["module.logger"]`).
+///   when [`lint.logger-objects`] is set to `["module.logger"]`).
 ///
 /// ## Example
 /// ```python
@@ -368,7 +368,7 @@ impl Violation for LoggingFString {
 /// ```
 ///
 /// ## Options
-/// - `logger-objects`
+/// - `lint.logger-objects`
 ///
 /// ## References
 /// - [Python documentation: `logging.warning`](https://docs.python.org/3/library/logging.html#logging.warning)
@@ -409,9 +409,9 @@ impl AlwaysFixableViolation for LoggingWarn {
 /// - Uses of `flask.current_app.logger` (e.g., `from flask import current_app; current_app.logger.info(...)`).
 /// - Objects whose name starts with `log` or ends with `logger` or `logging`,
 ///   when used in the same file in which they are defined (e.g., `logger = logging.getLogger(); logger.info(...)`).
-/// - Imported objects marked as loggers via the [`logger-objects`] setting, which can be
+/// - Imported objects marked as loggers via the [`lint.logger-objects`] setting, which can be
 ///   used to enforce these rules against shared logger objects (e.g., `from module import logger; logger.info(...)`,
-///   when [`logger-objects`] is set to `["module.logger"]`).
+///   when [`lint.logger-objects`] is set to `["module.logger"]`).
 ///
 /// ## Example
 /// ```python
@@ -436,7 +436,7 @@ impl AlwaysFixableViolation for LoggingWarn {
 /// ```
 ///
 /// ## Options
-/// - `logger-objects`
+/// - `lint.logger-objects`
 ///
 /// ## References
 /// - [Python documentation: LogRecord attributes](https://docs.python.org/3/library/logging.html#logrecord-attributes)
@@ -470,9 +470,9 @@ impl Violation for LoggingExtraAttrClash {
 /// - Uses of `flask.current_app.logger` (e.g., `from flask import current_app; current_app.logger.info(...)`).
 /// - Objects whose name starts with `log` or ends with `logger` or `logging`,
 ///   when used in the same file in which they are defined (e.g., `logger = logging.getLogger(); logger.info(...)`).
-/// - Imported objects marked as loggers via the [`logger-objects`] setting, which can be
+/// - Imported objects marked as loggers via the [`lint.logger-objects`] setting, which can be
 ///   used to enforce these rules against shared logger objects (e.g., `from module import logger; logger.info(...)`,
-///   when [`logger-objects`] is set to `["module.logger"]`).
+///   when [`lint.logger-objects`] is set to `["module.logger"]`).
 ///
 /// ## Example
 /// ```python
@@ -495,7 +495,7 @@ impl Violation for LoggingExtraAttrClash {
 /// ```
 ///
 /// ## Options
-/// - `logger-objects`
+/// - `lint.logger-objects`
 ///
 /// ## References
 /// - [Python documentation: `logging.exception`](https://docs.python.org/3/library/logging.html#logging.exception)
@@ -531,9 +531,9 @@ impl Violation for LoggingExcInfo {
 /// - Uses of `flask.current_app.logger` (e.g., `from flask import current_app; current_app.logger.info(...)`).
 /// - Objects whose name starts with `log` or ends with `logger` or `logging`,
 ///   when used in the same file in which they are defined (e.g., `logger = logging.getLogger(); logger.info(...)`).
-/// - Imported objects marked as loggers via the [`logger-objects`] setting, which can be
+/// - Imported objects marked as loggers via the [`lint.logger-objects`] setting, which can be
 ///   used to enforce these rules against shared logger objects (e.g., `from module import logger; logger.info(...)`,
-///   when [`logger-objects`] is set to `["module.logger"]`).
+///   when [`lint.logger-objects`] is set to `["module.logger"]`).
 ///
 /// ## Example
 /// ```python
@@ -556,7 +556,7 @@ impl Violation for LoggingExcInfo {
 /// ```
 ///
 /// ## Options
-/// - `logger-objects`
+/// - `lint.logger-objects`
 ///
 /// ## References
 /// - [Python documentation: `logging.exception`](https://docs.python.org/3/library/logging.html#logging.exception)

crates/ruff_linter/src/rules/flake8_pie/mod.rs

@@ -9,7 +9,6 @@ mod tests {
     use test_case::test_case;
 
     use crate::registry::Rule;
-    use crate::settings::types::PreviewMode;
     use crate::test::test_path;
     use crate::{assert_messages, settings};
 
@@ -31,24 +30,4 @@ mod tests {
         assert_messages!(snapshot, diagnostics);
         Ok(())
     }
-
-    #[test_case(Rule::UnnecessaryPlaceholder, Path::new("PIE790.py"))]
-    #[test_case(Rule::UnnecessarySpread, Path::new("PIE800.py"))]
-    #[test_case(Rule::ReimplementedContainerBuiltin, Path::new("PIE807.py"))]
-    fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
-        let snapshot = format!(
-            "preview__{}_{}",
-            rule_code.noqa_code(),
-            path.to_string_lossy()
-        );
-        let diagnostics = test_path(
-            Path::new("flake8_pie").join(path).as_path(),
-            &settings::LinterSettings {
-                preview: PreviewMode::Enabled,
-                ..settings::LinterSettings::for_rule(rule_code)
-            },
-        )?;
-        assert_messages!(snapshot, diagnostics);
-        Ok(())
-    }
 }

crates/ruff_linter/src/rules/flake8_pie/rules/multiple_starts_ends_with.rs

@@ -3,6 +3,7 @@ use std::iter;
 
 use itertools::Either::{Left, Right};
 
+use ruff_python_semantic::{analyze, SemanticModel};
 use ruff_text_size::{Ranged, TextRange};
 
 use ruff_python_ast::{self as ast, Arguments, BoolOp, Expr, ExprContext, Identifier};
@@ -36,6 +37,14 @@ use crate::checkers::ast::Checker;
 ///     print("Greetings!")
 /// ```
 ///
+/// ## Fix safety
+/// This rule's fix is unsafe, as in some cases, it will be unable to determine
+/// whether the argument to an existing `.startswith` or `.endswith` call is a
+/// tuple. For example, given `msg.startswith(x) or msg.startswith(y)`, if `x`
+/// or `y` is a tuple, and the semantic model is unable to detect it as such,
+/// the rule will suggest `msg.startswith((x, y))`, which will error at
+/// runtime.
+///
 /// ## References
 /// - [Python documentation: `str.startswith`](https://docs.python.org/3/library/stdtypes.html#str.startswith)
 /// - [Python documentation: `str.endswith`](https://docs.python.org/3/library/stdtypes.html#str.endswith)
@@ -84,10 +93,14 @@ pub(crate) fn multiple_starts_ends_with(checker: &mut Checker, expr: &Expr) {
             continue;
         };
 
-        if !(args.len() == 1 && keywords.is_empty()) {
+        if !keywords.is_empty() {
             continue;
         }
 
+        let [arg] = args.as_slice() else {
+            continue;
+        };
+
         let Expr::Attribute(ast::ExprAttribute { value, attr, .. }) = func.as_ref() else {
             continue;
         };
@@ -99,6 +112,13 @@ pub(crate) fn multiple_starts_ends_with(checker: &mut Checker, expr: &Expr) {
             continue;
         };
 
+        // If the argument is bound to a tuple, skip it, since we don't want to suggest
+        // `startswith((x, y))` where `x` or `y` are tuples. (Tuple literals are okay, since we
+        // inline them below.)
+        if is_bound_to_tuple(arg, checker.semantic()) {
+            continue;
+        }
+
         duplicates
             .entry((attr.as_str(), arg_name.as_str()))
             .or_insert_with(Vec::new)
@@ -149,7 +169,7 @@ pub(crate) fn multiple_starts_ends_with(checker: &mut Checker, expr: &Expr) {
                             Right(iter::once(*value))
                         }
                     })
-                    .map(Clone::clone)
+                    .cloned()
                     .collect(),
                 ctx: ExprContext::Load,
                 range: TextRange::default(),
@@ -202,3 +222,18 @@ pub(crate) fn multiple_starts_ends_with(checker: &mut Checker, expr: &Expr) {
         }
     }
 }
+
+/// Returns `true` if the expression definitively resolves to a tuple (e.g., `x` in `x = (1, 2)`).
+fn is_bound_to_tuple(arg: &Expr, semantic: &SemanticModel) -> bool {
+    let Expr::Name(ast::ExprName { id, .. }) = arg else {
+        return false;
+    };
+
+    let Some(binding_id) = semantic.lookup_symbol(id.as_str()) else {
+        return false;
+    };
+
+    let binding = semantic.binding(binding_id);
+
+    analyze::typing::is_tuple(binding, semantic)
+}

crates/ruff_linter/src/rules/flake8_pie/rules/reimplemented_container_builtin.rs

@@ -8,10 +8,7 @@ use ruff_text_size::Ranged;
 use crate::checkers::ast::Checker;
 
 /// ## What it does
-/// Checks for lambdas that can be replaced with the `list` builtin.
-///
-/// In [preview], this rule will also flag lambdas that can be replaced with
-/// the `dict` builtin.
+/// Checks for lambdas that can be replaced with the `list` or `dict` builtins.
 ///
 /// ## Why is this bad?
 /// Using container builtins are more succinct and idiomatic than wrapping
@@ -40,8 +37,6 @@ use crate::checkers::ast::Checker;
 ///
 /// ## References
 /// - [Python documentation: `list`](https://docs.python.org/3/library/functions.html#func-list)
-///
-/// [preview]: https://docs.astral.sh/ruff/preview/
 #[violation]
 pub struct ReimplementedContainerBuiltin {
     container: Container,
@@ -73,11 +68,7 @@ pub(crate) fn reimplemented_container_builtin(checker: &mut Checker, expr: &Expr
     if parameters.is_none() {
         let container = match body.as_ref() {
             Expr::List(ast::ExprList { elts, .. }) if elts.is_empty() => Some(Container::List),
-            Expr::Dict(ast::ExprDict { values, .. })
-                if values.is_empty() & checker.settings.preview.is_enabled() =>
-            {
-                Some(Container::Dict)
-            }
+            Expr::Dict(ast::ExprDict { values, .. }) if values.is_empty() => Some(Container::Dict),
             _ => None,
         };
         if let Some(container) = container {

crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_placeholder.rs

@@ -10,11 +10,8 @@ use crate::checkers::ast::Checker;
 use crate::fix;
 
 /// ## What it does
-/// Checks for unnecessary `pass` statements in functions, classes, and other
-/// blocks.
-///
-/// In [preview], this rule also checks for unnecessary ellipsis (`...`)
-/// literals.
+/// Checks for unnecessary `pass` statements and ellipsis (`...`) literals in
+/// functions, classes, and other blocks.
 ///
 /// ## Why is this bad?
 /// In Python, the `pass` statement and ellipsis (`...`) literal serve as
@@ -40,7 +37,7 @@ use crate::fix;
 ///     """Placeholder docstring."""
 /// ```
 ///
-/// In [preview]:
+/// Or, given:
 /// ```python
 /// def func():
 ///     """Placeholder docstring."""
@@ -55,8 +52,6 @@ use crate::fix;
 ///
 /// ## References
 /// - [Python documentation: The `pass` statement](https://docs.python.org/3/reference/simple_stmts.html#the-pass-statement)
-///
-/// [preview]: https://docs.astral.sh/ruff/preview/
 #[violation]
 pub struct UnnecessaryPlaceholder {
     kind: Placeholder,
@@ -90,10 +85,7 @@ pub(crate) fn unnecessary_placeholder(checker: &mut Checker, body: &[Stmt]) {
     for stmt in body {
         let kind = match stmt {
             Stmt::Pass(_) => Placeholder::Pass,
-            Stmt::Expr(expr)
-                if expr.value.is_ellipsis_literal_expr()
-                    && checker.settings.preview.is_enabled() =>
-            {
+            Stmt::Expr(expr) if expr.value.is_ellipsis_literal_expr() => {
                 // Ellipses are significant in protocol methods and abstract methods. Specifically,
                 // Pyright uses the presence of an ellipsis to indicate that a method is a stub,
                 // rather than a default implementation.

crates/ruff_linter/src/rules/flake8_pie/rules/unnecessary_spread.rs

@@ -55,10 +55,8 @@ pub(crate) fn unnecessary_spread(checker: &mut Checker, dict: &ast::ExprDict) {
             // inside a dict.
             if let Expr::Dict(inner) = value {
                 let mut diagnostic = Diagnostic::new(UnnecessarySpread, value.range());
-                if checker.settings.preview.is_enabled() {
-                    if let Some(fix) = unnecessary_spread_fix(inner, prev_end, checker.locator()) {
-                        diagnostic.set_fix(fix);
-                    }
+                if let Some(fix) = unnecessary_spread_fix(inner, prev_end, checker.locator()) {
+                    diagnostic.set_fix(fix);
                 }
                 checker.diagnostics.push(diagnostic);
             }

crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE790_PIE790.py.snap

@@ -467,6 +467,176 @@ PIE790.py:150:5: PIE790 [*] Unnecessary `pass` statement
 152 151 | 
 153 152 | def foo():
 
+PIE790.py:155:5: PIE790 [*] Unnecessary `...` literal
+    |
+153 | def foo():
+154 |     print("foo")
+155 |     ...
+    |     ^^^ PIE790
+    |
+    = help: Remove unnecessary `...`
+
+ℹ Safe fix
+152 152 | 
+153 153 | def foo():
+154 154 |     print("foo")
+155     |-    ...
+156 155 | 
+157 156 | 
+158 157 | def foo():
+
+PIE790.py:161:5: PIE790 [*] Unnecessary `...` literal
+    |
+159 |     """A docstring."""
+160 |     print("foo")
+161 |     ...
+    |     ^^^ PIE790
+    |
+    = help: Remove unnecessary `...`
+
+ℹ Safe fix
+158 158 | def foo():
+159 159 |     """A docstring."""
+160 160 |     print("foo")
+161     |-    ...
+162 161 | 
+163 162 | 
+164 163 | for i in range(10):
+
+PIE790.py:165:5: PIE790 [*] Unnecessary `...` literal
+    |
+164 | for i in range(10):
+165 |     ...
+    |     ^^^ PIE790
+166 |     ...
+    |
+    = help: Remove unnecessary `...`
+
+ℹ Safe fix
+163 163 | 
+164 164 | for i in range(10):
+165 165 |     ...
+166     |-    ...
+167 166 | 
+168 167 | for i in range(10):
+169 168 |     ...
+
+PIE790.py:166:5: PIE790 [*] Unnecessary `...` literal
+    |
+164 | for i in range(10):
+165 |     ...
+166 |     ...
+    |     ^^^ PIE790
+167 | 
+168 | for i in range(10):
+    |
+    = help: Remove unnecessary `...`
+
+ℹ Safe fix
+163 163 | 
+164 164 | for i in range(10):
+165 165 |     ...
+166     |-    ...
+167 166 | 
+168 167 | for i in range(10):
+169 168 |     ...
+
+PIE790.py:169:5: PIE790 [*] Unnecessary `...` literal
+    |
+168 | for i in range(10):
+169 |     ...
+    |     ^^^ PIE790
+170 | 
+171 |     ...
+    |
+    = help: Remove unnecessary `...`
+
+ℹ Safe fix
+166 166 |     ...
+167 167 | 
+168 168 | for i in range(10):
+169     |-    ...
+170 169 | 
+171 170 |     ...
+172 171 | 
+
+PIE790.py:171:5: PIE790 [*] Unnecessary `...` literal
+    |
+169 |     ...
+170 | 
+171 |     ...
+    |     ^^^ PIE790
+172 | 
+173 | for i in range(10):
+    |
+    = help: Remove unnecessary `...`
+
+ℹ Safe fix
+168 168 | for i in range(10):
+169 169 |     ...
+170 170 | 
+171     |-    ...
+172 171 | 
+173 172 | for i in range(10):
+174 173 |     ...  # comment
+
+PIE790.py:174:5: PIE790 [*] Unnecessary `...` literal
+    |
+173 | for i in range(10):
+174 |     ...  # comment
+    |     ^^^ PIE790
+175 |     ...
+    |
+    = help: Remove unnecessary `...`
+
+ℹ Safe fix
+171 171 |     ...
+172 172 | 
+173 173 | for i in range(10):
+174     |-    ...  # comment
+    174 |+    # comment
+175 175 |     ...
+176 176 | 
+177 177 | for i in range(10):
+
+PIE790.py:175:5: PIE790 [*] Unnecessary `...` literal
+    |
+173 | for i in range(10):
+174 |     ...  # comment
+175 |     ...
+    |     ^^^ PIE790
+176 | 
+177 | for i in range(10):
+    |
+    = help: Remove unnecessary `...`
+
+ℹ Safe fix
+172 172 | 
+173 173 | for i in range(10):
+174 174 |     ...  # comment
+175     |-    ...
+176 175 | 
+177 176 | for i in range(10):
+178 177 |     ...
+
+PIE790.py:178:5: PIE790 [*] Unnecessary `...` literal
+    |
+177 | for i in range(10):
+178 |     ...
+    |     ^^^ PIE790
+179 |     pass
+    |
+    = help: Remove unnecessary `...`
+
+ℹ Safe fix
+175 175 |     ...
+176 176 | 
+177 177 | for i in range(10):
+178     |-    ...
+179 178 |     pass
+180 179 | 
+181 180 | from typing import Protocol
+
 PIE790.py:179:5: PIE790 [*] Unnecessary `pass` statement
     |
 177 | for i in range(10):
@@ -487,4 +657,19 @@ PIE790.py:179:5: PIE790 [*] Unnecessary `pass` statement
 181 180 | from typing import Protocol
 182 181 | 
 
+PIE790.py:209:9: PIE790 [*] Unnecessary `...` literal
+    |
+207 |     def stub(self) -> str:
+208 |         """Docstring"""
+209 |         ...
+    |         ^^^ PIE790
+    |
+    = help: Remove unnecessary `...`
+
+ℹ Safe fix
+206 206 | 
+207 207 |     def stub(self) -> str:
+208 208 |         """Docstring"""
+209     |-        ...
+
 

crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE800_PIE800.py.snap

@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_pie/mod.rs
 ---
-PIE800.py:1:14: PIE800 Unnecessary spread `**`
+PIE800.py:1:14: PIE800 [*] Unnecessary spread `**`
   |
 1 | {"foo": 1, **{"bar": 1}}  # PIE800
   |              ^^^^^^^^^^ PIE800
@@ -10,7 +10,14 @@ PIE800.py:1:14: PIE800 Unnecessary spread `**`
   |
   = help: Remove unnecessary dict
 
-PIE800.py:3:4: PIE800 Unnecessary spread `**`
+ℹ Safe fix
+1   |-{"foo": 1, **{"bar": 1}}  # PIE800
+  1 |+{"foo": 1, "bar": 1}  # PIE800
+2 2 | 
+3 3 | {**{"bar": 10}, "a": "b"}  # PIE800
+4 4 | 
+
+PIE800.py:3:4: PIE800 [*] Unnecessary spread `**`
   |
 1 | {"foo": 1, **{"bar": 1}}  # PIE800
 2 | 
@@ -21,7 +28,16 @@ PIE800.py:3:4: PIE800 Unnecessary spread `**`
   |
   = help: Remove unnecessary dict
 
-PIE800.py:5:15: PIE800 Unnecessary spread `**`
+ℹ Safe fix
+1 1 | {"foo": 1, **{"bar": 1}}  # PIE800
+2 2 | 
+3   |-{**{"bar": 10}, "a": "b"}  # PIE800
+  3 |+{"bar": 10, "a": "b"}  # PIE800
+4 4 | 
+5 5 | foo({**foo, **{"bar": True}})  # PIE800
+6 6 | 
+
+PIE800.py:5:15: PIE800 [*] Unnecessary spread `**`
   |
 3 | {**{"bar": 10}, "a": "b"}  # PIE800
 4 | 
@@ -32,7 +48,17 @@ PIE800.py:5:15: PIE800 Unnecessary spread `**`
   |
   = help: Remove unnecessary dict
 
-PIE800.py:7:11: PIE800 Unnecessary spread `**`
+ℹ Safe fix
+2 2 | 
+3 3 | {**{"bar": 10}, "a": "b"}  # PIE800
+4 4 | 
+5   |-foo({**foo, **{"bar": True}})  # PIE800
+  5 |+foo({**foo, "bar": True})  # PIE800
+6 6 | 
+7 7 | {**foo, **{"bar": 10}}  # PIE800
+8 8 | 
+
+PIE800.py:7:11: PIE800 [*] Unnecessary spread `**`
   |
 5 | foo({**foo, **{"bar": True}})  # PIE800
 6 | 
@@ -43,7 +69,17 @@ PIE800.py:7:11: PIE800 Unnecessary spread `**`
   |
   = help: Remove unnecessary dict
 
-PIE800.py:12:7: PIE800 Unnecessary spread `**`
+ℹ Safe fix
+4 4 | 
+5 5 | foo({**foo, **{"bar": True}})  # PIE800
+6 6 | 
+7   |-{**foo, **{"bar": 10}}  # PIE800
+  7 |+{**foo, "bar": 10}  # PIE800
+8 8 | 
+9 9 | { # PIE800
+10 10 |     "a": "b",
+
+PIE800.py:12:7: PIE800 [*] Unnecessary spread `**`
    |
 10 |       "a": "b",
 11 |       # Preserve
@@ -58,7 +94,23 @@ PIE800.py:12:7: PIE800 Unnecessary spread `**`
    |
    = help: Remove unnecessary dict
 
-PIE800.py:19:19: PIE800 Unnecessary spread `**`
+ℹ Safe fix
+9  9  | { # PIE800
+10 10 |     "a": "b",
+11 11 |     # Preserve
+12    |-    **{
+   12 |+    
+13 13 |         # all
+14    |-        "bar": 10,  # the
+   14 |+        "bar": 10  # the
+15 15 |         # comments
+16    |-    },
+   16 |+    ,
+17 17 | }
+18 18 | 
+19 19 | {**foo, **buzz, **{bar: 10}}  # PIE800
+
+PIE800.py:19:19: PIE800 [*] Unnecessary spread `**`
    |
 17 | }
 18 | 
@@ -69,4 +121,14 @@ PIE800.py:19:19: PIE800 Unnecessary spread `**`
    |
    = help: Remove unnecessary dict
 
+ℹ Safe fix
+16 16 |     },
+17 17 | }
+18 18 | 
+19    |-{**foo, **buzz, **{bar: 10}}  # PIE800
+   19 |+{**foo, **buzz, bar: 10}  # PIE800
+20 20 | 
+21 21 | {**foo,    "bar": True  }  # OK
+22 22 | 
+
 

crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE807_PIE807.py.snap

@@ -20,6 +20,25 @@ PIE807.py:3:44: PIE807 [*] Prefer `list` over useless lambda
 5 5 | 
 6 6 | 
 
+PIE807.py:4:49: PIE807 [*] Prefer `dict` over useless lambda
+  |
+2 | class Foo:
+3 |     foo: List[str] = field(default_factory=lambda: [])  # PIE807
+4 |     bar: Dict[str, int] = field(default_factory=lambda: {})  # PIE807
+  |                                                 ^^^^^^^^^^ PIE807
+  |
+  = help: Replace with `lambda` with `dict`
+
+ℹ Safe fix
+1 1 | @dataclass
+2 2 | class Foo:
+3 3 |     foo: List[str] = field(default_factory=lambda: [])  # PIE807
+4   |-    bar: Dict[str, int] = field(default_factory=lambda: {})  # PIE807
+  4 |+    bar: Dict[str, int] = field(default_factory=dict)  # PIE807
+5 5 | 
+6 6 | 
+7 7 | class FooTable(BaseTable):
+
 PIE807.py:8:36: PIE807 [*] Prefer `list` over useless lambda
   |
 7 | class FooTable(BaseTable):
@@ -39,6 +58,25 @@ PIE807.py:8:36: PIE807 [*] Prefer `list` over useless lambda
 10 10 | 
 11 11 | 
 
+PIE807.py:9:36: PIE807 [*] Prefer `dict` over useless lambda
+  |
+7 | class FooTable(BaseTable):
+8 |     foo = fields.ListField(default=lambda: [])  # PIE807
+9 |     bar = fields.ListField(default=lambda: {})  # PIE807
+  |                                    ^^^^^^^^^^ PIE807
+  |
+  = help: Replace with `lambda` with `dict`
+
+ℹ Safe fix
+6  6  | 
+7  7  | class FooTable(BaseTable):
+8  8  |     foo = fields.ListField(default=lambda: [])  # PIE807
+9     |-    bar = fields.ListField(default=lambda: {})  # PIE807
+   9  |+    bar = fields.ListField(default=dict)  # PIE807
+10 10 | 
+11 11 | 
+12 12 | class FooTable(BaseTable):
+
 PIE807.py:13:28: PIE807 [*] Prefer `list` over useless lambda
    |
 12 | class FooTable(BaseTable):
@@ -58,4 +96,23 @@ PIE807.py:13:28: PIE807 [*] Prefer `list` over useless lambda
 15 15 | 
 16 16 | 
 
+PIE807.py:14:36: PIE807 [*] Prefer `dict` over useless lambda
+   |
+12 | class FooTable(BaseTable):
+13 |     foo = fields.ListField(lambda: [])  # PIE807
+14 |     bar = fields.ListField(default=lambda: {})  # PIE807
+   |                                    ^^^^^^^^^^ PIE807
+   |
+   = help: Replace with `lambda` with `dict`
+
+ℹ Safe fix
+11 11 | 
+12 12 | class FooTable(BaseTable):
+13 13 |     foo = fields.ListField(lambda: [])  # PIE807
+14    |-    bar = fields.ListField(default=lambda: {})  # PIE807
+   14 |+    bar = fields.ListField(default=dict)  # PIE807
+15 15 | 
+16 16 | 
+17 17 | @dataclass
+
 

crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__PIE810_PIE810.py.snap

@@ -89,7 +89,7 @@ PIE810.py:10:1: PIE810 [*] Call `startswith` once with a `tuple`
 10 | obj.endswith(foo) or obj.startswith(foo) or obj.startswith("foo")
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PIE810
 11 | 
-12 | # ok
+12 | def func():
    |
    = help: Merge into a single `startswith` call
 
@@ -100,7 +100,47 @@ PIE810.py:10:1: PIE810 [*] Call `startswith` once with a `tuple`
 10    |-obj.endswith(foo) or obj.startswith(foo) or obj.startswith("foo")
    10 |+obj.endswith(foo) or obj.startswith((foo, "foo"))
 11 11 | 
-12 12 | # ok
-13 13 | obj.startswith(("foo",  "bar"))
+12 12 | def func():
+13 13 |     msg = "hello world"
+
+PIE810.py:19:8: PIE810 [*] Call `startswith` once with a `tuple`
+   |
+17 |     z = "w"
+18 | 
+19 |     if msg.startswith(x) or msg.startswith(y) or msg.startswith(z): # Error
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PIE810
+20 |         print("yes") 
+   |
+   = help: Merge into a single `startswith` call
+
+ℹ Unsafe fix
+16 16 |     y = ("h", "e", "l", "l", "o")  
+17 17 |     z = "w"
+18 18 | 
+19    |-    if msg.startswith(x) or msg.startswith(y) or msg.startswith(z): # Error
+   19 |+    if msg.startswith((x, z)) or msg.startswith(y): # Error
+20 20 |         print("yes") 
+21 21 | 
+22 22 | def func():
+
+PIE810.py:25:8: PIE810 [*] Call `startswith` once with a `tuple`
+   |
+23 |     msg = "hello world"
+24 | 
+25 |     if msg.startswith(("h", "e", "l", "l", "o")) or msg.startswith("h") or msg.startswith("w"): # Error
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PIE810
+26 |         print("yes") 
+   |
+   = help: Merge into a single `startswith` call
+
+ℹ Unsafe fix
+22 22 | def func():
+23 23 |     msg = "hello world"
+24 24 | 
+25    |-    if msg.startswith(("h", "e", "l", "l", "o")) or msg.startswith("h") or msg.startswith("w"): # Error
+   25 |+    if msg.startswith(("h", "e", "l", "l", "o", "h", "w")): # Error
+26 26 |         print("yes") 
+27 27 | 
+28 28 | # ok
 
 

crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__preview__PIE790_PIE790.py.snap

@@ -1,675 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_pie/mod.rs
----
-PIE790.py:4:5: PIE790 [*] Unnecessary `pass` statement
-  |
-2 |     """buzz"""
-3 | 
-4 |     pass
-  |     ^^^^ PIE790
-  |
-  = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-1 1 | class Foo:
-2 2 |     """buzz"""
-3 3 | 
-4   |-    pass
-5 4 | 
-6 5 | 
-7 6 | if foo:
-
-PIE790.py:9:5: PIE790 [*] Unnecessary `pass` statement
-  |
-7 | if foo:
-8 |     """foo"""
-9 |     pass
-  |     ^^^^ PIE790
-  |
-  = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-6  6  | 
-7  7  | if foo:
-8  8  |     """foo"""
-9     |-    pass
-10 9  | 
-11 10 | 
-12 11 | def multi_statement() -> None:
-
-PIE790.py:14:5: PIE790 [*] Unnecessary `pass` statement
-   |
-12 | def multi_statement() -> None:
-13 |     """This is a function."""
-14 |     pass; print("hello")
-   |     ^^^^ PIE790
-   |
-   = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-11 11 | 
-12 12 | def multi_statement() -> None:
-13 13 |     """This is a function."""
-14    |-    pass; print("hello")
-   14 |+    print("hello")
-15 15 | 
-16 16 | 
-17 17 | if foo:
-
-PIE790.py:21:5: PIE790 [*] Unnecessary `pass` statement
-   |
-19 | else:
-20 |     """bar"""
-21 |     pass
-   |     ^^^^ PIE790
-   |
-   = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-18 18 |     pass
-19 19 | else:
-20 20 |     """bar"""
-21    |-    pass
-22 21 | 
-23 22 | 
-24 23 | while True:
-
-PIE790.py:28:5: PIE790 [*] Unnecessary `pass` statement
-   |
-26 | else:
-27 |     """bar"""
-28 |     pass
-   |     ^^^^ PIE790
-   |
-   = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-25 25 |     pass
-26 26 | else:
-27 27 |     """bar"""
-28    |-    pass
-29 28 | 
-30 29 | 
-31 30 | for _ in range(10):
-
-PIE790.py:35:5: PIE790 [*] Unnecessary `pass` statement
-   |
-33 | else:
-34 |     """bar"""
-35 |     pass
-   |     ^^^^ PIE790
-   |
-   = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-32 32 |     pass
-33 33 | else:
-34 34 |     """bar"""
-35    |-    pass
-36 35 | 
-37 36 | 
-38 37 | async for _ in range(10):
-
-PIE790.py:42:5: PIE790 [*] Unnecessary `pass` statement
-   |
-40 | else:
-41 |     """bar"""
-42 |     pass
-   |     ^^^^ PIE790
-   |
-   = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-39 39 |     pass
-40 40 | else:
-41 41 |     """bar"""
-42    |-    pass
-43 42 | 
-44 43 | 
-45 44 | def foo() -> None:
-
-PIE790.py:50:5: PIE790 [*] Unnecessary `pass` statement
-   |
-48 |     """
-49 | 
-50 |     pass
-   |     ^^^^ PIE790
-   |
-   = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-47 47 |     buzz
-48 48 |     """
-49 49 | 
-50    |-    pass
-51 50 | 
-52 51 | 
-53 52 | async def foo():
-
-PIE790.py:58:5: PIE790 [*] Unnecessary `pass` statement
-   |
-56 |     """
-57 | 
-58 |     pass
-   |     ^^^^ PIE790
-   |
-   = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-55 55 |     buzz
-56 56 |     """
-57 57 | 
-58    |-    pass
-59 58 | 
-60 59 | 
-61 60 | try:
-
-PIE790.py:65:5: PIE790 [*] Unnecessary `pass` statement
-   |
-63 |     buzz
-64 |     """
-65 |     pass
-   |     ^^^^ PIE790
-66 | except ValueError:
-67 |     pass
-   |
-   = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-62 62 |     """
-63 63 |     buzz
-64 64 |     """
-65    |-    pass
-66 65 | except ValueError:
-67 66 |     pass
-68 67 | 
-
-PIE790.py:74:5: PIE790 [*] Unnecessary `pass` statement
-   |
-72 | except ValueError:
-73 |     """bar"""
-74 |     pass
-   |     ^^^^ PIE790
-   |
-   = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-71 71 |     bar()
-72 72 | except ValueError:
-73 73 |     """bar"""
-74    |-    pass
-75 74 | 
-76 75 | 
-77 76 | for _ in range(10):
-
-PIE790.py:79:5: PIE790 [*] Unnecessary `pass` statement
-   |
-77 | for _ in range(10):
-78 |     """buzz"""
-79 |     pass
-   |     ^^^^ PIE790
-80 | 
-81 | async for _ in range(10):
-   |
-   = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-76 76 | 
-77 77 | for _ in range(10):
-78 78 |     """buzz"""
-79    |-    pass
-80 79 | 
-81 80 | async for _ in range(10):
-82 81 |     """buzz"""
-
-PIE790.py:83:5: PIE790 [*] Unnecessary `pass` statement
-   |
-81 | async for _ in range(10):
-82 |     """buzz"""
-83 |     pass
-   |     ^^^^ PIE790
-84 | 
-85 | while cond:
-   |
-   = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-80 80 | 
-81 81 | async for _ in range(10):
-82 82 |     """buzz"""
-83    |-    pass
-84 83 | 
-85 84 | while cond:
-86 85 |     """buzz"""
-
-PIE790.py:87:5: PIE790 [*] Unnecessary `pass` statement
-   |
-85 | while cond:
-86 |     """buzz"""
-87 |     pass
-   |     ^^^^ PIE790
-   |
-   = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-84 84 | 
-85 85 | while cond:
-86 86 |     """buzz"""
-87    |-    pass
-88 87 | 
-89 88 | 
-90 89 | with bar:
-
-PIE790.py:92:5: PIE790 [*] Unnecessary `pass` statement
-   |
-90 | with bar:
-91 |     """buzz"""
-92 |     pass
-   |     ^^^^ PIE790
-93 | 
-94 | async with bar:
-   |
-   = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-89 89 | 
-90 90 | with bar:
-91 91 |     """buzz"""
-92    |-    pass
-93 92 | 
-94 93 | async with bar:
-95 94 |     """buzz"""
-
-PIE790.py:96:5: PIE790 [*] Unnecessary `pass` statement
-   |
-94 | async with bar:
-95 |     """buzz"""
-96 |     pass
-   |     ^^^^ PIE790
-   |
-   = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-93 93 | 
-94 94 | async with bar:
-95 95 |     """buzz"""
-96    |-    pass
-97 96 | 
-98 97 | 
-99 98 | def foo() -> None:
-
-PIE790.py:101:5: PIE790 [*] Unnecessary `pass` statement
-    |
- 99 | def foo() -> None:
-100 |     """buzz"""
-101 |     pass  # bar
-    |     ^^^^ PIE790
-    |
-    = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-98  98  | 
-99  99  | def foo() -> None:
-100 100 |     """buzz"""
-101     |-    pass  # bar
-    101 |+    # bar
-102 102 | 
-103 103 | 
-104 104 | class Foo:
-
-PIE790.py:130:5: PIE790 [*] Unnecessary `pass` statement
-    |
-128 | def foo():
-129 |     print("foo")
-130 |     pass
-    |     ^^^^ PIE790
-    |
-    = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-127 127 | 
-128 128 | def foo():
-129 129 |     print("foo")
-130     |-    pass
-131 130 | 
-132 131 | 
-133 132 | def foo():
-
-PIE790.py:136:5: PIE790 [*] Unnecessary `pass` statement
-    |
-134 |     """A docstring."""
-135 |     print("foo")
-136 |     pass
-    |     ^^^^ PIE790
-    |
-    = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-133 133 | def foo():
-134 134 |     """A docstring."""
-135 135 |     print("foo")
-136     |-    pass
-137 136 | 
-138 137 | 
-139 138 | for i in range(10):
-
-PIE790.py:140:5: PIE790 [*] Unnecessary `pass` statement
-    |
-139 | for i in range(10):
-140 |     pass
-    |     ^^^^ PIE790
-141 |     pass
-    |
-    = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-138 138 | 
-139 139 | for i in range(10):
-140 140 |     pass
-141     |-    pass
-142 141 | 
-143 142 | for i in range(10):
-144 143 |     pass
-
-PIE790.py:141:5: PIE790 [*] Unnecessary `pass` statement
-    |
-139 | for i in range(10):
-140 |     pass
-141 |     pass
-    |     ^^^^ PIE790
-142 | 
-143 | for i in range(10):
-    |
-    = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-138 138 | 
-139 139 | for i in range(10):
-140 140 |     pass
-141     |-    pass
-142 141 | 
-143 142 | for i in range(10):
-144 143 |     pass
-
-PIE790.py:144:5: PIE790 [*] Unnecessary `pass` statement
-    |
-143 | for i in range(10):
-144 |     pass
-    |     ^^^^ PIE790
-145 | 
-146 |     pass
-    |
-    = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-141 141 |     pass
-142 142 | 
-143 143 | for i in range(10):
-144     |-    pass
-145 144 | 
-146 145 |     pass
-147 146 | 
-
-PIE790.py:146:5: PIE790 [*] Unnecessary `pass` statement
-    |
-144 |     pass
-145 | 
-146 |     pass
-    |     ^^^^ PIE790
-147 | 
-148 | for i in range(10):
-    |
-    = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-143 143 | for i in range(10):
-144 144 |     pass
-145 145 | 
-146     |-    pass
-147 146 | 
-148 147 | for i in range(10):
-149 148 |     pass  # comment
-
-PIE790.py:149:5: PIE790 [*] Unnecessary `pass` statement
-    |
-148 | for i in range(10):
-149 |     pass  # comment
-    |     ^^^^ PIE790
-150 |     pass
-    |
-    = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-146 146 |     pass
-147 147 | 
-148 148 | for i in range(10):
-149     |-    pass  # comment
-    149 |+    # comment
-150 150 |     pass
-151 151 | 
-152 152 | 
-
-PIE790.py:150:5: PIE790 [*] Unnecessary `pass` statement
-    |
-148 | for i in range(10):
-149 |     pass  # comment
-150 |     pass
-    |     ^^^^ PIE790
-    |
-    = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-147 147 | 
-148 148 | for i in range(10):
-149 149 |     pass  # comment
-150     |-    pass
-151 150 | 
-152 151 | 
-153 152 | def foo():
-
-PIE790.py:155:5: PIE790 [*] Unnecessary `...` literal
-    |
-153 | def foo():
-154 |     print("foo")
-155 |     ...
-    |     ^^^ PIE790
-    |
-    = help: Remove unnecessary `...`
-
-ℹ Safe fix
-152 152 | 
-153 153 | def foo():
-154 154 |     print("foo")
-155     |-    ...
-156 155 | 
-157 156 | 
-158 157 | def foo():
-
-PIE790.py:161:5: PIE790 [*] Unnecessary `...` literal
-    |
-159 |     """A docstring."""
-160 |     print("foo")
-161 |     ...
-    |     ^^^ PIE790
-    |
-    = help: Remove unnecessary `...`
-
-ℹ Safe fix
-158 158 | def foo():
-159 159 |     """A docstring."""
-160 160 |     print("foo")
-161     |-    ...
-162 161 | 
-163 162 | 
-164 163 | for i in range(10):
-
-PIE790.py:165:5: PIE790 [*] Unnecessary `...` literal
-    |
-164 | for i in range(10):
-165 |     ...
-    |     ^^^ PIE790
-166 |     ...
-    |
-    = help: Remove unnecessary `...`
-
-ℹ Safe fix
-163 163 | 
-164 164 | for i in range(10):
-165 165 |     ...
-166     |-    ...
-167 166 | 
-168 167 | for i in range(10):
-169 168 |     ...
-
-PIE790.py:166:5: PIE790 [*] Unnecessary `...` literal
-    |
-164 | for i in range(10):
-165 |     ...
-166 |     ...
-    |     ^^^ PIE790
-167 | 
-168 | for i in range(10):
-    |
-    = help: Remove unnecessary `...`
-
-ℹ Safe fix
-163 163 | 
-164 164 | for i in range(10):
-165 165 |     ...
-166     |-    ...
-167 166 | 
-168 167 | for i in range(10):
-169 168 |     ...
-
-PIE790.py:169:5: PIE790 [*] Unnecessary `...` literal
-    |
-168 | for i in range(10):
-169 |     ...
-    |     ^^^ PIE790
-170 | 
-171 |     ...
-    |
-    = help: Remove unnecessary `...`
-
-ℹ Safe fix
-166 166 |     ...
-167 167 | 
-168 168 | for i in range(10):
-169     |-    ...
-170 169 | 
-171 170 |     ...
-172 171 | 
-
-PIE790.py:171:5: PIE790 [*] Unnecessary `...` literal
-    |
-169 |     ...
-170 | 
-171 |     ...
-    |     ^^^ PIE790
-172 | 
-173 | for i in range(10):
-    |
-    = help: Remove unnecessary `...`
-
-ℹ Safe fix
-168 168 | for i in range(10):
-169 169 |     ...
-170 170 | 
-171     |-    ...
-172 171 | 
-173 172 | for i in range(10):
-174 173 |     ...  # comment
-
-PIE790.py:174:5: PIE790 [*] Unnecessary `...` literal
-    |
-173 | for i in range(10):
-174 |     ...  # comment
-    |     ^^^ PIE790
-175 |     ...
-    |
-    = help: Remove unnecessary `...`
-
-ℹ Safe fix
-171 171 |     ...
-172 172 | 
-173 173 | for i in range(10):
-174     |-    ...  # comment
-    174 |+    # comment
-175 175 |     ...
-176 176 | 
-177 177 | for i in range(10):
-
-PIE790.py:175:5: PIE790 [*] Unnecessary `...` literal
-    |
-173 | for i in range(10):
-174 |     ...  # comment
-175 |     ...
-    |     ^^^ PIE790
-176 | 
-177 | for i in range(10):
-    |
-    = help: Remove unnecessary `...`
-
-ℹ Safe fix
-172 172 | 
-173 173 | for i in range(10):
-174 174 |     ...  # comment
-175     |-    ...
-176 175 | 
-177 176 | for i in range(10):
-178 177 |     ...
-
-PIE790.py:178:5: PIE790 [*] Unnecessary `...` literal
-    |
-177 | for i in range(10):
-178 |     ...
-    |     ^^^ PIE790
-179 |     pass
-    |
-    = help: Remove unnecessary `...`
-
-ℹ Safe fix
-175 175 |     ...
-176 176 | 
-177 177 | for i in range(10):
-178     |-    ...
-179 178 |     pass
-180 179 | 
-181 180 | from typing import Protocol
-
-PIE790.py:179:5: PIE790 [*] Unnecessary `pass` statement
-    |
-177 | for i in range(10):
-178 |     ...
-179 |     pass
-    |     ^^^^ PIE790
-180 | 
-181 | from typing import Protocol
-    |
-    = help: Remove unnecessary `pass`
-
-ℹ Safe fix
-176 176 | 
-177 177 | for i in range(10):
-178 178 |     ...
-179     |-    pass
-180 179 | 
-181 180 | from typing import Protocol
-182 181 | 
-
-PIE790.py:209:9: PIE790 [*] Unnecessary `...` literal
-    |
-207 |     def stub(self) -> str:
-208 |         """Docstring"""
-209 |         ...
-    |         ^^^ PIE790
-    |
-    = help: Remove unnecessary `...`
-
-ℹ Safe fix
-206 206 | 
-207 207 |     def stub(self) -> str:
-208 208 |         """Docstring"""
-209     |-        ...
-
-

crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__preview__PIE800_PIE800.py.snap

@@ -1,134 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_pie/mod.rs
----
-PIE800.py:1:14: PIE800 [*] Unnecessary spread `**`
-  |
-1 | {"foo": 1, **{"bar": 1}}  # PIE800
-  |              ^^^^^^^^^^ PIE800
-2 | 
-3 | {**{"bar": 10}, "a": "b"}  # PIE800
-  |
-  = help: Remove unnecessary dict
-
-ℹ Safe fix
-1   |-{"foo": 1, **{"bar": 1}}  # PIE800
-  1 |+{"foo": 1, "bar": 1}  # PIE800
-2 2 | 
-3 3 | {**{"bar": 10}, "a": "b"}  # PIE800
-4 4 | 
-
-PIE800.py:3:4: PIE800 [*] Unnecessary spread `**`
-  |
-1 | {"foo": 1, **{"bar": 1}}  # PIE800
-2 | 
-3 | {**{"bar": 10}, "a": "b"}  # PIE800
-  |    ^^^^^^^^^^^ PIE800
-4 | 
-5 | foo({**foo, **{"bar": True}})  # PIE800
-  |
-  = help: Remove unnecessary dict
-
-ℹ Safe fix
-1 1 | {"foo": 1, **{"bar": 1}}  # PIE800
-2 2 | 
-3   |-{**{"bar": 10}, "a": "b"}  # PIE800
-  3 |+{"bar": 10, "a": "b"}  # PIE800
-4 4 | 
-5 5 | foo({**foo, **{"bar": True}})  # PIE800
-6 6 | 
-
-PIE800.py:5:15: PIE800 [*] Unnecessary spread `**`
-  |
-3 | {**{"bar": 10}, "a": "b"}  # PIE800
-4 | 
-5 | foo({**foo, **{"bar": True}})  # PIE800
-  |               ^^^^^^^^^^^^^ PIE800
-6 | 
-7 | {**foo, **{"bar": 10}}  # PIE800
-  |
-  = help: Remove unnecessary dict
-
-ℹ Safe fix
-2 2 | 
-3 3 | {**{"bar": 10}, "a": "b"}  # PIE800
-4 4 | 
-5   |-foo({**foo, **{"bar": True}})  # PIE800
-  5 |+foo({**foo, "bar": True})  # PIE800
-6 6 | 
-7 7 | {**foo, **{"bar": 10}}  # PIE800
-8 8 | 
-
-PIE800.py:7:11: PIE800 [*] Unnecessary spread `**`
-  |
-5 | foo({**foo, **{"bar": True}})  # PIE800
-6 | 
-7 | {**foo, **{"bar": 10}}  # PIE800
-  |           ^^^^^^^^^^^ PIE800
-8 | 
-9 | { # PIE800
-  |
-  = help: Remove unnecessary dict
-
-ℹ Safe fix
-4 4 | 
-5 5 | foo({**foo, **{"bar": True}})  # PIE800
-6 6 | 
-7   |-{**foo, **{"bar": 10}}  # PIE800
-  7 |+{**foo, "bar": 10}  # PIE800
-8 8 | 
-9 9 | { # PIE800
-10 10 |     "a": "b",
-
-PIE800.py:12:7: PIE800 [*] Unnecessary spread `**`
-   |
-10 |       "a": "b",
-11 |       # Preserve
-12 |       **{
-   |  _______^
-13 | |         # all
-14 | |         "bar": 10,  # the
-15 | |         # comments
-16 | |     },
-   | |_____^ PIE800
-17 |   }
-   |
-   = help: Remove unnecessary dict
-
-ℹ Safe fix
-9  9  | { # PIE800
-10 10 |     "a": "b",
-11 11 |     # Preserve
-12    |-    **{
-   12 |+    
-13 13 |         # all
-14    |-        "bar": 10,  # the
-   14 |+        "bar": 10  # the
-15 15 |         # comments
-16    |-    },
-   16 |+    ,
-17 17 | }
-18 18 | 
-19 19 | {**foo, **buzz, **{bar: 10}}  # PIE800
-
-PIE800.py:19:19: PIE800 [*] Unnecessary spread `**`
-   |
-17 | }
-18 | 
-19 | {**foo, **buzz, **{bar: 10}}  # PIE800
-   |                   ^^^^^^^^^ PIE800
-20 | 
-21 | {**foo,    "bar": True  }  # OK
-   |
-   = help: Remove unnecessary dict
-
-ℹ Safe fix
-16 16 |     },
-17 17 | }
-18 18 | 
-19    |-{**foo, **buzz, **{bar: 10}}  # PIE800
-   19 |+{**foo, **buzz, bar: 10}  # PIE800
-20 20 | 
-21 21 | {**foo,    "bar": True  }  # OK
-22 22 | 
-
-

crates/ruff_linter/src/rules/flake8_pie/snapshots/ruff_linter__rules__flake8_pie__tests__preview__PIE807_PIE807.py.snap

@@ -1,118 +0,0 @@
----
-source: crates/ruff_linter/src/rules/flake8_pie/mod.rs
----
-PIE807.py:3:44: PIE807 [*] Prefer `list` over useless lambda
-  |
-1 | @dataclass
-2 | class Foo:
-3 |     foo: List[str] = field(default_factory=lambda: [])  # PIE807
-  |                                            ^^^^^^^^^^ PIE807
-4 |     bar: Dict[str, int] = field(default_factory=lambda: {})  # PIE807
-  |
-  = help: Replace with `lambda` with `list`
-
-ℹ Safe fix
-1 1 | @dataclass
-2 2 | class Foo:
-3   |-    foo: List[str] = field(default_factory=lambda: [])  # PIE807
-  3 |+    foo: List[str] = field(default_factory=list)  # PIE807
-4 4 |     bar: Dict[str, int] = field(default_factory=lambda: {})  # PIE807
-5 5 | 
-6 6 | 
-
-PIE807.py:4:49: PIE807 [*] Prefer `dict` over useless lambda
-  |
-2 | class Foo:
-3 |     foo: List[str] = field(default_factory=lambda: [])  # PIE807
-4 |     bar: Dict[str, int] = field(default_factory=lambda: {})  # PIE807
-  |                                                 ^^^^^^^^^^ PIE807
-  |
-  = help: Replace with `lambda` with `dict`
-
-ℹ Safe fix
-1 1 | @dataclass
-2 2 | class Foo:
-3 3 |     foo: List[str] = field(default_factory=lambda: [])  # PIE807
-4   |-    bar: Dict[str, int] = field(default_factory=lambda: {})  # PIE807
-  4 |+    bar: Dict[str, int] = field(default_factory=dict)  # PIE807
-5 5 | 
-6 6 | 
-7 7 | class FooTable(BaseTable):
-
-PIE807.py:8:36: PIE807 [*] Prefer `list` over useless lambda
-  |
-7 | class FooTable(BaseTable):
-8 |     foo = fields.ListField(default=lambda: [])  # PIE807
-  |                                    ^^^^^^^^^^ PIE807
-9 |     bar = fields.ListField(default=lambda: {})  # PIE807
-  |
-  = help: Replace with `lambda` with `list`
-
-ℹ Safe fix
-5 5 | 
-6 6 | 
-7 7 | class FooTable(BaseTable):
-8   |-    foo = fields.ListField(default=lambda: [])  # PIE807
-  8 |+    foo = fields.ListField(default=list)  # PIE807
-9 9 |     bar = fields.ListField(default=lambda: {})  # PIE807
-10 10 | 
-11 11 | 
-
-PIE807.py:9:36: PIE807 [*] Prefer `dict` over useless lambda
-  |
-7 | class FooTable(BaseTable):
-8 |     foo = fields.ListField(default=lambda: [])  # PIE807
-9 |     bar = fields.ListField(default=lambda: {})  # PIE807
-  |                                    ^^^^^^^^^^ PIE807
-  |
-  = help: Replace with `lambda` with `dict`
-
-ℹ Safe fix
-6  6  | 
-7  7  | class FooTable(BaseTable):
-8  8  |     foo = fields.ListField(default=lambda: [])  # PIE807
-9     |-    bar = fields.ListField(default=lambda: {})  # PIE807
-   9  |+    bar = fields.ListField(default=dict)  # PIE807
-10 10 | 
-11 11 | 
-12 12 | class FooTable(BaseTable):
-
-PIE807.py:13:28: PIE807 [*] Prefer `list` over useless lambda
-   |
-12 | class FooTable(BaseTable):
-13 |     foo = fields.ListField(lambda: [])  # PIE807
-   |                            ^^^^^^^^^^ PIE807
-14 |     bar = fields.ListField(default=lambda: {})  # PIE807
-   |
-   = help: Replace with `lambda` with `list`
-
-ℹ Safe fix
-10 10 | 
-11 11 | 
-12 12 | class FooTable(BaseTable):
-13    |-    foo = fields.ListField(lambda: [])  # PIE807
-   13 |+    foo = fields.ListField(list)  # PIE807
-14 14 |     bar = fields.ListField(default=lambda: {})  # PIE807
-15 15 | 
-16 16 | 
-
-PIE807.py:14:36: PIE807 [*] Prefer `dict` over useless lambda
-   |
-12 | class FooTable(BaseTable):
-13 |     foo = fields.ListField(lambda: [])  # PIE807
-14 |     bar = fields.ListField(default=lambda: {})  # PIE807
-   |                                    ^^^^^^^^^^ PIE807
-   |
-   = help: Replace with `lambda` with `dict`
-
-ℹ Safe fix
-11 11 | 
-12 12 | class FooTable(BaseTable):
-13 13 |     foo = fields.ListField(lambda: [])  # PIE807
-14    |-    bar = fields.ListField(default=lambda: {})  # PIE807
-   14 |+    bar = fields.ListField(default=dict)  # PIE807
-15 15 | 
-16 16 | 
-17 17 | @dataclass
-
-

crates/ruff_linter/src/rules/flake8_pyi/rules/unaliased_collections_abc_set_import.rs

@@ -1,4 +1,4 @@
-use ruff_diagnostics::{Diagnostic, Fix, FixAvailability, Violation};
+use ruff_diagnostics::{Applicability, Diagnostic, Fix, FixAvailability, Violation};
 use ruff_macros::{derive_message_formats, violation};
 use ruff_python_semantic::Imported;
 use ruff_python_semantic::{Binding, BindingKind};
@@ -29,6 +29,12 @@ use crate::renamer::Renamer;
 /// ```python
 /// from collections.abc import Set as AbstractSet
 /// ```
+///
+/// ## Fix safety
+/// This rule's fix is marked as unsafe for `Set` imports defined at the
+/// top-level of a module. Top-level symbols are implicitly exported by the
+/// module, and so renaming a top-level symbol may break downstream modules
+/// that import it.
 #[violation]
 pub struct UnaliasedCollectionsAbcSetImport;
 
@@ -69,7 +75,15 @@ pub(crate) fn unaliased_collections_abc_set_import(
         diagnostic.try_set_fix(|| {
             let scope = &checker.semantic().scopes[binding.scope];
             let (edit, rest) = Renamer::rename(name, "AbstractSet", scope, checker.semantic())?;
-            Ok(Fix::unsafe_edits(edit, rest))
+            Ok(Fix::applicable_edits(
+                edit,
+                rest,
+                if scope.kind.is_module() {
+                    Applicability::Unsafe
+                } else {
+                    Applicability::Safe
+                },
+            ))
         });
     }
     Some(diagnostic)

crates/ruff_linter/src/rules/flake8_pyi/rules/unnecessary_literal_union.rs

@@ -116,7 +116,7 @@ pub(crate) fn unnecessary_literal_union<'a>(checker: &mut Checker, expr: &'a Exp
         expr.range(),
     );
 
-    if checker.settings.preview.is_enabled() {
+    diagnostic.set_fix({
         let literal = Expr::Subscript(ast::ExprSubscript {
             value: Box::new(literal_subscript.clone()),
             slice: Box::new(Expr::Tuple(ast::ExprTuple {
@@ -130,10 +130,10 @@ pub(crate) fn unnecessary_literal_union<'a>(checker: &mut Checker, expr: &'a Exp
 
         if other_exprs.is_empty() {
             // if the union is only literals, we just replace the whole thing with a single literal
-            diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
+            Fix::safe_edit(Edit::range_replacement(
                 checker.generator().expr(&literal),
                 expr.range(),
-            )));
+            ))
         } else {
             let elts: Vec<Expr> = std::iter::once(literal)
                 .chain(other_exprs.into_iter().cloned())
@@ -156,12 +156,9 @@ pub(crate) fn unnecessary_literal_union<'a>(checker: &mut Checker, expr: &'a Exp
                 checker.generator().expr(&pep_604_union(&elts))
             };
 
-            diagnostic.set_fix(Fix::safe_edit(Edit::range_replacement(
-                content,
-                expr.range(),
-            )));
+            Fix::safe_edit(Edit::range_replacement(content, expr.range()))
         }
-    }
+    });
 
     checker.diagnostics.push(diagnostic);
 }

crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025.py.snap

@@ -9,7 +9,7 @@ PYI025.py:10:33: PYI025 [*] Use `from collections.abc import Set as AbstractSet`
    |
    = help: Alias `Set` to `AbstractSet`
 
-ℹ Unsafe fix
+ℹ Safe fix
 7  7  | 
 8  8  | 
 9  9  | def f():
@@ -29,7 +29,7 @@ PYI025.py:14:51: PYI025 [*] Use `from collections.abc import Set as AbstractSet`
    |
    = help: Alias `Set` to `AbstractSet`
 
-ℹ Unsafe fix
+ℹ Safe fix
 11 11 | 
 12 12 | 
 13 13 | def f():

crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI025_PYI025.pyi.snap

@@ -11,7 +11,7 @@ PYI025.pyi:8:33: PYI025 [*] Use `from collections.abc import Set as AbstractSet`
    |
    = help: Alias `Set` to `AbstractSet`
 
-ℹ Unsafe fix
+ℹ Safe fix
 5 5 |     from collections.abc import Container, Sized, Set as AbstractSet, ValuesView  # Ok
 6 6 | 
 7 7 | def f():
@@ -31,7 +31,7 @@ PYI025.pyi:11:51: PYI025 [*] Use `from collections.abc import Set as AbstractSet
    |
    = help: Alias `Set` to `AbstractSet`
 
-ℹ Unsafe fix
+ℹ Safe fix
 8  8  |     from collections.abc import Set  # PYI025
 9  9  | 
 10 10 | def f():
@@ -52,7 +52,7 @@ PYI025.pyi:16:37: PYI025 [*] Use `from collections.abc import Set as AbstractSet
    |
    = help: Alias `Set` to `AbstractSet`
 
-ℹ Unsafe fix
+ℹ Safe fix
 13 13 | def f():
 14 14 |     """Test: local symbol renaming."""
 15 15 |     if True:
@@ -130,7 +130,7 @@ PYI025.pyi:44:33: PYI025 [*] Use `from collections.abc import Set as AbstractSet
    |
    = help: Alias `Set` to `AbstractSet`
 
-ℹ Unsafe fix
+ℹ Safe fix
 41 41 | 
 42 42 | def f():
 43 43 |     """Test: nonlocal symbol renaming."""

crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.py.snap

@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_pyi/mod.rs
 ---
-PYI030.py:9:9: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+PYI030.py:9:9: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
  8 | # Should emit for duplicate field types.
  9 | field2: Literal[1] | Literal[2]  # Error
@@ -11,7 +11,17 @@ PYI030.py:9:9: PYI030 Multiple literal members in a union. Use a single literal,
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:12:17: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+6  6  | field1: Literal[1]  # OK
+7  7  | 
+8  8  | # Should emit for duplicate field types.
+9     |-field2: Literal[1] | Literal[2]  # Error
+   9  |+field2: Literal[1, 2]  # Error
+10 10 | 
+11 11 | # Should emit for union types in arguments.
+12 12 | def func1(arg1: Literal[1] | Literal[2]):  # Error
+
+PYI030.py:12:17: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 11 | # Should emit for union types in arguments.
 12 | def func1(arg1: Literal[1] | Literal[2]):  # Error
@@ -20,7 +30,17 @@ PYI030.py:12:17: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:17:16: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+9  9  | field2: Literal[1] | Literal[2]  # Error
+10 10 | 
+11 11 | # Should emit for union types in arguments.
+12    |-def func1(arg1: Literal[1] | Literal[2]):  # Error
+   12 |+def func1(arg1: Literal[1, 2]):  # Error
+13 13 |     print(arg1)
+14 14 | 
+15 15 | 
+
+PYI030.py:17:16: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 16 | # Should emit for unions in return types.
 17 | def func2() -> Literal[1] | Literal[2]:  # Error
@@ -29,7 +49,17 @@ PYI030.py:17:16: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:22:9: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+14 14 | 
+15 15 | 
+16 16 | # Should emit for unions in return types.
+17    |-def func2() -> Literal[1] | Literal[2]:  # Error
+   17 |+def func2() -> Literal[1, 2]:  # Error
+18 18 |     return "my Literal[1]ing"
+19 19 | 
+20 20 | 
+
+PYI030.py:22:9: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 21 | # Should emit in longer unions, even if not directly adjacent.
 22 | field3: Literal[1] | Literal[2] | str  # Error
@@ -39,7 +69,17 @@ PYI030.py:22:9: PYI030 Multiple literal members in a union. Use a single literal
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:23:9: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+19 19 | 
+20 20 | 
+21 21 | # Should emit in longer unions, even if not directly adjacent.
+22    |-field3: Literal[1] | Literal[2] | str  # Error
+   22 |+field3: Literal[1, 2] | str  # Error
+23 23 | field4: str | Literal[1] | Literal[2]  # Error
+24 24 | field5: Literal[1] | str | Literal[2]  # Error
+25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+
+PYI030.py:23:9: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 21 | # Should emit in longer unions, even if not directly adjacent.
 22 | field3: Literal[1] | Literal[2] | str  # Error
@@ -50,7 +90,17 @@ PYI030.py:23:9: PYI030 Multiple literal members in a union. Use a single literal
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:24:9: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+20 20 | 
+21 21 | # Should emit in longer unions, even if not directly adjacent.
+22 22 | field3: Literal[1] | Literal[2] | str  # Error
+23    |-field4: str | Literal[1] | Literal[2]  # Error
+   23 |+field4: Literal[1, 2] | str  # Error
+24 24 | field5: Literal[1] | str | Literal[2]  # Error
+25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+26 26 | 
+
+PYI030.py:24:9: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 22 | field3: Literal[1] | Literal[2] | str  # Error
 23 | field4: str | Literal[1] | Literal[2]  # Error
@@ -60,7 +110,17 @@ PYI030.py:24:9: PYI030 Multiple literal members in a union. Use a single literal
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:25:9: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+21 21 | # Should emit in longer unions, even if not directly adjacent.
+22 22 | field3: Literal[1] | Literal[2] | str  # Error
+23 23 | field4: str | Literal[1] | Literal[2]  # Error
+24    |-field5: Literal[1] | str | Literal[2]  # Error
+   24 |+field5: Literal[1, 2] | str  # Error
+25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+26 26 | 
+27 27 | # Should emit for non-type unions.
+
+PYI030.py:25:9: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 23 | field4: str | Literal[1] | Literal[2]  # Error
 24 | field5: Literal[1] | str | Literal[2]  # Error
@@ -71,7 +131,17 @@ PYI030.py:25:9: PYI030 Multiple literal members in a union. Use a single literal
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:28:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+22 22 | field3: Literal[1] | Literal[2] | str  # Error
+23 23 | field4: str | Literal[1] | Literal[2]  # Error
+24 24 | field5: Literal[1] | str | Literal[2]  # Error
+25    |-field6: Literal[1] | bool | Literal[2] | str  # Error
+   25 |+field6: Literal[1, 2] | bool | str  # Error
+26 26 | 
+27 27 | # Should emit for non-type unions.
+28 28 | field7 = Literal[1] | Literal[2]  # Error
+
+PYI030.py:28:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 27 | # Should emit for non-type unions.
 28 | field7 = Literal[1] | Literal[2]  # Error
@@ -81,7 +151,17 @@ PYI030.py:28:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:31:9: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+26 26 | 
+27 27 | # Should emit for non-type unions.
+28    |-field7 = Literal[1] | Literal[2]  # Error
+   28 |+field7 = Literal[1, 2]  # Error
+29 29 | 
+30 30 | # Should emit for parenthesized unions.
+31 31 | field8: Literal[1] | (Literal[2] | str)  # Error
+
+PYI030.py:31:9: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 30 | # Should emit for parenthesized unions.
 31 | field8: Literal[1] | (Literal[2] | str)  # Error
@@ -91,7 +171,17 @@ PYI030.py:31:9: PYI030 Multiple literal members in a union. Use a single literal
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:34:9: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+28 28 | field7 = Literal[1] | Literal[2]  # Error
+29 29 | 
+30 30 | # Should emit for parenthesized unions.
+31    |-field8: Literal[1] | (Literal[2] | str)  # Error
+   31 |+field8: Literal[1, 2] | str  # Error
+32 32 | 
+33 33 | # Should handle user parentheses when fixing.
+34 34 | field9: Literal[1] | (Literal[2] | str)  # Error
+
+PYI030.py:34:9: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 33 | # Should handle user parentheses when fixing.
 34 | field9: Literal[1] | (Literal[2] | str)  # Error
@@ -100,7 +190,17 @@ PYI030.py:34:9: PYI030 Multiple literal members in a union. Use a single literal
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:35:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+31 31 | field8: Literal[1] | (Literal[2] | str)  # Error
+32 32 | 
+33 33 | # Should handle user parentheses when fixing.
+34    |-field9: Literal[1] | (Literal[2] | str)  # Error
+   34 |+field9: Literal[1, 2] | str  # Error
+35 35 | field10: (Literal[1] | str) | Literal[2]  # Error
+36 36 | 
+37 37 | # Should emit for union in generic parent type.
+
+PYI030.py:35:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 33 | # Should handle user parentheses when fixing.
 34 | field9: Literal[1] | (Literal[2] | str)  # Error
@@ -111,7 +211,17 @@ PYI030.py:35:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:38:15: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+32 32 | 
+33 33 | # Should handle user parentheses when fixing.
+34 34 | field9: Literal[1] | (Literal[2] | str)  # Error
+35    |-field10: (Literal[1] | str) | Literal[2]  # Error
+   35 |+field10: Literal[1, 2] | str  # Error
+36 36 | 
+37 37 | # Should emit for union in generic parent type.
+38 38 | field11: dict[Literal[1] | Literal[2], str]  # Error
+
+PYI030.py:38:15: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 37 | # Should emit for union in generic parent type.
 38 | field11: dict[Literal[1] | Literal[2], str]  # Error
@@ -121,7 +231,17 @@ PYI030.py:38:15: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:41:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]`
+ℹ Safe fix
+35 35 | field10: (Literal[1] | str) | Literal[2]  # Error
+36 36 | 
+37 37 | # Should emit for union in generic parent type.
+38    |-field11: dict[Literal[1] | Literal[2], str]  # Error
+   38 |+field11: dict[Literal[1, 2], str]  # Error
+39 39 | 
+40 40 | # Should emit for unions with more than two cases
+41 41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
+
+PYI030.py:41:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]`
    |
 40 | # Should emit for unions with more than two cases
 41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
@@ -130,7 +250,17 @@ PYI030.py:41:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:42:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
+ℹ Safe fix
+38 38 | field11: dict[Literal[1] | Literal[2], str]  # Error
+39 39 | 
+40 40 | # Should emit for unions with more than two cases
+41    |-field12: Literal[1] | Literal[2] | Literal[3]  # Error
+   41 |+field12: Literal[1, 2, 3]  # Error
+42 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
+43 43 | 
+44 44 | # Should emit for unions with more than two cases, even if not directly adjacent
+
+PYI030.py:42:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
    |
 40 | # Should emit for unions with more than two cases
 41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
@@ -141,7 +271,17 @@ PYI030.py:42:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:45:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]`
+ℹ Safe fix
+39 39 | 
+40 40 | # Should emit for unions with more than two cases
+41 41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
+42    |-field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
+   42 |+field13: Literal[1, 2, 3, 4]  # Error
+43 43 | 
+44 44 | # Should emit for unions with more than two cases, even if not directly adjacent
+45 45 | field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
+
+PYI030.py:45:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]`
    |
 44 | # Should emit for unions with more than two cases, even if not directly adjacent
 45 | field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
@@ -151,7 +291,17 @@ PYI030.py:45:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:48:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, "foo", True]`
+ℹ Safe fix
+42 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
+43 43 | 
+44 44 | # Should emit for unions with more than two cases, even if not directly adjacent
+45    |-field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
+   45 |+field14: Literal[1, 2, 3] | str  # Error
+46 46 | 
+47 47 | # Should emit for unions with mixed literal internal types
+48 48 | field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
+
+PYI030.py:48:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, "foo", True]`
    |
 47 | # Should emit for unions with mixed literal internal types
 48 | field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
@@ -161,7 +311,17 @@ PYI030.py:48:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:51:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 1]`
+ℹ Safe fix
+45 45 | field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
+46 46 | 
+47 47 | # Should emit for unions with mixed literal internal types
+48    |-field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
+   48 |+field15: Literal[1, "foo", True]  # Error
+49 49 | 
+50 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
+51 51 | field16: Literal[1] | Literal[1]  # OK
+
+PYI030.py:51:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 1]`
    |
 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
 51 | field16: Literal[1] | Literal[1]  # OK
@@ -171,7 +331,17 @@ PYI030.py:51:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:60:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+48 48 | field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
+49 49 | 
+50 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
+51    |-field16: Literal[1] | Literal[1]  # OK
+   51 |+field16: Literal[1, 1]  # OK
+52 52 | 
+53 53 | # Shouldn't emit if in new parent type
+54 54 | field17: Literal[1] | dict[Literal[2], str]  # OK
+
+PYI030.py:60:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 59 | # Should respect name of literal type used
 60 | field19: typing.Literal[1] | typing.Literal[2]  # Error
@@ -181,7 +351,17 @@ PYI030.py:60:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:63:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+57 57 | field18: dict[Literal[1], Literal[2]]  # OK
+58 58 | 
+59 59 | # Should respect name of literal type used
+60    |-field19: typing.Literal[1] | typing.Literal[2]  # Error
+   60 |+field19: typing.Literal[1, 2]  # Error
+61 61 | 
+62 62 | # Should emit in cases with newlines
+63 63 | field20: typing.Union[
+
+PYI030.py:63:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 62 |   # Should emit in cases with newlines
 63 |   field20: typing.Union[
@@ -197,7 +377,22 @@ PYI030.py:63:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:71:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
+ℹ Safe fix
+60 60 | field19: typing.Literal[1] | typing.Literal[2]  # Error
+61 61 | 
+62 62 | # Should emit in cases with newlines
+63    |-field20: typing.Union[
+64    |-    Literal[
+65    |-        1  # test
+66    |-    ],
+67    |-    Literal[2],
+68    |-]  # Error, newline and comment will not be emitted in message
+   63 |+field20: Literal[1, 2]  # Error, newline and comment will not be emitted in message
+69 64 | 
+70 65 | # Should handle multiple unions with multiple members
+71 66 | field21: Literal[1, 2] | Literal[3, 4]  # Error
+
+PYI030.py:71:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
    |
 70 | # Should handle multiple unions with multiple members
 71 | field21: Literal[1, 2] | Literal[3, 4]  # Error
@@ -207,7 +402,17 @@ PYI030.py:71:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:74:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+68 68 | ]  # Error, newline and comment will not be emitted in message
+69 69 | 
+70 70 | # Should handle multiple unions with multiple members
+71    |-field21: Literal[1, 2] | Literal[3, 4]  # Error
+   71 |+field21: Literal[1, 2, 3, 4]  # Error
+72 72 | 
+73 73 | # Should emit in cases with `typing.Union` instead of `|`
+74 74 | field22: typing.Union[Literal[1], Literal[2]]  # Error
+
+PYI030.py:74:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 73 | # Should emit in cases with `typing.Union` instead of `|`
 74 | field22: typing.Union[Literal[1], Literal[2]]  # Error
@@ -217,7 +422,17 @@ PYI030.py:74:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:77:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+71 71 | field21: Literal[1, 2] | Literal[3, 4]  # Error
+72 72 | 
+73 73 | # Should emit in cases with `typing.Union` instead of `|`
+74    |-field22: typing.Union[Literal[1], Literal[2]]  # Error
+   74 |+field22: Literal[1, 2]  # Error
+75 75 | 
+76 76 | # Should emit in cases with `typing_extensions.Literal`
+77 77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
+
+PYI030.py:77:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 76 | # Should emit in cases with `typing_extensions.Literal`
 77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
@@ -227,7 +442,17 @@ PYI030.py:77:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:80:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+74 74 | field22: typing.Union[Literal[1], Literal[2]]  # Error
+75 75 | 
+76 76 | # Should emit in cases with `typing_extensions.Literal`
+77    |-field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
+   77 |+field23: typing_extensions.Literal[1, 2]  # Error
+78 78 | 
+79 79 | # Should emit in cases with nested `typing.Union`
+80 80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
+
+PYI030.py:80:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 79 | # Should emit in cases with nested `typing.Union`
 80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
@@ -237,7 +462,17 @@ PYI030.py:80:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:83:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+77 77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
+78 78 | 
+79 79 | # Should emit in cases with nested `typing.Union`
+80    |-field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
+   80 |+field24: typing.Union[Literal[1, 2], str]  # Error
+81 81 | 
+82 82 | # Should emit in cases with mixed `typing.Union` and `|`
+83 83 | field25: typing.Union[Literal[1], Literal[2] | str]  # Error
+
+PYI030.py:83:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 82 | # Should emit in cases with mixed `typing.Union` and `|`
 83 | field25: typing.Union[Literal[1], Literal[2] | str]  # Error
@@ -247,7 +482,17 @@ PYI030.py:83:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:86:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
+ℹ Safe fix
+80 80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
+81 81 | 
+82 82 | # Should emit in cases with mixed `typing.Union` and `|`
+83    |-field25: typing.Union[Literal[1], Literal[2] | str]  # Error
+   83 |+field25: typing.Union[Literal[1, 2], str]  # Error
+84 84 | 
+85 85 | # Should emit only once in cases with multiple nested `typing.Union`
+86 86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
+
+PYI030.py:86:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
    |
 85 | # Should emit only once in cases with multiple nested `typing.Union`
 86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
@@ -257,7 +502,17 @@ PYI030.py:86:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.py:89:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
+ℹ Safe fix
+83 83 | field25: typing.Union[Literal[1], Literal[2] | str]  # Error
+84 84 | 
+85 85 | # Should emit only once in cases with multiple nested `typing.Union`
+86    |-field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
+   86 |+field24: Literal[1, 2, 3, 4]  # Error
+87 87 | 
+88 88 | # Should use the first literal subscript attribute when fixing
+89 89 | field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str]  # Error
+
+PYI030.py:89:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
    |
 88 | # Should use the first literal subscript attribute when fixing
 89 | field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str]  # Error
@@ -265,4 +520,11 @@ PYI030.py:89:10: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
+ℹ Safe fix
+86 86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
+87 87 | 
+88 88 | # Should use the first literal subscript attribute when fixing
+89    |-field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str]  # Error
+   89 |+field25: typing.Union[typing_extensions.Literal[1, 2, 3, 4], str]  # Error
+
 

crates/ruff_linter/src/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI030_PYI030.pyi.snap

@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_pyi/mod.rs
 ---
-PYI030.pyi:9:9: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+PYI030.pyi:9:9: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
  8 | # Should emit for duplicate field types.
  9 | field2: Literal[1] | Literal[2]  # Error
@@ -11,7 +11,17 @@ PYI030.pyi:9:9: PYI030 Multiple literal members in a union. Use a single literal
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:12:17: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+6  6  | field1: Literal[1]  # OK
+7  7  | 
+8  8  | # Should emit for duplicate field types.
+9     |-field2: Literal[1] | Literal[2]  # Error
+   9  |+field2: Literal[1, 2]  # Error
+10 10 | 
+11 11 | # Should emit for union types in arguments.
+12 12 | def func1(arg1: Literal[1] | Literal[2]):  # Error
+
+PYI030.pyi:12:17: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 11 | # Should emit for union types in arguments.
 12 | def func1(arg1: Literal[1] | Literal[2]):  # Error
@@ -20,7 +30,17 @@ PYI030.pyi:12:17: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:17:16: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+9  9  | field2: Literal[1] | Literal[2]  # Error
+10 10 | 
+11 11 | # Should emit for union types in arguments.
+12    |-def func1(arg1: Literal[1] | Literal[2]):  # Error
+   12 |+def func1(arg1: Literal[1, 2]):  # Error
+13 13 |     print(arg1)
+14 14 | 
+15 15 | 
+
+PYI030.pyi:17:16: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 16 | # Should emit for unions in return types.
 17 | def func2() -> Literal[1] | Literal[2]:  # Error
@@ -29,7 +49,17 @@ PYI030.pyi:17:16: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:22:9: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+14 14 | 
+15 15 | 
+16 16 | # Should emit for unions in return types.
+17    |-def func2() -> Literal[1] | Literal[2]:  # Error
+   17 |+def func2() -> Literal[1, 2]:  # Error
+18 18 |     return "my Literal[1]ing"
+19 19 | 
+20 20 | 
+
+PYI030.pyi:22:9: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 21 | # Should emit in longer unions, even if not directly adjacent.
 22 | field3: Literal[1] | Literal[2] | str  # Error
@@ -39,7 +69,17 @@ PYI030.pyi:22:9: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:23:9: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+19 19 | 
+20 20 | 
+21 21 | # Should emit in longer unions, even if not directly adjacent.
+22    |-field3: Literal[1] | Literal[2] | str  # Error
+   22 |+field3: Literal[1, 2] | str  # Error
+23 23 | field4: str | Literal[1] | Literal[2]  # Error
+24 24 | field5: Literal[1] | str | Literal[2]  # Error
+25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+
+PYI030.pyi:23:9: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 21 | # Should emit in longer unions, even if not directly adjacent.
 22 | field3: Literal[1] | Literal[2] | str  # Error
@@ -50,7 +90,17 @@ PYI030.pyi:23:9: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:24:9: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+20 20 | 
+21 21 | # Should emit in longer unions, even if not directly adjacent.
+22 22 | field3: Literal[1] | Literal[2] | str  # Error
+23    |-field4: str | Literal[1] | Literal[2]  # Error
+   23 |+field4: Literal[1, 2] | str  # Error
+24 24 | field5: Literal[1] | str | Literal[2]  # Error
+25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+26 26 | 
+
+PYI030.pyi:24:9: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 22 | field3: Literal[1] | Literal[2] | str  # Error
 23 | field4: str | Literal[1] | Literal[2]  # Error
@@ -60,7 +110,17 @@ PYI030.pyi:24:9: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:25:9: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+21 21 | # Should emit in longer unions, even if not directly adjacent.
+22 22 | field3: Literal[1] | Literal[2] | str  # Error
+23 23 | field4: str | Literal[1] | Literal[2]  # Error
+24    |-field5: Literal[1] | str | Literal[2]  # Error
+   24 |+field5: Literal[1, 2] | str  # Error
+25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+26 26 | 
+27 27 | # Should emit for non-type unions.
+
+PYI030.pyi:25:9: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 23 | field4: str | Literal[1] | Literal[2]  # Error
 24 | field5: Literal[1] | str | Literal[2]  # Error
@@ -71,7 +131,17 @@ PYI030.pyi:25:9: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:28:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+22 22 | field3: Literal[1] | Literal[2] | str  # Error
+23 23 | field4: str | Literal[1] | Literal[2]  # Error
+24 24 | field5: Literal[1] | str | Literal[2]  # Error
+25    |-field6: Literal[1] | bool | Literal[2] | str  # Error
+   25 |+field6: Literal[1, 2] | bool | str  # Error
+26 26 | 
+27 27 | # Should emit for non-type unions.
+28 28 | field7 = Literal[1] | Literal[2]  # Error
+
+PYI030.pyi:28:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 27 | # Should emit for non-type unions.
 28 | field7 = Literal[1] | Literal[2]  # Error
@@ -81,7 +151,17 @@ PYI030.pyi:28:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:31:9: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+25 25 | field6: Literal[1] | bool | Literal[2] | str  # Error
+26 26 | 
+27 27 | # Should emit for non-type unions.
+28    |-field7 = Literal[1] | Literal[2]  # Error
+   28 |+field7 = Literal[1, 2]  # Error
+29 29 | 
+30 30 | # Should emit for parenthesized unions.
+31 31 | field8: Literal[1] | (Literal[2] | str)  # Error
+
+PYI030.pyi:31:9: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 30 | # Should emit for parenthesized unions.
 31 | field8: Literal[1] | (Literal[2] | str)  # Error
@@ -91,7 +171,17 @@ PYI030.pyi:31:9: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:34:9: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+28 28 | field7 = Literal[1] | Literal[2]  # Error
+29 29 | 
+30 30 | # Should emit for parenthesized unions.
+31    |-field8: Literal[1] | (Literal[2] | str)  # Error
+   31 |+field8: Literal[1, 2] | str  # Error
+32 32 | 
+33 33 | # Should handle user parentheses when fixing.
+34 34 | field9: Literal[1] | (Literal[2] | str)  # Error
+
+PYI030.pyi:34:9: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 33 | # Should handle user parentheses when fixing.
 34 | field9: Literal[1] | (Literal[2] | str)  # Error
@@ -100,7 +190,17 @@ PYI030.pyi:34:9: PYI030 Multiple literal members in a union. Use a single litera
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:35:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+31 31 | field8: Literal[1] | (Literal[2] | str)  # Error
+32 32 | 
+33 33 | # Should handle user parentheses when fixing.
+34    |-field9: Literal[1] | (Literal[2] | str)  # Error
+   34 |+field9: Literal[1, 2] | str  # Error
+35 35 | field10: (Literal[1] | str) | Literal[2]  # Error
+36 36 | 
+37 37 | # Should emit for union in generic parent type.
+
+PYI030.pyi:35:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 33 | # Should handle user parentheses when fixing.
 34 | field9: Literal[1] | (Literal[2] | str)  # Error
@@ -111,7 +211,17 @@ PYI030.pyi:35:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:38:15: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+32 32 | 
+33 33 | # Should handle user parentheses when fixing.
+34 34 | field9: Literal[1] | (Literal[2] | str)  # Error
+35    |-field10: (Literal[1] | str) | Literal[2]  # Error
+   35 |+field10: Literal[1, 2] | str  # Error
+36 36 | 
+37 37 | # Should emit for union in generic parent type.
+38 38 | field11: dict[Literal[1] | Literal[2], str]  # Error
+
+PYI030.pyi:38:15: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 37 | # Should emit for union in generic parent type.
 38 | field11: dict[Literal[1] | Literal[2], str]  # Error
@@ -121,7 +231,17 @@ PYI030.pyi:38:15: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:41:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]`
+ℹ Safe fix
+35 35 | field10: (Literal[1] | str) | Literal[2]  # Error
+36 36 | 
+37 37 | # Should emit for union in generic parent type.
+38    |-field11: dict[Literal[1] | Literal[2], str]  # Error
+   38 |+field11: dict[Literal[1, 2], str]  # Error
+39 39 | 
+40 40 | # Should emit for unions with more than two cases
+41 41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
+
+PYI030.pyi:41:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]`
    |
 40 | # Should emit for unions with more than two cases
 41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
@@ -130,7 +250,17 @@ PYI030.pyi:41:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:42:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
+ℹ Safe fix
+38 38 | field11: dict[Literal[1] | Literal[2], str]  # Error
+39 39 | 
+40 40 | # Should emit for unions with more than two cases
+41    |-field12: Literal[1] | Literal[2] | Literal[3]  # Error
+   41 |+field12: Literal[1, 2, 3]  # Error
+42 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
+43 43 | 
+44 44 | # Should emit for unions with more than two cases, even if not directly adjacent
+
+PYI030.pyi:42:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
    |
 40 | # Should emit for unions with more than two cases
 41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
@@ -141,7 +271,17 @@ PYI030.pyi:42:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:45:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]`
+ℹ Safe fix
+39 39 | 
+40 40 | # Should emit for unions with more than two cases
+41 41 | field12: Literal[1] | Literal[2] | Literal[3]  # Error
+42    |-field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
+   42 |+field13: Literal[1, 2, 3, 4]  # Error
+43 43 | 
+44 44 | # Should emit for unions with more than two cases, even if not directly adjacent
+45 45 | field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
+
+PYI030.pyi:45:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3]`
    |
 44 | # Should emit for unions with more than two cases, even if not directly adjacent
 45 | field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
@@ -151,7 +291,17 @@ PYI030.pyi:45:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:48:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, "foo", True]`
+ℹ Safe fix
+42 42 | field13: Literal[1] | Literal[2] | Literal[3] | Literal[4]  # Error
+43 43 | 
+44 44 | # Should emit for unions with more than two cases, even if not directly adjacent
+45    |-field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
+   45 |+field14: Literal[1, 2, 3] | str  # Error
+46 46 | 
+47 47 | # Should emit for unions with mixed literal internal types
+48 48 | field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
+
+PYI030.pyi:48:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, "foo", True]`
    |
 47 | # Should emit for unions with mixed literal internal types
 48 | field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
@@ -161,7 +311,17 @@ PYI030.pyi:48:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:51:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 1]`
+ℹ Safe fix
+45 45 | field14: Literal[1] | Literal[2] | str | Literal[3]  # Error
+46 46 | 
+47 47 | # Should emit for unions with mixed literal internal types
+48    |-field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
+   48 |+field15: Literal[1, "foo", True]  # Error
+49 49 | 
+50 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
+51 51 | field16: Literal[1] | Literal[1]  # OK
+
+PYI030.pyi:51:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 1]`
    |
 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
 51 | field16: Literal[1] | Literal[1]  # OK
@@ -171,7 +331,17 @@ PYI030.pyi:51:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:60:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+48 48 | field15: Literal[1] | Literal["foo"] | Literal[True]  # Error
+49 49 | 
+50 50 | # Shouldn't emit for duplicate field types with same value; covered by Y016
+51    |-field16: Literal[1] | Literal[1]  # OK
+   51 |+field16: Literal[1, 1]  # OK
+52 52 | 
+53 53 | # Shouldn't emit if in new parent type
+54 54 | field17: Literal[1] | dict[Literal[2], str]  # OK
+
+PYI030.pyi:60:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 59 | # Should respect name of literal type used
 60 | field19: typing.Literal[1] | typing.Literal[2]  # Error
@@ -181,7 +351,17 @@ PYI030.pyi:60:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:63:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+57 57 | field18: dict[Literal[1], Literal[2]]  # OK
+58 58 | 
+59 59 | # Should respect name of literal type used
+60    |-field19: typing.Literal[1] | typing.Literal[2]  # Error
+   60 |+field19: typing.Literal[1, 2]  # Error
+61 61 | 
+62 62 | # Should emit in cases with newlines
+63 63 | field20: typing.Union[
+
+PYI030.pyi:63:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 62 |   # Should emit in cases with newlines
 63 |   field20: typing.Union[
@@ -197,7 +377,22 @@ PYI030.pyi:63:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:71:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
+ℹ Safe fix
+60 60 | field19: typing.Literal[1] | typing.Literal[2]  # Error
+61 61 | 
+62 62 | # Should emit in cases with newlines
+63    |-field20: typing.Union[
+64    |-    Literal[
+65    |-        1  # test
+66    |-    ],
+67    |-    Literal[2],
+68    |-]  # Error, newline and comment will not be emitted in message
+   63 |+field20: Literal[1, 2]  # Error, newline and comment will not be emitted in message
+69 64 | 
+70 65 | # Should handle multiple unions with multiple members
+71 66 | field21: Literal[1, 2] | Literal[3, 4]  # Error
+
+PYI030.pyi:71:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
    |
 70 | # Should handle multiple unions with multiple members
 71 | field21: Literal[1, 2] | Literal[3, 4]  # Error
@@ -207,7 +402,17 @@ PYI030.pyi:71:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:74:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+68 68 | ]  # Error, newline and comment will not be emitted in message
+69 69 | 
+70 70 | # Should handle multiple unions with multiple members
+71    |-field21: Literal[1, 2] | Literal[3, 4]  # Error
+   71 |+field21: Literal[1, 2, 3, 4]  # Error
+72 72 | 
+73 73 | # Should emit in cases with `typing.Union` instead of `|`
+74 74 | field22: typing.Union[Literal[1], Literal[2]]  # Error
+
+PYI030.pyi:74:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 73 | # Should emit in cases with `typing.Union` instead of `|`
 74 | field22: typing.Union[Literal[1], Literal[2]]  # Error
@@ -217,7 +422,17 @@ PYI030.pyi:74:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:77:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+71 71 | field21: Literal[1, 2] | Literal[3, 4]  # Error
+72 72 | 
+73 73 | # Should emit in cases with `typing.Union` instead of `|`
+74    |-field22: typing.Union[Literal[1], Literal[2]]  # Error
+   74 |+field22: Literal[1, 2]  # Error
+75 75 | 
+76 76 | # Should emit in cases with `typing_extensions.Literal`
+77 77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
+
+PYI030.pyi:77:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 76 | # Should emit in cases with `typing_extensions.Literal`
 77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
@@ -227,7 +442,17 @@ PYI030.pyi:77:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:80:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+74 74 | field22: typing.Union[Literal[1], Literal[2]]  # Error
+75 75 | 
+76 76 | # Should emit in cases with `typing_extensions.Literal`
+77    |-field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
+   77 |+field23: typing_extensions.Literal[1, 2]  # Error
+78 78 | 
+79 79 | # Should emit in cases with nested `typing.Union`
+80 80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
+
+PYI030.pyi:80:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 79 | # Should emit in cases with nested `typing.Union`
 80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
@@ -237,7 +462,17 @@ PYI030.pyi:80:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:83:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
+ℹ Safe fix
+77 77 | field23: typing_extensions.Literal[1] | typing_extensions.Literal[2]  # Error
+78 78 | 
+79 79 | # Should emit in cases with nested `typing.Union`
+80    |-field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
+   80 |+field24: typing.Union[Literal[1, 2], str]  # Error
+81 81 | 
+82 82 | # Should emit in cases with mixed `typing.Union` and `|`
+83 83 | field25: typing.Union[Literal[1], Literal[2] | str]  # Error
+
+PYI030.pyi:83:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2]`
    |
 82 | # Should emit in cases with mixed `typing.Union` and `|`
 83 | field25: typing.Union[Literal[1], Literal[2] | str]  # Error
@@ -247,7 +482,17 @@ PYI030.pyi:83:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:86:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
+ℹ Safe fix
+80 80 | field24: typing.Union[Literal[1], typing.Union[Literal[2], str]]  # Error
+81 81 | 
+82 82 | # Should emit in cases with mixed `typing.Union` and `|`
+83    |-field25: typing.Union[Literal[1], Literal[2] | str]  # Error
+   83 |+field25: typing.Union[Literal[1, 2], str]  # Error
+84 84 | 
+85 85 | # Should emit only once in cases with multiple nested `typing.Union`
+86 86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
+
+PYI030.pyi:86:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
    |
 85 | # Should emit only once in cases with multiple nested `typing.Union`
 86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
@@ -257,7 +502,17 @@ PYI030.pyi:86:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
-PYI030.pyi:89:10: PYI030 Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
+ℹ Safe fix
+83 83 | field25: typing.Union[Literal[1], Literal[2] | str]  # Error
+84 84 | 
+85 85 | # Should emit only once in cases with multiple nested `typing.Union`
+86    |-field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
+   86 |+field24: Literal[1, 2, 3, 4]  # Error
+87 87 | 
+88 88 | # Should use the first literal subscript attribute when fixing
+89 89 | field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str]  # Error
+
+PYI030.pyi:89:10: PYI030 [*] Multiple literal members in a union. Use a single literal, e.g. `Literal[1, 2, 3, 4]`
    |
 88 | # Should use the first literal subscript attribute when fixing
 89 | field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str]  # Error
@@ -265,4 +520,11 @@ PYI030.pyi:89:10: PYI030 Multiple literal members in a union. Use a single liter
    |
    = help: Replace with a single `Literal`
 
+ℹ Safe fix
+86 86 | field24: typing.Union[Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]]]  # Error
+87 87 | 
+88 88 | # Should use the first literal subscript attribute when fixing
+89    |-field25: typing.Union[typing_extensions.Literal[1], typing.Union[Literal[2], typing.Union[Literal[3], Literal[4]]], str]  # Error
+   89 |+field25: typing.Union[typing_extensions.Literal[1, 2, 3, 4], str]  # Error
+
 

crates/ruff_linter/src/rules/flake8_pytest_style/rules/fixture.rs

@@ -24,7 +24,7 @@ use super::helpers::{
 
 /// ## What it does
 /// Checks for argument-free `@pytest.fixture()` decorators with or without
-/// parentheses, depending on the `flake8-pytest-style.fixture-parentheses`
+/// parentheses, depending on the [`lint.flake8-pytest-style.fixture-parentheses`]
 /// setting.
 ///
 /// ## Why is this bad?
@@ -55,7 +55,7 @@ use super::helpers::{
 /// ```
 ///
 /// ## Options
-/// - `flake8-pytest-style.fixture-parentheses`
+/// - `lint.flake8-pytest-style.fixture-parentheses`
 ///
 /// ## References
 /// - [`pytest` documentation: API Reference: Fixtures](https://docs.pytest.org/en/latest/reference/reference.html#fixtures-api)

crates/ruff_linter/src/rules/flake8_pytest_style/rules/marks.rs

@@ -11,7 +11,7 @@ use super::helpers::get_mark_decorators;
 
 /// ## What it does
 /// Checks for argument-free `@pytest.mark.<marker>()` decorators with or
-/// without parentheses, depending on the `flake8-pytest-style.mark-parentheses`
+/// without parentheses, depending on the [`lint.flake8-pytest-style.mark-parentheses`]
 /// setting.
 ///
 /// ## Why is this bad?
@@ -42,7 +42,7 @@ use super::helpers::get_mark_decorators;
 /// ```
 ///
 /// ## Options
-/// - `flake8-pytest-style.mark-parentheses`
+/// - `lint.flake8-pytest-style.mark-parentheses`
 ///
 /// ## References
 /// - [`pytest` documentation: Marks](https://docs.pytest.org/en/latest/reference/reference.html#marks)