Remove expected from TooManyBlankLines

astral-sh · Mar 1, 2024 · 066cc98 · 066cc98
1 parent c346b8d
commit 066cc98
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 38 deletions.
diff --git a/crates/ruff_linter/src/rules/pycodestyle/rules/blank_lines.rs b/crates/ruff_linter/src/rules/pycodestyle/rules/blank_lines.rs
@@ -160,17 +160,14 @@ impl AlwaysFixableViolation for BlankLinesTopLevel {
 #[violation]
 pub struct TooManyBlankLines {
     actual_blank_lines: u32,
-    max_blank_lines: u32,
 }
 
 impl AlwaysFixableViolation for TooManyBlankLines {
     #[derive_message_formats]
     fn message(&self) -> String {
-        let TooManyBlankLines {
-            actual_blank_lines,
-            max_blank_lines,
-        } = self;
-        format!("Too many blank lines ({actual_blank_lines} > {max_blank_lines})")
+        let TooManyBlankLines { actual_blank_lines } = self;
+
+        format!("Too many blank lines ({actual_blank_lines})")
     }
 
     fn fix_title(&self) -> String {
@@ -835,7 +832,6 @@ impl<'a> BlankLinesChecker<'a> {
             let mut diagnostic = Diagnostic::new(
                 TooManyBlankLines {
                     actual_blank_lines: line.blank_lines.count(),
-                    max_blank_lines,
                 },
                 line.first_token_range,
             );

diff --git a/.../src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E30.py.snap b/.../src/rules/pycodestyle/snapshots/ruff_linter__rules__pycodestyle__tests__E303_E30.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/pycodestyle/mod.rs
 ---
-E30.py:578:2: E303 [*] Too many blank lines (2 > 1)
+E30.py:578:2: E303 [*] Too many blank lines (2)
     |
 578 |     def method2():
     |     ^^^ E303
@@ -19,7 +19,7 @@ E30.py:578:2: E303 [*] Too many blank lines (2 > 1)
 579 578 | 		return 22
 580 579 | # end
 
-E30.py:588:5: E303 [*] Too many blank lines (2 > 1)
+E30.py:588:5: E303 [*] Too many blank lines (2)
     |
 588 |     # arbitrary comment
     |     ^^^^^^^^^^^^^^^^^^^ E303
@@ -37,7 +37,7 @@ E30.py:588:5: E303 [*] Too many blank lines (2 > 1)
 589 588 | 
 590 589 |     def inner():  # E306 not expected (pycodestyle detects E306)
 
-E30.py:600:5: E303 [*] Too many blank lines (2 > 1)
+E30.py:600:5: E303 [*] Too many blank lines (2)
     |
 600 |     # arbitrary comment
     |     ^^^^^^^^^^^^^^^^^^^ E303
@@ -55,7 +55,7 @@ E30.py:600:5: E303 [*] Too many blank lines (2 > 1)
 601 600 |     def inner():  # E306 not expected (pycodestyle detects E306)
 602 601 |         pass
 
-E30.py:611:1: E303 [*] Too many blank lines (3 > 2)
+E30.py:611:1: E303 [*] Too many blank lines (3)
     |
 611 | print()
     | ^^^^^ E303
@@ -72,7 +72,7 @@ E30.py:611:1: E303 [*] Too many blank lines (3 > 2)
 612 611 | # end
 613 612 | 
 
-E30.py:620:1: E303 [*] Too many blank lines (3 > 2)
+E30.py:620:1: E303 [*] Too many blank lines (3)
     |
 620 | # comment
     | ^^^^^^^^^ E303
@@ -90,7 +90,7 @@ E30.py:620:1: E303 [*] Too many blank lines (3 > 2)
 621 620 | 
 622 621 | print()
 
-E30.py:631:5: E303 [*] Too many blank lines (2 > 1)
+E30.py:631:5: E303 [*] Too many blank lines (2)
     |
 631 |     # comment
     |     ^^^^^^^^^ E303
@@ -106,7 +106,7 @@ E30.py:631:5: E303 [*] Too many blank lines (2 > 1)
 632 631 | 
 633 632 | 
 
-E30.py:634:5: E303 [*] Too many blank lines (2 > 1)
+E30.py:634:5: E303 [*] Too many blank lines (2)
     |
 634 |     # another comment
     |     ^^^^^^^^^^^^^^^^^ E303
@@ -124,7 +124,7 @@ E30.py:634:5: E303 [*] Too many blank lines (2 > 1)
 635 634 | 
 636 635 |     print()
 
-E30.py:645:1: E303 [*] Too many blank lines (3 > 2)
+E30.py:645:1: E303 [*] Too many blank lines (3)
     |
 645 | / """This class docstring comes on line 5.
 646 | | It gives error E303: too many blank lines (3)
@@ -143,7 +143,7 @@ E30.py:645:1: E303 [*] Too many blank lines (3 > 2)
 646 645 | It gives error E303: too many blank lines (3)
 647 646 | """
 
-E30.py:657:5: E303 [*] Too many blank lines (2 > 1)
+E30.py:657:5: E303 [*] Too many blank lines (2)
     |
 657 |     def b(self):
     |     ^^^ E303
@@ -161,7 +161,7 @@ E30.py:657:5: E303 [*] Too many blank lines (2 > 1)
 658 657 |         pass
 659 658 | # end
 
-E30.py:667:5: E303 [*] Too many blank lines (2 > 1)
+E30.py:667:5: E303 [*] Too many blank lines (2)
     |
 667 |     a = 2
     |     ^ E303
@@ -178,7 +178,7 @@ E30.py:667:5: E303 [*] Too many blank lines (2 > 1)
 668 667 | # end
 669 668 | 
 
-E30.py:675:5: E303 [*] Too many blank lines (2 > 1)
+E30.py:675:5: E303 [*] Too many blank lines (2)
     |
 675 |     # comment
     |     ^^^^^^^^^ E303
@@ -194,7 +194,7 @@ E30.py:675:5: E303 [*] Too many blank lines (2 > 1)
 676 675 | 
 677 676 | 
 
-E30.py:678:5: E303 [*] Too many blank lines (2 > 1)
+E30.py:678:5: E303 [*] Too many blank lines (2)
     |
 678 |     # another comment
     |     ^^^^^^^^^^^^^^^^^ E303
@@ -212,7 +212,7 @@ E30.py:678:5: E303 [*] Too many blank lines (2 > 1)
 679 678 | 
 680 679 |     def test(self): pass
 
-E30.py:692:5: E303 [*] Too many blank lines (2 > 1)
+E30.py:692:5: E303 [*] Too many blank lines (2)
     |
 692 |     def b(self):
     |     ^^^ E303
@@ -230,7 +230,7 @@ E30.py:692:5: E303 [*] Too many blank lines (2 > 1)
 693 692 |         pass
 694 693 | # end
 
-E30.py:702:5: E303 [*] Too many blank lines (2 > 1)
+E30.py:702:5: E303 [*] Too many blank lines (2)
     |
 702 |     pass
     |     ^^^^ E303
@@ -245,4 +245,4 @@ E30.py:702:5: E303 [*] Too many blank lines (2 > 1)
 701     |- 
 702 701 |     pass
 703 702 | # end
-704 703 | 
+704 703 |
diff --git a/...odestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(-1)-between(0).snap b/...odestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(-1)-between(0).snap
@@ -24,7 +24,7 @@ E30_isort.py:1:1: I001 [*] Import block is un-sorted or un-formatted
 6 3 | 
 7 4 | 
 
-E30_isort.py:5:1: E303 [*] Too many blank lines (3 > 2)
+E30_isort.py:5:1: E303 [*] Too many blank lines (3)
   |
 5 | from typing import Any, Sequence
   | ^^^^ E303
@@ -40,7 +40,7 @@ E30_isort.py:5:1: E303 [*] Too many blank lines (3 > 2)
 6 5 | 
 7 6 | 
 
-E30_isort.py:21:5: E303 [*] Too many blank lines (2 > 1)
+E30_isort.py:21:5: E303 [*] Too many blank lines (2)
    |
 21 |     abcd.foo()
    |     ^^^^ E303
@@ -83,7 +83,7 @@ E30_isort.py:26:1: I001 [*] Import block is un-sorted or un-formatted
 31 29 | 
 32 30 | 
 
-E30_isort.py:30:5: E303 [*] Too many blank lines (3 > 1)
+E30_isort.py:30:5: E303 [*] Too many blank lines (3)
    |
 30 |     from typing_extensions import TypeAlias
    |     ^^^^ E303
@@ -100,7 +100,7 @@ E30_isort.py:30:5: E303 [*] Too many blank lines (3 > 1)
 31 29 | 
 32 30 | 
 
-E30_isort.py:33:5: E303 [*] Too many blank lines (2 > 1)
+E30_isort.py:33:5: E303 [*] Too many blank lines (2)
    |
 33 |     abcd.foo()
    |     ^^^^ E303

diff --git a/...codestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(0)-between(0).snap b/...codestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(0)-between(0).snap
@@ -27,7 +27,7 @@ E30_isort.py:1:1: I001 [*] Import block is un-sorted or un-formatted
 9 4 | 
 10 5 | 
 
-E30_isort.py:5:1: E303 [*] Too many blank lines (3 > 2)
+E30_isort.py:5:1: E303 [*] Too many blank lines (3)
   |
 5 | from typing import Any, Sequence
   | ^^^^ E303
@@ -43,7 +43,7 @@ E30_isort.py:5:1: E303 [*] Too many blank lines (3 > 2)
 6 5 | 
 7 6 | 
 
-E30_isort.py:8:1: E303 [*] Too many blank lines (2 > 0)
+E30_isort.py:8:1: E303 [*] Too many blank lines (2)
   |
 8 | class MissingCommand(TypeError): ...  # noqa: N818
   | ^^^^^ E303
@@ -60,7 +60,7 @@ E30_isort.py:8:1: E303 [*] Too many blank lines (2 > 0)
 9 7 | 
 10 8 | 
 
-E30_isort.py:21:5: E303 [*] Too many blank lines (2 > 1)
+E30_isort.py:21:5: E303 [*] Too many blank lines (2)
    |
 21 |     abcd.foo()
    |     ^^^^ E303
@@ -103,7 +103,7 @@ E30_isort.py:26:1: I001 [*] Import block is un-sorted or un-formatted
 31 29 | 
 32 30 | 
 
-E30_isort.py:30:5: E303 [*] Too many blank lines (3 > 1)
+E30_isort.py:30:5: E303 [*] Too many blank lines (3)
    |
 30 |     from typing_extensions import TypeAlias
    |     ^^^^ E303
@@ -120,7 +120,7 @@ E30_isort.py:30:5: E303 [*] Too many blank lines (3 > 1)
 31 29 | 
 32 30 | 
 
-E30_isort.py:33:5: E303 [*] Too many blank lines (2 > 1)
+E30_isort.py:33:5: E303 [*] Too many blank lines (2)
    |
 33 |     abcd.foo()
    |     ^^^^ E303

diff --git a/...codestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(1)-between(1).snap b/...codestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(1)-between(1).snap
@@ -26,7 +26,7 @@ E30_isort.py:1:1: I001 [*] Import block is un-sorted or un-formatted
 8 5 | class MissingCommand(TypeError): ...  # noqa: N818
 9 6 | 
 
-E30_isort.py:5:1: E303 [*] Too many blank lines (3 > 1)
+E30_isort.py:5:1: E303 [*] Too many blank lines (3)
   |
 5 | from typing import Any, Sequence
   | ^^^^ E303
@@ -42,7 +42,7 @@ E30_isort.py:5:1: E303 [*] Too many blank lines (3 > 1)
 6 4 | 
 7 5 | 
 
-E30_isort.py:8:1: E303 [*] Too many blank lines (2 > 1)
+E30_isort.py:8:1: E303 [*] Too many blank lines (2)
   |
 8 | class MissingCommand(TypeError): ...  # noqa: N818
   | ^^^^^ E303
@@ -58,7 +58,7 @@ E30_isort.py:8:1: E303 [*] Too many blank lines (2 > 1)
 9 8 | 
 10 9 | 
 
-E30_isort.py:21:5: E303 [*] Too many blank lines (2 > 1)
+E30_isort.py:21:5: E303 [*] Too many blank lines (2)
    |
 21 |     abcd.foo()
    |     ^^^^ E303
@@ -101,7 +101,7 @@ E30_isort.py:26:1: I001 [*] Import block is un-sorted or un-formatted
 31 29 | 
 32 30 | 
 
-E30_isort.py:30:5: E303 [*] Too many blank lines (3 > 1)
+E30_isort.py:30:5: E303 [*] Too many blank lines (3)
    |
 30 |     from typing_extensions import TypeAlias
    |     ^^^^ E303
@@ -118,7 +118,7 @@ E30_isort.py:30:5: E303 [*] Too many blank lines (3 > 1)
 31 29 | 
 32 30 | 
 
-E30_isort.py:33:5: E303 [*] Too many blank lines (2 > 1)
+E30_isort.py:33:5: E303 [*] Too many blank lines (2)
    |
 33 |     abcd.foo()
    |     ^^^^ E303

diff --git a/...codestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(4)-between(4).snap b/...codestyle__tests__too_many_blank_lines_isort_compatibility-lines-after(4)-between(4).snap
@@ -29,7 +29,7 @@ E30_isort.py:1:1: I001 [*] Import block is un-sorted or un-formatted
 9  12 | 
 10 13 | 
 
-E30_isort.py:21:5: E303 [*] Too many blank lines (2 > 1)
+E30_isort.py:21:5: E303 [*] Too many blank lines (2)
    |
 21 |     abcd.foo()
    |     ^^^^ E303
@@ -72,7 +72,7 @@ E30_isort.py:26:1: I001 [*] Import block is un-sorted or un-formatted
 31 29 | 
 32 30 | 
 
-E30_isort.py:33:5: E303 [*] Too many blank lines (2 > 1)
+E30_isort.py:33:5: E303 [*] Too many blank lines (2)
    |
 33 |     abcd.foo()
    |     ^^^^ E303