Avoid `RUF007` fixes for more than two arguments #3654

JonathanPlasse · 2023-03-21T19:34:11Z

Close RUF007 - False positive when zip() contains more than 2 arguments #3651

charliermarsh · 2023-03-21T19:36:53Z

crates/ruff/src/rules/ruff/rules/pairwise_over_zipped.rs

@@ -93,7 +93,7 @@ pub fn pairwise_over_zipped(checker: &mut Checker, func: &Expr, args: &[Expr]) {
        return;
    };

-    if !(args.len() > 1 && id == "zip" && checker.ctx.is_builtin(id)) {
+    if !(args.len() == 2 && id == "zip" && checker.ctx.is_builtin(id)) {


I think we may want to avoid both args != 2 and strict=True, since the latter isn't supported?

I think this current approach only catches extra arguments, but not the unsupported kwargs.

@charliermarsh But isn't this a valid case for pairwise zip(foo[:-1], foo[1:], strict=True)?

Oh hmm, in that case, isn't either strict argument acceptable? (False is of course fine.)

I'd say yes.

github-actions · 2023-03-21T20:03:57Z

PR Check Results

Ecosystem

✅ ecosystem check detected no changes.

Benchmark

Linux

group                                      main                                   pr
-----                                      ----                                   --
linter/all-rules/large/dataset.py          1.00     13.5±0.07ms     3.0 MB/sec    1.00     13.4±0.04ms     3.0 MB/sec
linter/all-rules/numpy/ctypeslib.py        1.00      3.5±0.01ms     4.7 MB/sec    1.00      3.5±0.00ms     4.7 MB/sec
linter/all-rules/numpy/globals.py          1.00    483.4±1.06µs     6.1 MB/sec    1.01    486.6±0.88µs     6.1 MB/sec
linter/all-rules/pydantic/types.py         1.00      5.9±0.02ms     4.3 MB/sec    1.00      5.9±0.01ms     4.3 MB/sec
linter/default-rules/large/dataset.py      1.00      7.2±0.02ms     5.7 MB/sec    1.00      7.1±0.01ms     5.7 MB/sec
linter/default-rules/numpy/ctypeslib.py    1.01   1615.5±3.99µs    10.3 MB/sec    1.00   1603.5±6.07µs    10.4 MB/sec
linter/default-rules/numpy/globals.py      1.00    178.5±0.47µs    16.5 MB/sec    1.00    177.6±0.68µs    16.6 MB/sec
linter/default-rules/pydantic/types.py     1.01      3.4±0.01ms     7.6 MB/sec    1.00      3.4±0.01ms     7.6 MB/sec

Windows

group                                      main                                   pr
-----                                      ----                                   --
linter/all-rules/large/dataset.py          1.00     15.0±0.09ms     2.7 MB/sec    1.00     14.9±0.06ms     2.7 MB/sec
linter/all-rules/numpy/ctypeslib.py        1.00      4.0±0.01ms     4.1 MB/sec    1.00      4.0±0.03ms     4.1 MB/sec
linter/all-rules/numpy/globals.py          1.00    438.7±4.07µs     6.7 MB/sec    1.00    438.5±8.39µs     6.7 MB/sec
linter/all-rules/pydantic/types.py         1.00      6.6±0.03ms     3.9 MB/sec    1.00      6.6±0.03ms     3.9 MB/sec
linter/default-rules/large/dataset.py      1.00      8.1±0.02ms     5.0 MB/sec    1.00      8.1±0.04ms     5.0 MB/sec
linter/default-rules/numpy/ctypeslib.py    1.01  1732.9±13.68µs     9.6 MB/sec    1.00   1722.8±6.70µs     9.7 MB/sec
linter/default-rules/numpy/globals.py      1.00    173.7±1.02µs    17.0 MB/sec    1.00    174.5±3.30µs    16.9 MB/sec
linter/default-rules/pydantic/types.py     1.00      3.7±0.01ms     6.8 MB/sec    1.00      3.8±0.02ms     6.8 MB/sec

Fix RUF007 false positive

c0bec00

charliermarsh reviewed Mar 21, 2023

View reviewed changes

JonathanPlasse and others added 2 commits March 21, 2023 21:52

Fix RUF007 false positive when strict=True

3381a8f

Break up condition

abe94e5

charliermarsh changed the title ~~Fix RUF007 false positive~~ Avoid RUF007 fixes for more than two arguments Mar 21, 2023

charliermarsh added the bug Something isn't working label Mar 21, 2023

charliermarsh enabled auto-merge (squash) March 21, 2023 22:13

charliermarsh merged commit 5eae3fb into astral-sh:main Mar 21, 2023

JonathanPlasse deleted the fix-ruf007-false-positive branch March 22, 2023 08:29

charliermarsh mentioned this pull request Mar 22, 2023

Allow pairwise diagnostics for zip(..., strict=True) #3669

Merged

Porkepix mentioned this pull request Mar 23, 2023

ruff 0.0.258 Homebrew/homebrew-core#126412

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Avoid `RUF007` fixes for more than two arguments #3654

Avoid `RUF007` fixes for more than two arguments #3654

JonathanPlasse commented Mar 21, 2023

charliermarsh Mar 21, 2023

charliermarsh Mar 21, 2023

JonathanPlasse Mar 21, 2023

aberres Mar 22, 2023

JonathanPlasse Mar 22, 2023

charliermarsh Mar 22, 2023

aberres Mar 22, 2023

github-actions bot commented Mar 21, 2023 •

edited

Loading

Avoid RUF007 fixes for more than two arguments #3654

Avoid RUF007 fixes for more than two arguments #3654

Conversation

JonathanPlasse commented Mar 21, 2023

charliermarsh Mar 21, 2023

Choose a reason for hiding this comment

charliermarsh Mar 21, 2023

Choose a reason for hiding this comment

JonathanPlasse Mar 21, 2023

Choose a reason for hiding this comment

aberres Mar 22, 2023

Choose a reason for hiding this comment

JonathanPlasse Mar 22, 2023

Choose a reason for hiding this comment

charliermarsh Mar 22, 2023

Choose a reason for hiding this comment

aberres Mar 22, 2023

Choose a reason for hiding this comment

github-actions bot commented Mar 21, 2023 • edited Loading

PR Check Results

Ecosystem

Benchmark

Linux

Windows

Avoid `RUF007` fixes for more than two arguments #3654

Avoid `RUF007` fixes for more than two arguments #3654

github-actions bot commented Mar 21, 2023 •

edited

Loading