final nits

Author: AlexWaygood

crates/ruff_linter/src/rules/ruff/rules/incorrectly_parenthesized_tuple_in_subscript.rs

@@ -58,24 +58,25 @@ impl AlwaysFixableViolation for IncorrectlyParenthesizedTupleInSubscript {
 /// RUF031
 pub(crate) fn subscript_with_parenthesized_tuple(checker: &mut Checker, subscript: &ExprSubscript) {
     let prefer_parentheses = checker.settings.ruff.parenthesize_tuple_in_subscript;
-    let Some(tuple_index) = subscript.slice.as_tuple_expr() else {
+    let Some(tuple_subscript) = subscript.slice.as_tuple_expr() else {
         return;
     };
-    if tuple_index.parenthesized != prefer_parentheses {
-        let locator = checker.locator();
-        let source_range = subscript.slice.range();
-        let new_source = if prefer_parentheses {
-            format!("({})", locator.slice(source_range))
-        } else {
-            locator.slice(source_range)[1..source_range.len().to_usize() - 1].to_string()
-        };
-        let edit = Edit::range_replacement(new_source, source_range);
-        checker.diagnostics.push(
-            Diagnostic::new(
-                IncorrectlyParenthesizedTupleInSubscript { prefer_parentheses },
-                source_range,
-            )
-            .with_fix(Fix::safe_edit(edit)),
-        );
+    if tuple_subscript.parenthesized == prefer_parentheses {
+        return;
     }
+    let locator = checker.locator();
+    let source_range = subscript.slice.range();
+    let new_source = if prefer_parentheses {
+        format!("({})", locator.slice(source_range))
+    } else {
+        locator.slice(source_range)[1..source_range.len().to_usize() - 1].to_string()
+    };
+    let edit = Edit::range_replacement(new_source, source_range);
+    checker.diagnostics.push(
+        Diagnostic::new(
+            IncorrectlyParenthesizedTupleInSubscript { prefer_parentheses },
+            source_range,
+        )
+        .with_fix(Fix::safe_edit(edit)),
+    );
 }

crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__RUF031_RUF031.py.snap

@@ -1,15 +1,15 @@
 ---
 source: crates/ruff_linter/src/rules/ruff/mod.rs
 ---
-RUF031.py:2:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
+RUF031.py:2:3: RUF031 [*] Avoid parentheses for tuples in subscripts.
   |
 1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"}
 2 | d[(1,2)]
   |   ^^^^^ RUF031
 3 | d[(
 4 |     1,
   |
-  = help: Remove parentheses from tuple in subscript.
+  = help: Remove the parentheses.
 
 ℹ Safe fix
 1 1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"}
@@ -19,7 +19,7 @@ RUF031.py:2:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
 4 4 |     1,
 5 5 |     2
 
-RUF031.py:3:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
+RUF031.py:3:3: RUF031 [*] Avoid parentheses for tuples in subscripts.
   |
 1 |   d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"}
 2 |   d[(1,2)]
@@ -32,7 +32,7 @@ RUF031.py:3:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
 7 |   d[
 8 |       1,
   |
-  = help: Remove parentheses from tuple in subscript.
+  = help: Remove the parentheses.
 
 ℹ Safe fix
 1 1 | d = {(1,2):"a",(3,4):"b",(5,6,7):"c",(8,):"d"}
@@ -47,7 +47,7 @@ RUF031.py:3:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
 8 8 |     1,
 9 9 |     2
 
-RUF031.py:11:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
+RUF031.py:11:3: RUF031 [*] Avoid parentheses for tuples in subscripts.
    |
  9 |     2
 10 | ]
@@ -56,7 +56,7 @@ RUF031.py:11:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
 12 | d[(5,6,7)]
 13 | d[(8,)]
    |
-   = help: Remove parentheses from tuple in subscript.
+   = help: Remove the parentheses.
 
 ℹ Safe fix
 8  8  |     1,
@@ -68,7 +68,7 @@ RUF031.py:11:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
 13 13 | d[(8,)]
 14 14 | d[tuple(1,2)]
 
-RUF031.py:12:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
+RUF031.py:12:3: RUF031 [*] Avoid parentheses for tuples in subscripts.
    |
 10 | ]
 11 | d[(2,4)]
@@ -77,7 +77,7 @@ RUF031.py:12:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
 13 | d[(8,)]
 14 | d[tuple(1,2)]
    |
-   = help: Remove parentheses from tuple in subscript.
+   = help: Remove the parentheses.
 
 ℹ Safe fix
 9  9  |     2
@@ -89,7 +89,7 @@ RUF031.py:12:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
 14 14 | d[tuple(1,2)]
 15 15 | d[tuple(8)]
 
-RUF031.py:13:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
+RUF031.py:13:3: RUF031 [*] Avoid parentheses for tuples in subscripts.
    |
 11 | d[(2,4)]
 12 | d[(5,6,7)]
@@ -98,7 +98,7 @@ RUF031.py:13:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
 14 | d[tuple(1,2)]
 15 | d[tuple(8)]
    |
-   = help: Remove parentheses from tuple in subscript.
+   = help: Remove the parentheses.
 
 ℹ Safe fix
 10 10 | ]
@@ -110,15 +110,15 @@ RUF031.py:13:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
 15 15 | d[tuple(8)]
 16 16 | d[1,2]
 
-RUF031.py:20:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
+RUF031.py:20:3: RUF031 [*] Avoid parentheses for tuples in subscripts.
    |
 18 | d[5,6,7]
 19 | e = {((1,2),(3,4)):"a"}
 20 | e[((1,2),(3,4))]
    |   ^^^^^^^^^^^^^ RUF031
 21 | e[(1,2),(3,4)]
    |
-   = help: Remove parentheses from tuple in subscript.
+   = help: Remove the parentheses.
 
 ℹ Safe fix
 17 17 | d[3,4]
@@ -131,14 +131,14 @@ RUF031.py:20:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
 23 23 | token_features[
 24 24 |     (window_position, feature_name)
 
-RUF031.py:24:5: RUF031 [*] Avoid parentheses for tuples in scubscripts.
+RUF031.py:24:5: RUF031 [*] Avoid parentheses for tuples in subscripts.
    |
 23 | token_features[
 24 |     (window_position, feature_name)
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ RUF031
 25 | ] = self._extract_raw_features_from_token
    |
-   = help: Remove parentheses from tuple in subscript.
+   = help: Remove the parentheses.
 
 ℹ Safe fix
 21 21 | e[(1,2),(3,4)]
@@ -150,13 +150,13 @@ RUF031.py:24:5: RUF031 [*] Avoid parentheses for tuples in scubscripts.
 26 26 | 
 27 27 | d[1,]
 
-RUF031.py:28:3: RUF031 [*] Avoid parentheses for tuples in scubscripts.
+RUF031.py:28:3: RUF031 [*] Avoid parentheses for tuples in subscripts.
    |
 27 | d[1,]
 28 | d[(1,)]
    |   ^^^^ RUF031
    |
-   = help: Remove parentheses from tuple in subscript.
+   = help: Remove the parentheses.
 
 ℹ Safe fix
 25 25 | ] = self._extract_raw_features_from_token

crates/ruff_linter/src/rules/ruff/snapshots/ruff_linter__rules__ruff__tests__prefer_parentheses_getitem_tuple.snap

@@ -12,7 +12,7 @@ RUF031_prefer_parens.py:8:5: RUF031 [*] Use parentheses for tuples in subscripts
 10 |   ]
 11 |   d[(2,4)]
    |
-   = help: Add parentheses around tuple in subscript.
+   = help: Parenthesize the tuple.
 
 ℹ Safe fix
 5  5  |     2
@@ -35,7 +35,7 @@ RUF031_prefer_parens.py:16:3: RUF031 [*] Use parentheses for tuples in subscript
 17 | d[3,4]
 18 | d[5,6,7]
    |
-   = help: Add parentheses around tuple in subscript.
+   = help: Parenthesize the tuple.
 
 ℹ Safe fix
 13 13 | d[(8,)]
@@ -56,7 +56,7 @@ RUF031_prefer_parens.py:17:3: RUF031 [*] Use parentheses for tuples in subscript
 18 | d[5,6,7]
 19 | e = {((1,2),(3,4)):"a"}
    |
-   = help: Add parentheses around tuple in subscript.
+   = help: Parenthesize the tuple.
 
 ℹ Safe fix
 14 14 | d[tuple(1,2)]
@@ -77,7 +77,7 @@ RUF031_prefer_parens.py:18:3: RUF031 [*] Use parentheses for tuples in subscript
 19 | e = {((1,2),(3,4)):"a"}
 20 | e[((1,2),(3,4))]
    |
-   = help: Add parentheses around tuple in subscript.
+   = help: Parenthesize the tuple.
 
 ℹ Safe fix
 15 15 | d[tuple(8)]
@@ -98,7 +98,7 @@ RUF031_prefer_parens.py:21:3: RUF031 [*] Use parentheses for tuples in subscript
 22 | 
 23 | token_features[
    |
-   = help: Add parentheses around tuple in subscript.
+   = help: Parenthesize the tuple.
 
 ℹ Safe fix
 18 18 | d[5,6,7]
@@ -118,7 +118,7 @@ RUF031_prefer_parens.py:26:3: RUF031 [*] Use parentheses for tuples in subscript
    |   ^^ RUF031
 27 | d[(1,)]
    |
-   = help: Add parentheses around tuple in subscript.
+   = help: Parenthesize the tuple.
 
 ℹ Safe fix
 23 23 | token_features[