mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-11-09 07:50:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix SIM110 and SIM111 ranges (#4545)

Browse source
This commit is contained in:
Jonathan Plasse 2023-05-20 18:40:35 +02:00 • committed by GitHub
parent fe7f2e2e4d
commit a68c865010
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ruff/src/rules/flake8_simplify/rules/reimplemented_builtin.rs
View file

@ -236,7 +236,7 @@ pub(crate) fn convert_for_loop_to_any_all(
ReimplementedBuiltin { ReimplementedBuiltin {
repl: contents.clone(), repl: contents.clone(),
}, },
stmt.range(), TextRange::new(stmt.start(), loop_info.terminal),
); );
if checker.patch(diagnostic.kind.rule()) && checker.ctx.is_builtin("any") { if checker.patch(diagnostic.kind.rule()) && checker.ctx.is_builtin("any") {
#[allow(deprecated)] #[allow(deprecated)]
@ -326,7 +326,7 @@ pub(crate) fn convert_for_loop_to_any_all(
ReimplementedBuiltin { ReimplementedBuiltin {
repl: contents.clone(), repl: contents.clone(),
}, },
stmt.range(), TextRange::new(stmt.start(), loop_info.terminal),
); );
if checker.patch(diagnostic.kind.rule()) && checker.ctx.is_builtin("all") { if checker.patch(diagnostic.kind.rule()) && checker.ctx.is_builtin("all") {
#[allow(deprecated)] #[allow(deprecated)]

28
crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM110_SIM110.py.snap
View file

@ -9,8 +9,8 @@ SIM110.py:3:5: SIM110 [*] Use `return any(check(x) for x in iterable)` instead o
| _____^ | _____^
6 | | if check(x): 6 | | if check(x):
7 | | return True 7 | | return True
| |_______________________^ SIM110 8 | | return False
8 | return False | |________________^ SIM110
| |
= help: Replace with `return any(check(x) for x in iterable)` = help: Replace with `return any(check(x) for x in iterable)`
@ -34,8 +34,8 @@ SIM110.py:25:5: SIM110 [*] Use `return all(not check(x) for x in iterable)` inst
| _____^ | _____^
28 | | if check(x): 28 | | if check(x):
29 | | return False 29 | | return False
| |________________________^ SIM110 30 | | return True
30 | return True | |_______________^ SIM110
| |
= help: Replace with `return all(not check(x) for x in iterable)` = help: Replace with `return all(not check(x) for x in iterable)`
@ -60,8 +60,8 @@ SIM110.py:33:5: SIM110 [*] Use `return all(x.is_empty() for x in iterable)` inst
| _____^ | _____^
36 | | if not x.is_empty(): 36 | | if not x.is_empty():
37 | | return False 37 | | return False
| |________________________^ SIM110 38 | | return True
38 | return True | |_______________^ SIM110
| |
= help: Replace with `return all(x.is_empty() for x in iterable)` = help: Replace with `return all(x.is_empty() for x in iterable)`
@ -200,8 +200,8 @@ SIM110.py:124:5: SIM110 Use `return any(check(x) for x in iterable)` instead of
| _____^ | _____^
127 | | if check(x): 127 | | if check(x):
128 | | return True 128 | | return True
| |_______________________^ SIM110 129 | | return False
129 | return False | |________________^ SIM110
| |
= help: Replace with `return any(check(x) for x in iterable)` = help: Replace with `return any(check(x) for x in iterable)`
@ -213,8 +213,8 @@ SIM110.py:134:5: SIM110 Use `return all(not check(x) for x in iterable)` instead
| _____^ | _____^
137 | | if check(x): 137 | | if check(x):
138 | | return False 138 | | return False
| |________________________^ SIM110 139 | | return True
139 | return True | |_______________^ SIM110
| |
= help: Replace with `return all(not check(x) for x in iterable)` = help: Replace with `return all(not check(x) for x in iterable)`
@ -225,8 +225,8 @@ SIM110.py:144:5: SIM110 [*] Use `return any(check(x) for x in iterable)` instead
| _____^ | _____^
146 | | if check(x): 146 | | if check(x):
147 | | return True 147 | | return True
| |_______________________^ SIM110 148 | | return False
148 | return False | |________________^ SIM110
| |
= help: Replace with `return any(check(x) for x in iterable)` = help: Replace with `return any(check(x) for x in iterable)`
@ -250,8 +250,8 @@ SIM110.py:154:5: SIM110 [*] Use `return all(not check(x) for x in iterable)` ins
| _____^ | _____^
156 | | if check(x): 156 | | if check(x):
157 | | return False 157 | | return False
| |________________________^ SIM110 158 | | return True
158 | return True | |_______________^ SIM110
| |
= help: Replace with `return all(not check(x) for x in iterable)` = help: Replace with `return all(not check(x) for x in iterable)`

36
crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM110_SIM111.py.snap
View file

@ -9,8 +9,8 @@ SIM111.py:3:5: SIM110 [*] Use `return any(check(x) for x in iterable)` instead o
| _____^ | _____^
6 | | if check(x): 6 | | if check(x):
7 | | return True 7 | | return True
| |_______________________^ SIM110 8 | | return False
8 | return False | |________________^ SIM110
| |
= help: Replace with `return any(check(x) for x in iterable)` = help: Replace with `return any(check(x) for x in iterable)`
@ -34,8 +34,8 @@ SIM111.py:25:5: SIM110 [*] Use `return all(not check(x) for x in iterable)` inst
| _____^ | _____^
28 | | if check(x): 28 | | if check(x):
29 | | return False 29 | | return False
| |________________________^ SIM110 30 | | return True
30 | return True | |_______________^ SIM110
| |
= help: Replace with `return all(not check(x) for x in iterable)` = help: Replace with `return all(not check(x) for x in iterable)`
@ -60,8 +60,8 @@ SIM111.py:33:5: SIM110 [*] Use `return all(x.is_empty() for x in iterable)` inst
| _____^ | _____^
36 | | if not x.is_empty(): 36 | | if not x.is_empty():
37 | | return False 37 | | return False
| |________________________^ SIM110 38 | | return True
38 | return True | |_______________^ SIM110
| |
= help: Replace with `return all(x.is_empty() for x in iterable)` = help: Replace with `return all(x.is_empty() for x in iterable)`
@ -200,8 +200,8 @@ SIM111.py:124:5: SIM110 Use `return any(check(x) for x in iterable)` instead of
| _____^ | _____^
127 | | if check(x): 127 | | if check(x):
128 | | return True 128 | | return True
| |_______________________^ SIM110 129 | | return False
129 | return False | |________________^ SIM110
| |
= help: Replace with `return any(check(x) for x in iterable)` = help: Replace with `return any(check(x) for x in iterable)`
@ -213,8 +213,8 @@ SIM111.py:134:5: SIM110 Use `return all(not check(x) for x in iterable)` instead
| _____^ | _____^
137 | | if check(x): 137 | | if check(x):
138 | | return False 138 | | return False
| |________________________^ SIM110 139 | | return True
139 | return True | |_______________^ SIM110
| |
= help: Replace with `return all(not check(x) for x in iterable)` = help: Replace with `return all(not check(x) for x in iterable)`
@ -225,8 +225,8 @@ SIM111.py:144:5: SIM110 [*] Use `return any(check(x) for x in iterable)` instead
| _____^ | _____^
146 | | if check(x): 146 | | if check(x):
147 | | return True 147 | | return True
| |_______________________^ SIM110 148 | | return False
148 | return False | |________________^ SIM110
| |
= help: Replace with `return any(check(x) for x in iterable)` = help: Replace with `return any(check(x) for x in iterable)`
@ -250,8 +250,8 @@ SIM111.py:154:5: SIM110 [*] Use `return all(not check(x) for x in iterable)` ins
| _____^ | _____^
156 | | if check(x): 156 | | if check(x):
157 | | return False 157 | | return False
| |________________________^ SIM110 158 | | return True
158 | return True | |_______________^ SIM110
| |
= help: Replace with `return all(not check(x) for x in iterable)` = help: Replace with `return all(not check(x) for x in iterable)`
@ -276,8 +276,8 @@ SIM111.py:162:5: SIM110 [*] Use `return all(x in y for x in iterable)` instead o
| _____^ | _____^
165 | | if x not in y: 165 | | if x not in y:
166 | | return False 166 | | return False
| |________________________^ SIM110 167 | | return True
167 | return True | |_______________^ SIM110
| |
= help: Replace with `return all(x in y for x in iterable)` = help: Replace with `return all(x in y for x in iterable)`
@ -302,8 +302,8 @@ SIM111.py:170:5: SIM110 [*] Use `return all(x <= y for x in iterable)` instead o
| _____^ | _____^
173 | | if x > y: 173 | | if x > y:
174 | | return False 174 | | return False
| |________________________^ SIM110 175 | | return True
175 | return True | |_______________^ SIM110
| |
= help: Replace with `return all(x <= y for x in iterable)` = help: Replace with `return all(x <= y for x in iterable)`