From 9a1f7a55548b148f2fe037e42b95b330beff2212 Mon Sep 17 00:00:00 2001 From: Brent Westbrook Date: Tue, 10 Mar 2026 12:06:01 -0400 Subject: [PATCH 1/7] Drop a few rules from the preview default set Summary -- This PR incorporates some feedback from internal discussions on [Discord] and from https://github.com/astral-sh/ruff/discussions/23203 into the preview default rule set. In particular, we drop: - [`PERF401`](https://docs.astral.sh/ruff/rules/PERF401) - [`PERF403`](https://docs.astral.sh/ruff/rules/PERF403) - [`PLR1714`](https://docs.astral.sh/ruff/rules/PLR1714) - [`RET504`](https://docs.astral.sh/ruff/rules/RET504) - [`SIM102`](https://docs.astral.sh/ruff/rules/SIM102) - [`SIM114`](https://docs.astral.sh/ruff/rules/SIM114) - [`TRY300`](https://docs.astral.sh/ruff/rules/TRY300) A couple of these disagree a bit with Clippy's own categorization. For example, our SIM102 is [collapsible_if], SIM114 is [if_same_then_else], and RET504 is [let_and_return], all of which are Style lints for Clippy. But if users find them annoying in Python, it makes sense to me to bump them down to Pedantic. PERF401 and PERF403 also have open issues (#21890, #21891), so I think it makes sense to consider them lower severity, at least until those are resolved. TRY300 and PLR1714 are just a bit more pedantic than expected and some people prefer the styles they flag. [Discord]: https://discord.com/channels/1039017663004942429/1082324250112823306/1478345981916348526 [let_and_return]: https://rust-lang.github.io/rust-clippy/master/?search=assign#let_and_return [collapsible_if]: https://rust-lang.github.io/rust-clippy/master/?search=collap#collapsible_if [if_same_then_else]: https://rust-lang.github.io/rust-clippy/master/?search=then_#if_same_then_else Test Plan -- Future default users From 9e3b50e793d7c5cd00aa3f3da77c64d9b8f904df Mon Sep 17 00:00:00 2001 From: Brent Westbrook Date: Tue, 10 Mar 2026 11:51:44 -0400 Subject: [PATCH 2/7] drop TRY300, SIM114, and PLR1714 these are based on internal adoption feedback from: https://discord.com/channels/1039017663004942429/1082324250112823306/1478345981916348526 --- crates/ruff_linter/src/settings/mod.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/crates/ruff_linter/src/settings/mod.rs b/crates/ruff_linter/src/settings/mod.rs index b098d891d97e4..51c95423aa532 100644 --- a/crates/ruff_linter/src/settings/mod.rs +++ b/crates/ruff_linter/src/settings/mod.rs @@ -579,7 +579,6 @@ pub const PREVIEW_DEFAULT_SELECTORS: &[RuleSelector] = &[ RuleSelector::rule(RuleCodePrefix::Pylint(codes::Pylint::R0402)), // PLR0402 RuleSelector::rule(RuleCodePrefix::Pylint(codes::Pylint::R1704)), // PLR1704 RuleSelector::rule(RuleCodePrefix::Pylint(codes::Pylint::R1711)), // PLR1711 - RuleSelector::rule(RuleCodePrefix::Pylint(codes::Pylint::R1714)), // PLR1714 RuleSelector::rule(RuleCodePrefix::Pylint(codes::Pylint::R1716)), // PLR1716 RuleSelector::rule(RuleCodePrefix::Pylint(codes::Pylint::R1722)), // PLR1722 RuleSelector::rule(RuleCodePrefix::Pylint(codes::Pylint::R1730)), // PLR1730 @@ -705,7 +704,6 @@ pub const PREVIEW_DEFAULT_SELECTORS: &[RuleSelector] = &[ RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_103)), // SIM103 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_107)), // SIM107 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_113)), // SIM113 - RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_114)), // SIM114 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_115)), // SIM115 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_117)), // SIM117 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_118)), // SIM118 @@ -730,7 +728,6 @@ pub const PREVIEW_DEFAULT_SELECTORS: &[RuleSelector] = &[ RuleSelector::rule(RuleCodePrefix::Tryceratops(codes::Tryceratops::_004)), // TRY004 RuleSelector::rule(RuleCodePrefix::Tryceratops(codes::Tryceratops::_201)), // TRY201 RuleSelector::rule(RuleCodePrefix::Tryceratops(codes::Tryceratops::_203)), // TRY203 - RuleSelector::rule(RuleCodePrefix::Tryceratops(codes::Tryceratops::_300)), // TRY300 RuleSelector::rule(RuleCodePrefix::Tryceratops(codes::Tryceratops::_401)), // TRY401 RuleSelector::rule(RuleCodePrefix::Pyupgrade(codes::Pyupgrade::_001)), // UP001 RuleSelector::rule(RuleCodePrefix::Pyupgrade(codes::Pyupgrade::_003)), // UP003 From 0736524a7075d7ea7bc161d03d0fea2baea7d168 Mon Sep 17 00:00:00 2001 From: Brent Westbrook Date: Tue, 10 Mar 2026 11:53:51 -0400 Subject: [PATCH 3/7] drop SIM102 this came up both internally and in the discussion, and it feels similar in spirit to SIM114 --- crates/ruff_linter/src/settings/mod.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/ruff_linter/src/settings/mod.rs b/crates/ruff_linter/src/settings/mod.rs index 51c95423aa532..74943fc4c3b09 100644 --- a/crates/ruff_linter/src/settings/mod.rs +++ b/crates/ruff_linter/src/settings/mod.rs @@ -700,7 +700,6 @@ pub const PREVIEW_DEFAULT_SELECTORS: &[RuleSelector] = &[ RuleSelector::rule(RuleCodePrefix::Flake8Bandit(codes::Flake8Bandit::_110)), // S110 RuleSelector::rule(RuleCodePrefix::Flake8Bandit(codes::Flake8Bandit::_112)), // S112 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_101)), // SIM101 - RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_102)), // SIM102 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_103)), // SIM103 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_107)), // SIM107 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_113)), // SIM113 From 3959950599c7422d2dfad5b032fd580b04d9775f Mon Sep 17 00:00:00 2001 From: Brent Westbrook Date: Tue, 10 Mar 2026 11:58:15 -0400 Subject: [PATCH 4/7] drop PERF401 and PERF403 these are a bit controversial and also have open issues, especially around the `extend` parts: - https://github.com/astral-sh/ruff/issues/21891 - https://github.com/astral-sh/ruff/issues/21890 --- crates/ruff_linter/src/settings/mod.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/crates/ruff_linter/src/settings/mod.rs b/crates/ruff_linter/src/settings/mod.rs index 74943fc4c3b09..6cea15df57c27 100644 --- a/crates/ruff_linter/src/settings/mod.rs +++ b/crates/ruff_linter/src/settings/mod.rs @@ -521,9 +521,7 @@ pub const PREVIEW_DEFAULT_SELECTORS: &[RuleSelector] = &[ RuleSelector::rule(RuleCodePrefix::PEP8Naming(codes::PEP8Naming::_999)), // N999 RuleSelector::rule(RuleCodePrefix::Perflint(codes::Perflint::_101)), // PERF101 RuleSelector::rule(RuleCodePrefix::Perflint(codes::Perflint::_102)), // PERF102 - RuleSelector::rule(RuleCodePrefix::Perflint(codes::Perflint::_401)), // PERF401 RuleSelector::rule(RuleCodePrefix::Perflint(codes::Perflint::_402)), // PERF402 - RuleSelector::rule(RuleCodePrefix::Perflint(codes::Perflint::_403)), // PERF403 RuleSelector::rule(RuleCodePrefix::PygrepHooks(codes::PygrepHooks::_005)), // PGH005 RuleSelector::rule(RuleCodePrefix::Flake8Pie(codes::Flake8Pie::_790)), // PIE790 RuleSelector::rule(RuleCodePrefix::Flake8Pie(codes::Flake8Pie::_794)), // PIE794 From e309728ae225e7ed47da13dc201ec031a7194e18 Mon Sep 17 00:00:00 2001 From: Brent Westbrook Date: Tue, 10 Mar 2026 12:00:21 -0400 Subject: [PATCH 5/7] drop RET504 --- crates/ruff_linter/src/settings/mod.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/ruff_linter/src/settings/mod.rs b/crates/ruff_linter/src/settings/mod.rs index 6cea15df57c27..eb15f5fa74303 100644 --- a/crates/ruff_linter/src/settings/mod.rs +++ b/crates/ruff_linter/src/settings/mod.rs @@ -659,7 +659,6 @@ pub const PREVIEW_DEFAULT_SELECTORS: &[RuleSelector] = &[ RuleSelector::rule(RuleCodePrefix::Flake8Pyi(codes::Flake8Pyi::_064)), // PYI064 RuleSelector::rule(RuleCodePrefix::Flake8Pyi(codes::Flake8Pyi::_066)), // PYI066 RuleSelector::rule(RuleCodePrefix::Flake8Return(codes::Flake8Return::_501)), // RET501 - RuleSelector::rule(RuleCodePrefix::Flake8Return(codes::Flake8Return::_504)), // RET504 RuleSelector::rule(RuleCodePrefix::Ruff(codes::Ruff::_007)), // RUF007 RuleSelector::rule(RuleCodePrefix::Ruff(codes::Ruff::_008)), // RUF008 RuleSelector::rule(RuleCodePrefix::Ruff(codes::Ruff::_009)), // RUF009 From 8b33c311c1bfac66c4e2aadf5c8d9f34337a864e Mon Sep 17 00:00:00 2001 From: Brent Westbrook Date: Tue, 10 Mar 2026 12:18:13 -0400 Subject: [PATCH 6/7] update snapshots --- crates/ruff/tests/cli/lint.rs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/crates/ruff/tests/cli/lint.rs b/crates/ruff/tests/cli/lint.rs index 342ae06a5f657..d01caf51ce4ba 100644 --- a/crates/ruff/tests/cli/lint.rs +++ b/crates/ruff/tests/cli/lint.rs @@ -4186,13 +4186,10 @@ fn preview_default_rules() -> Result<()> { pytest-use-fixtures-without-parameters (PT026), pytest-warns-with-multiple-statements (PT031), unnecessary-return-none (RET501), - unnecessary-assign (RET504), duplicate-isinstance-call (SIM101), - collapsible-if (SIM102), needless-bool (SIM103), return-in-try-except-finally (SIM107), enumerate-for-loop (SIM113), - if-with-same-arms (SIM114), open-file-with-context-handler (SIM115), multiple-with-statements (SIM117), in-dict-keys (SIM118), @@ -4219,9 +4216,7 @@ fn preview_default_rules() -> Result<()> { invalid-module-name (N999), unnecessary-list-cast (PERF101), incorrect-dict-iterator (PERF102), - manual-list-comprehension (PERF401), manual-list-copy (PERF402), - manual-dict-comprehension (PERF403), bare-except (E722), io-error (E902), invalid-escape-sequence (W605), @@ -4312,7 +4307,6 @@ fn preview_default_rules() -> Result<()> { manual-from-import (PLR0402), redefined-argument-from-local (PLR1704), useless-return (PLR1711), - repeated-equality-comparison (PLR1714), boolean-chained-comparison (PLR1716), sys-exit-alias (PLR1722), if-stmt-min-max (PLR1730), @@ -4435,7 +4429,6 @@ fn preview_default_rules() -> Result<()> { type-check-without-type-error (TRY004), verbose-raise (TRY201), useless-try-except (TRY203), - try-consider-else (TRY300), verbose-log-message (TRY401), ] ", From 809099fef01167452dc9eac35a2e03db6177211e Mon Sep 17 00:00:00 2001 From: Brent Westbrook Date: Wed, 11 Mar 2026 13:14:39 -0400 Subject: [PATCH 7/7] restore SIM rules --- crates/ruff/tests/cli/lint.rs | 2 ++ crates/ruff_linter/src/settings/mod.rs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/crates/ruff/tests/cli/lint.rs b/crates/ruff/tests/cli/lint.rs index d01caf51ce4ba..5408798cc8acc 100644 --- a/crates/ruff/tests/cli/lint.rs +++ b/crates/ruff/tests/cli/lint.rs @@ -4187,9 +4187,11 @@ fn preview_default_rules() -> Result<()> { pytest-warns-with-multiple-statements (PT031), unnecessary-return-none (RET501), duplicate-isinstance-call (SIM101), + collapsible-if (SIM102), needless-bool (SIM103), return-in-try-except-finally (SIM107), enumerate-for-loop (SIM113), + if-with-same-arms (SIM114), open-file-with-context-handler (SIM115), multiple-with-statements (SIM117), in-dict-keys (SIM118), diff --git a/crates/ruff_linter/src/settings/mod.rs b/crates/ruff_linter/src/settings/mod.rs index eb15f5fa74303..9f4d4ee327364 100644 --- a/crates/ruff_linter/src/settings/mod.rs +++ b/crates/ruff_linter/src/settings/mod.rs @@ -697,9 +697,11 @@ pub const PREVIEW_DEFAULT_SELECTORS: &[RuleSelector] = &[ RuleSelector::rule(RuleCodePrefix::Flake8Bandit(codes::Flake8Bandit::_110)), // S110 RuleSelector::rule(RuleCodePrefix::Flake8Bandit(codes::Flake8Bandit::_112)), // S112 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_101)), // SIM101 + RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_102)), // SIM102 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_103)), // SIM103 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_107)), // SIM107 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_113)), // SIM113 + RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_114)), // SIM114 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_115)), // SIM115 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_117)), // SIM117 RuleSelector::rule(RuleCodePrefix::Flake8Simplify(codes::Flake8Simplify::_118)), // SIM118