Skip to content

Commit

Permalink
Improve some messages to the user
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexWaygood
AlexWaygood committed Jun 26, 2024
1 parent 896516c commit 48aa05a
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 29 deletions.
2 changes: 1 addition & 1 deletion crates/ruff_linter/src/rules/pylint/rules/literal_membership.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pub struct LiteralMembership;
impl AlwaysFixableViolation for LiteralMembership {
#[derive_message_formats]
fn message(&self) -> String {
format!("Use a `set` literal when testing for membership")
format!("Use a set literal when testing for membership")
}

fn fix_title(&self) -> String {
Expand Down
4 changes: 2 additions & 2 deletions crates/ruff_linter/src/rules/pylint/rules/unnecessary_list_index_lookup.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ pub struct UnnecessaryListIndexLookup;
impl AlwaysFixableViolation for UnnecessaryListIndexLookup {
#[derive_message_formats]
fn message(&self) -> String {
format!("Unnecessary lookup of list item by index")
format!("List index lookup in `enumerate()` loop")
}

fn fix_title(&self) -> String {
format!("Use existing variable")
format!("Use the loop variable directly")
}
}

Expand Down
38 changes: 18 additions & 20 deletions ...napshots/ruff_linter__rules__pylint__tests__PLR1736_unnecessary_list_index_lookup.py.snap
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
source: crates/ruff_linter/src/rules/pylint/mod.rs
---
unnecessary_list_index_lookup.py:7:6: PLR1736 [*] Unnecessary lookup of list item by index
unnecessary_list_index_lookup.py:7:6: PLR1736 [*] List index lookup in `enumerate()` loop
|
6 | def fix_these():
7 | [letters[index] for index, letter in enumerate(letters)] # PLR1736
| ^^^^^^^^^^^^^^ PLR1736
8 | {letters[index] for index, letter in enumerate(letters)} # PLR1736
9 | {letter: letters[index] for index, letter in enumerate(letters)} # PLR1736
|
= help: Use existing variable
= help: Use the loop variable directly

ℹ Safe fix
4 4 |
Expand All @@ -21,15 +21,15 @@ unnecessary_list_index_lookup.py:7:6: PLR1736 [*] Unnecessary lookup of list ite
9 9 | {letter: letters[index] for index, letter in enumerate(letters)} # PLR1736
10 10 |

unnecessary_list_index_lookup.py:8:6: PLR1736 [*] Unnecessary lookup of list item by index
unnecessary_list_index_lookup.py:8:6: PLR1736 [*] List index lookup in `enumerate()` loop
|
6 | def fix_these():
7 | [letters[index] for index, letter in enumerate(letters)] # PLR1736
8 | {letters[index] for index, letter in enumerate(letters)} # PLR1736
| ^^^^^^^^^^^^^^ PLR1736
9 | {letter: letters[index] for index, letter in enumerate(letters)} # PLR1736
|
= help: Use existing variable
= help: Use the loop variable directly

ℹ Safe fix
5 5 |
Expand All @@ -41,7 +41,7 @@ unnecessary_list_index_lookup.py:8:6: PLR1736 [*] Unnecessary lookup of list ite
10 10 |
11 11 | for index, letter in enumerate(letters):

unnecessary_list_index_lookup.py:9:14: PLR1736 [*] Unnecessary lookup of list item by index
unnecessary_list_index_lookup.py:9:14: PLR1736 [*] List index lookup in `enumerate()` loop
|
7 | [letters[index] for index, letter in enumerate(letters)] # PLR1736
8 | {letters[index] for index, letter in enumerate(letters)} # PLR1736
Expand All @@ -50,7 +50,7 @@ unnecessary_list_index_lookup.py:9:14: PLR1736 [*] Unnecessary lookup of list it
10 |
11 | for index, letter in enumerate(letters):
|
= help: Use existing variable
= help: Use the loop variable directly

ℹ Safe fix
6 6 | def fix_these():
Expand All @@ -62,15 +62,15 @@ unnecessary_list_index_lookup.py:9:14: PLR1736 [*] Unnecessary lookup of list it
11 11 | for index, letter in enumerate(letters):
12 12 | print(letters[index]) # PLR1736

unnecessary_list_index_lookup.py:12:15: PLR1736 [*] Unnecessary lookup of list item by index
unnecessary_list_index_lookup.py:12:15: PLR1736 [*] List index lookup in `enumerate()` loop
|
11 | for index, letter in enumerate(letters):
12 | print(letters[index]) # PLR1736
| ^^^^^^^^^^^^^^ PLR1736
13 | blah = letters[index] # PLR1736
14 | assert letters[index] == "d" # PLR1736
|
= help: Use existing variable
= help: Use the loop variable directly

ℹ Safe fix
9 9 | {letter: letters[index] for index, letter in enumerate(letters)} # PLR1736
Expand All @@ -82,15 +82,15 @@ unnecessary_list_index_lookup.py:12:15: PLR1736 [*] Unnecessary lookup of list i
14 14 | assert letters[index] == "d" # PLR1736
15 15 |

unnecessary_list_index_lookup.py:13:16: PLR1736 [*] Unnecessary lookup of list item by index
unnecessary_list_index_lookup.py:13:16: PLR1736 [*] List index lookup in `enumerate()` loop
|
11 | for index, letter in enumerate(letters):
12 | print(letters[index]) # PLR1736
13 | blah = letters[index] # PLR1736
| ^^^^^^^^^^^^^^ PLR1736
14 | assert letters[index] == "d" # PLR1736
|
= help: Use existing variable
= help: Use the loop variable directly

ℹ Safe fix
10 10 |
Expand All @@ -102,7 +102,7 @@ unnecessary_list_index_lookup.py:13:16: PLR1736 [*] Unnecessary lookup of list i
15 15 |
16 16 | for index, letter in builtins.enumerate(letters):

unnecessary_list_index_lookup.py:14:16: PLR1736 [*] Unnecessary lookup of list item by index
unnecessary_list_index_lookup.py:14:16: PLR1736 [*] List index lookup in `enumerate()` loop
|
12 | print(letters[index]) # PLR1736
13 | blah = letters[index] # PLR1736
Expand All @@ -111,7 +111,7 @@ unnecessary_list_index_lookup.py:14:16: PLR1736 [*] Unnecessary lookup of list i
15 |
16 | for index, letter in builtins.enumerate(letters):
|
= help: Use existing variable
= help: Use the loop variable directly

ℹ Safe fix
11 11 | for index, letter in enumerate(letters):
Expand All @@ -123,15 +123,15 @@ unnecessary_list_index_lookup.py:14:16: PLR1736 [*] Unnecessary lookup of list i
16 16 | for index, letter in builtins.enumerate(letters):
17 17 | print(letters[index]) # PLR1736

unnecessary_list_index_lookup.py:17:15: PLR1736 [*] Unnecessary lookup of list item by index
unnecessary_list_index_lookup.py:17:15: PLR1736 [*] List index lookup in `enumerate()` loop
|
16 | for index, letter in builtins.enumerate(letters):
17 | print(letters[index]) # PLR1736
| ^^^^^^^^^^^^^^ PLR1736
18 | blah = letters[index] # PLR1736
19 | assert letters[index] == "d" # PLR1736
|
= help: Use existing variable
= help: Use the loop variable directly

ℹ Safe fix
14 14 | assert letters[index] == "d" # PLR1736
Expand All @@ -143,15 +143,15 @@ unnecessary_list_index_lookup.py:17:15: PLR1736 [*] Unnecessary lookup of list i
19 19 | assert letters[index] == "d" # PLR1736
20 20 |

unnecessary_list_index_lookup.py:18:16: PLR1736 [*] Unnecessary lookup of list item by index
unnecessary_list_index_lookup.py:18:16: PLR1736 [*] List index lookup in `enumerate()` loop
|
16 | for index, letter in builtins.enumerate(letters):
17 | print(letters[index]) # PLR1736
18 | blah = letters[index] # PLR1736
| ^^^^^^^^^^^^^^ PLR1736
19 | assert letters[index] == "d" # PLR1736
|
= help: Use existing variable
= help: Use the loop variable directly

ℹ Safe fix
15 15 |
Expand All @@ -163,14 +163,14 @@ unnecessary_list_index_lookup.py:18:16: PLR1736 [*] Unnecessary lookup of list i
20 20 |
21 21 |

unnecessary_list_index_lookup.py:19:16: PLR1736 [*] Unnecessary lookup of list item by index
unnecessary_list_index_lookup.py:19:16: PLR1736 [*] List index lookup in `enumerate()` loop
|
17 | print(letters[index]) # PLR1736
18 | blah = letters[index] # PLR1736
19 | assert letters[index] == "d" # PLR1736
| ^^^^^^^^^^^^^^ PLR1736
|
= help: Use existing variable
= help: Use the loop variable directly

ℹ Safe fix
16 16 | for index, letter in builtins.enumerate(letters):
Expand All @@ -181,5 +181,3 @@ unnecessary_list_index_lookup.py:19:16: PLR1736 [*] Unnecessary lookup of list i
20 20 |
21 21 |
22 22 | def dont_fix_these():


10 changes: 4 additions & 6 deletions ...es/pylint/snapshots/ruff_linter__rules__pylint__tests__PLR6201_literal_membership.py.snap
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
source: crates/ruff_linter/src/rules/pylint/mod.rs
---
literal_membership.py:2:6: PLR6201 [*] Use a `set` literal when testing for membership
literal_membership.py:2:6: PLR6201 [*] Use a set literal when testing for membership
|
1 | # Errors
2 | 1 in [1, 2, 3]
Expand All @@ -19,7 +19,7 @@ literal_membership.py:2:6: PLR6201 [*] Use a `set` literal when testing for memb
4 4 | 1 in (
5 5 | 1, 2, 3

literal_membership.py:3:6: PLR6201 [*] Use a `set` literal when testing for membership
literal_membership.py:3:6: PLR6201 [*] Use a set literal when testing for membership
|
1 | # Errors
2 | 1 in [1, 2, 3]
Expand All @@ -39,7 +39,7 @@ literal_membership.py:3:6: PLR6201 [*] Use a `set` literal when testing for memb
5 5 | 1, 2, 3
6 6 | )

literal_membership.py:4:6: PLR6201 [*] Use a `set` literal when testing for membership
literal_membership.py:4:6: PLR6201 [*] Use a set literal when testing for membership
|
2 | 1 in [1, 2, 3]
3 | 1 in (1, 2, 3)
Expand All @@ -66,7 +66,7 @@ literal_membership.py:4:6: PLR6201 [*] Use a `set` literal when testing for memb
8 8 | "cherry" in fruits
9 9 | _ = {key: value for key, value in {"a": 1, "b": 2}.items() if key in ("a", "b")}

literal_membership.py:9:70: PLR6201 [*] Use a `set` literal when testing for membership
literal_membership.py:9:70: PLR6201 [*] Use a set literal when testing for membership
|
7 | fruits = ["cherry", "grapes"]
8 | "cherry" in fruits
Expand All @@ -86,5 +86,3 @@ literal_membership.py:9:70: PLR6201 [*] Use a `set` literal when testing for mem
10 10 |
11 11 | # OK
12 12 | fruits in [[1, 2, 3], [4, 5, 6]]


0 comments on commit 48aa05a

Please sign in to comment.