Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: let SIM103 return expressions without bool() wrapping #2410

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions resources/test/fixtures/flake8_simplify/SIM103.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ def f():
return False


def f():
# SIM103
if a == b:
return True
else:
return False


def f():
# SIM103
if a:
Expand Down
25 changes: 15 additions & 10 deletions src/rules/flake8_simplify/rules/ast_if.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,16 +184,21 @@ pub fn return_bool_condition_directly(checker: &mut Checker, stmt: &Stmt) {
&& matches!(else_return, Bool::False)
&& !has_comments(stmt, checker.locator)
{
let return_stmt = create_stmt(StmtKind::Return {
value: Some(Box::new(create_expr(ExprKind::Call {
func: Box::new(create_expr(ExprKind::Name {
id: "bool".to_string(),
ctx: ExprContext::Load,
})),
args: vec![(**test).clone()],
keywords: vec![],
}))),
});
let return_stmt = match test.node {
ExprKind::Compare { .. } => create_stmt(StmtKind::Return {
value: Some(test.clone()),
}),
_ => create_stmt(StmtKind::Return {
value: Some(Box::new(create_expr(ExprKind::Call {
func: Box::new(create_expr(ExprKind::Name {
id: "bool".to_string(),
ctx: ExprContext::Load,
})),
args: vec![(**test).clone()],
keywords: vec![],
}))),
}),
};
diagnostic.amend(Fix::replacement(
unparse_stmt(&return_stmt, checker.stylist),
stmt.location,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,52 +21,71 @@ expression: diagnostics
row: 6
column: 20
parent: ~
- kind:
ReturnBoolConditionDirectly:
cond: a == b
location:
row: 11
column: 4
end_location:
row: 14
column: 20
fix:
content:
- return a == b
location:
row: 11
column: 4
end_location:
row: 14
column: 20
parent: ~
- kind:
ReturnBoolConditionDirectly:
cond: b
location:
row: 13
row: 21
column: 4
end_location:
row: 16
row: 24
column: 20
fix:
content:
- return bool(b)
location:
row: 13
row: 21
column: 4
end_location:
row: 16
row: 24
column: 20
parent: ~
- kind:
ReturnBoolConditionDirectly:
cond: b
location:
row: 24
row: 32
column: 8
end_location:
row: 27
row: 35
column: 24
fix:
content:
- return bool(b)
location:
row: 24
row: 32
column: 8
end_location:
row: 27
row: 35
column: 24
parent: ~
- kind:
ReturnBoolConditionDirectly:
cond: a
location:
row: 49
row: 57
column: 4
end_location:
row: 52
row: 60
column: 19
fix: ~
parent: ~
Expand Down