Merge branch 'main' into 20240708-1515

astral-sh · Jul 9, 2024 · b9438eb · b9438eb
2 parents 75e6525 + bf3d903
commit b9438eb
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/crates/ruff/src/commands/format.rs b/crates/ruff/src/commands/format.rs
@@ -794,6 +794,8 @@ pub(super) fn warn_incompatible_formatter_settings(resolver: &Resolver) {
             //     pass
             // ```
             Rule::MissingTrailingComma,
+            // The formatter always removes blank lines before the docstring.
+            Rule::OneBlankLineBeforeClass,
         ] {
             if setting.linter.rules.enabled(rule) {
                 incompatible_rules.insert(rule);