Fix SIM222 and SIM223 false positive #3832

JonathanPlasse · 2023-03-31T17:19:22Z

Close False positive: SIM222 #3830

charliermarsh · 2023-03-31T17:29:22Z

crates/ruff/src/rules/flake8_simplify/rules/ast_bool_op.rs

    let ExprKind::BoolOp { op, values, } = &expr.node else {
        return None;
    };
+    if op != expected_op {
+        return None;
+    }


Should we modify the fixtures, such that they would've caught this?

github-actions · 2023-03-31T17:32:13Z

PR Check Results

Ecosystem

✅ ecosystem check detected no changes.

Benchmark

Linux

group                                      main                                   pr
-----                                      ----                                   --
linter/all-rules/large/dataset.py          1.00     14.6±0.13ms     2.8 MB/sec    1.00     14.6±0.08ms     2.8 MB/sec
linter/all-rules/numpy/ctypeslib.py        1.00      3.8±0.05ms     4.4 MB/sec    1.00      3.8±0.02ms     4.4 MB/sec
linter/all-rules/numpy/globals.py          1.00    405.1±5.20µs     7.3 MB/sec    1.01    410.7±6.99µs     7.2 MB/sec
linter/all-rules/pydantic/types.py         1.00      6.3±0.04ms     4.0 MB/sec    1.00      6.3±0.08ms     4.0 MB/sec
linter/default-rules/large/dataset.py      1.00      7.9±0.01ms     5.2 MB/sec    1.00      7.9±0.05ms     5.2 MB/sec
linter/default-rules/numpy/ctypeslib.py    1.00   1732.0±5.92µs     9.6 MB/sec    1.00  1737.4±16.76µs     9.6 MB/sec
linter/default-rules/numpy/globals.py      1.00    182.5±5.80µs    16.2 MB/sec    1.02    185.7±7.63µs    15.9 MB/sec
linter/default-rules/pydantic/types.py     1.00      3.6±0.02ms     7.1 MB/sec    1.00      3.6±0.04ms     7.0 MB/sec

Windows

group                                      main                                   pr
-----                                      ----                                   --
linter/all-rules/large/dataset.py          1.03     15.9±0.22ms     2.6 MB/sec    1.00     15.4±0.12ms     2.6 MB/sec
linter/all-rules/numpy/ctypeslib.py        1.03      4.2±0.09ms     4.0 MB/sec    1.00      4.1±0.03ms     4.1 MB/sec
linter/all-rules/numpy/globals.py          1.00    425.1±6.85µs     6.9 MB/sec    1.00    424.8±5.53µs     6.9 MB/sec
linter/all-rules/pydantic/types.py         1.00      6.8±0.12ms     3.7 MB/sec    1.00      6.8±0.24ms     3.7 MB/sec
linter/default-rules/large/dataset.py      1.01      8.2±0.08ms     4.9 MB/sec    1.00      8.2±0.03ms     5.0 MB/sec
linter/default-rules/numpy/ctypeslib.py    1.00  1775.0±10.60µs     9.4 MB/sec    1.00   1777.5±8.98µs     9.4 MB/sec
linter/default-rules/numpy/globals.py      1.00    185.5±0.91µs    15.9 MB/sec    1.00    186.3±4.69µs    15.8 MB/sec
linter/default-rules/pydantic/types.py     1.00      3.7±0.01ms     6.8 MB/sec    1.00      3.8±0.06ms     6.8 MB/sec

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [ruff](https://togithub.com/charliermarsh/ruff) | `^0.0.260` -> `^0.0.261` | [![age](https://badges.renovateapi.com/packages/pypi/ruff/0.0.261/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/ruff/0.0.261/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/ruff/0.0.261/compatibility-slim/0.0.260)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/ruff/0.0.261/confidence-slim/0.0.260)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>charliermarsh/ruff</summary> ### [`v0.0.261`](https://togithub.com/charliermarsh/ruff/releases/tag/v0.0.261) [Compare Source](https://togithub.com/charliermarsh/ruff/compare/v0.0.260...v0.0.261)  #### What's Changed ##### Rules - \[`flake8-simplify`] Ignore `collapsible-if` violations for `if False:` and `if True:` by [@JonathanPlasse](https://togithub.com/JonathanPlasse) in [astral-sh/ruff#3732 - \[`flake8-pie`] Extend `unncessary-generator-any-all` to set comprehensions by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3824 - \[`flake8-simplify`] Implement `dict-get-with-none-default` (`SIM910`) by [@kyoto7250](https://togithub.com/kyoto7250) in [astral-sh/ruff#3874 - \[`flake8-annotations`] Additional simple magic return types by [@dhruvmanila](https://togithub.com/dhruvmanila) in [astral-sh/ruff#3805 - \[`flake8-pyi`]: fix PYI015 false positive on assignment of TypeVar & friends by [@bluetech](https://togithub.com/bluetech) in [astral-sh/ruff#3861 ##### Bug Fixes - Improve robustness of argument removal for `encode` calls by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3802 - Fix SIM222 and SIM223 false positive by [@JonathanPlasse](https://togithub.com/JonathanPlasse) in [astral-sh/ruff#3832 - When checking module visibility, don't check entire ancestry by [@Hnasar](https://togithub.com/Hnasar) in [astral-sh/ruff#3835 - Improve top-of-file insertions for required imports by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3779 - Use multi-fix semantics for `inplace` removal by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3804 - Flag non-`Name` expressions in `duplicate-isinstance-call` by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3817 - Avoid `unnecessary-comprehension-any-all` for async generators by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3823 - Fix `is_module_name()` and improve perf of `is_identifier()` by [@JonathanPlasse](https://togithub.com/JonathanPlasse) in [astral-sh/ruff#3795 - Allow starred arguments in B030 by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3871 - Support mutually exclusive branches for `B031` by [@dhruvmanila](https://togithub.com/dhruvmanila) in [astral-sh/ruff#3844 - Consider logger candidate from `logging` module only by [@dhruvmanila](https://togithub.com/dhruvmanila) in [astral-sh/ruff#3878 ##### Core - Add import insertion support to autofix capabilities by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3787 - Generate `ImportMap` from module path to imported dependencies by [@chanman3388](https://togithub.com/chanman3388) in [astral-sh/ruff#3243 ##### Docs - Add documentation for `ruff-action` (GitHub Action!) by [@brucearctor](https://togithub.com/brucearctor) in [astral-sh/ruff#3857 #### New Contributors - [@AetherUnbound](https://togithub.com/AetherUnbound) made their first contribution in [astral-sh/ruff#3806 - [@Hnasar](https://togithub.com/Hnasar) made their first contribution in [astral-sh/ruff#3835 - [@nvuillam](https://togithub.com/nvuillam) made their first contribution in [astral-sh/ruff#3848 - [@brucearctor](https://togithub.com/brucearctor) made their first contribution in [astral-sh/ruff#3857 **Full Changelog**: astral-sh/ruff@v0.0.260...v0.0.261 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/ixm-one/pytest-cmake-presets).  Signed-off-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [ruff](https://togithub.com/charliermarsh/ruff) | `==0.0.260` -> `==0.0.261` | [![age](https://badges.renovateapi.com/packages/pypi/ruff/0.0.261/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/ruff/0.0.261/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/ruff/0.0.261/compatibility-slim/0.0.260)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/ruff/0.0.261/confidence-slim/0.0.260)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>charliermarsh/ruff</summary> ### [`v0.0.261`](https://togithub.com/charliermarsh/ruff/releases/tag/v0.0.261) [Compare Source](https://togithub.com/charliermarsh/ruff/compare/v0.0.260...v0.0.261)  #### What's Changed ##### Rules - \[`flake8-simplify`] Ignore `collapsible-if` violations for `if False:` and `if True:` by [@JonathanPlasse](https://togithub.com/JonathanPlasse) in [astral-sh/ruff#3732 - \[`flake8-pie`] Extend `unncessary-generator-any-all` to set comprehensions by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3824 - \[`flake8-simplify`] Implement `dict-get-with-none-default` (`SIM910`) by [@kyoto7250](https://togithub.com/kyoto7250) in [astral-sh/ruff#3874 - \[`flake8-annotations`] Additional simple magic return types by [@dhruvmanila](https://togithub.com/dhruvmanila) in [astral-sh/ruff#3805 - \[`flake8-pyi`]: fix PYI015 false positive on assignment of TypeVar & friends by [@bluetech](https://togithub.com/bluetech) in [astral-sh/ruff#3861 ##### Bug Fixes - Improve robustness of argument removal for `encode` calls by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3802 - Fix SIM222 and SIM223 false positive by [@JonathanPlasse](https://togithub.com/JonathanPlasse) in [astral-sh/ruff#3832 - When checking module visibility, don't check entire ancestry by [@Hnasar](https://togithub.com/Hnasar) in [astral-sh/ruff#3835 - Improve top-of-file insertions for required imports by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3779 - Use multi-fix semantics for `inplace` removal by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3804 - Flag non-`Name` expressions in `duplicate-isinstance-call` by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3817 - Avoid `unnecessary-comprehension-any-all` for async generators by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3823 - Fix `is_module_name()` and improve perf of `is_identifier()` by [@JonathanPlasse](https://togithub.com/JonathanPlasse) in [astral-sh/ruff#3795 - Allow starred arguments in B030 by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3871 - Support mutually exclusive branches for `B031` by [@dhruvmanila](https://togithub.com/dhruvmanila) in [astral-sh/ruff#3844 - Consider logger candidate from `logging` module only by [@dhruvmanila](https://togithub.com/dhruvmanila) in [astral-sh/ruff#3878 ##### Core - Add import insertion support to autofix capabilities by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3787 - Generate `ImportMap` from module path to imported dependencies by [@chanman3388](https://togithub.com/chanman3388) in [astral-sh/ruff#3243 ##### Docs - Add documentation for `ruff-action` (GitHub Action!) by [@brucearctor](https://togithub.com/brucearctor) in [astral-sh/ruff#3857 #### New Contributors - [@AetherUnbound](https://togithub.com/AetherUnbound) made their first contribution in [astral-sh/ruff#3806 - [@Hnasar](https://togithub.com/Hnasar) made their first contribution in [astral-sh/ruff#3835 - [@nvuillam](https://togithub.com/nvuillam) made their first contribution in [astral-sh/ruff#3848 - [@brucearctor](https://togithub.com/brucearctor) made their first contribution in [astral-sh/ruff#3857 **Full Changelog**: astral-sh/ruff@v0.0.260...v0.0.261 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/allenporter/pyrainbird).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [ruff](https://togithub.com/charliermarsh/ruff) | `==0.0.260` -> `==0.0.261` | [![age](https://badges.renovateapi.com/packages/pypi/ruff/0.0.261/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/ruff/0.0.261/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/ruff/0.0.261/compatibility-slim/0.0.260)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/ruff/0.0.261/confidence-slim/0.0.260)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>charliermarsh/ruff</summary> ### [`v0.0.261`](https://togithub.com/charliermarsh/ruff/releases/tag/v0.0.261) [Compare Source](https://togithub.com/charliermarsh/ruff/compare/v0.0.260...v0.0.261)  #### What's Changed ##### Rules - \[`flake8-simplify`] Ignore `collapsible-if` violations for `if False:` and `if True:` by [@JonathanPlasse](https://togithub.com/JonathanPlasse) in [astral-sh/ruff#3732 - \[`flake8-pie`] Extend `unncessary-generator-any-all` to set comprehensions by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3824 - \[`flake8-simplify`] Implement `dict-get-with-none-default` (`SIM910`) by [@kyoto7250](https://togithub.com/kyoto7250) in [astral-sh/ruff#3874 - \[`flake8-annotations`] Additional simple magic return types by [@dhruvmanila](https://togithub.com/dhruvmanila) in [astral-sh/ruff#3805 - \[`flake8-pyi`]: fix PYI015 false positive on assignment of TypeVar & friends by [@bluetech](https://togithub.com/bluetech) in [astral-sh/ruff#3861 ##### Bug Fixes - Improve robustness of argument removal for `encode` calls by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3802 - Fix SIM222 and SIM223 false positive by [@JonathanPlasse](https://togithub.com/JonathanPlasse) in [astral-sh/ruff#3832 - When checking module visibility, don't check entire ancestry by [@Hnasar](https://togithub.com/Hnasar) in [astral-sh/ruff#3835 - Improve top-of-file insertions for required imports by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3779 - Use multi-fix semantics for `inplace` removal by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3804 - Flag non-`Name` expressions in `duplicate-isinstance-call` by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3817 - Avoid `unnecessary-comprehension-any-all` for async generators by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3823 - Fix `is_module_name()` and improve perf of `is_identifier()` by [@JonathanPlasse](https://togithub.com/JonathanPlasse) in [astral-sh/ruff#3795 - Allow starred arguments in B030 by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3871 - Support mutually exclusive branches for `B031` by [@dhruvmanila](https://togithub.com/dhruvmanila) in [astral-sh/ruff#3844 - Consider logger candidate from `logging` module only by [@dhruvmanila](https://togithub.com/dhruvmanila) in [astral-sh/ruff#3878 ##### Core - Add import insertion support to autofix capabilities by [@charliermarsh](https://togithub.com/charliermarsh) in [astral-sh/ruff#3787 - Generate `ImportMap` from module path to imported dependencies by [@chanman3388](https://togithub.com/chanman3388) in [astral-sh/ruff#3243 ##### Docs - Add documentation for `ruff-action` (GitHub Action!) by [@brucearctor](https://togithub.com/brucearctor) in [astral-sh/ruff#3857 #### New Contributors - [@AetherUnbound](https://togithub.com/AetherUnbound) made their first contribution in [astral-sh/ruff#3806 - [@Hnasar](https://togithub.com/Hnasar) made their first contribution in [astral-sh/ruff#3835 - [@nvuillam](https://togithub.com/nvuillam) made their first contribution in [astral-sh/ruff#3848 - [@brucearctor](https://togithub.com/brucearctor) made their first contribution in [astral-sh/ruff#3857 **Full Changelog**: astral-sh/ruff@v0.0.260...v0.0.261 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/allenporter/flux-local).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Fix SIM222 and SIM223 false positive

b51c5cf

charliermarsh approved these changes Mar 31, 2023

View reviewed changes

charliermarsh reviewed Mar 31, 2023

View reviewed changes

Add fixed false positives to fixtures

70009ff

charliermarsh merged commit fe38597 into astral-sh:main Mar 31, 2023
14 checks passed

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

JonathanPlasse deleted the fix-sim222-sim223-false-positive branch March 31, 2023 18:51

Tenzer mentioned this pull request Apr 5, 2023

ruff 0.0.261 Homebrew/homebrew-core#127590

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix SIM222 and SIM223 false positive #3832

Fix SIM222 and SIM223 false positive #3832

JonathanPlasse commented Mar 31, 2023

charliermarsh Mar 31, 2023

github-actions bot commented Mar 31, 2023 •

edited

Fix SIM222 and SIM223 false positive #3832

Fix SIM222 and SIM223 false positive #3832

Conversation

JonathanPlasse commented Mar 31, 2023

charliermarsh Mar 31, 2023

Choose a reason for hiding this comment

github-actions bot commented Mar 31, 2023 • edited

PR Check Results

Ecosystem

Benchmark

Linux

Windows

github-actions bot commented Mar 31, 2023 •

edited