Skip to content
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
14 changes: 4 additions & 10 deletions crates/passes/src/passes/lints/ast_walk/checks/manual_is_empty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,15 @@ pub fn check_manual_is_empty(expression: &Expression, ctx: &NodeCtx) {
return;
}

let negate = match operator {
Equal | LessThanOrEqual => false,
NotEqual | GreaterThan => true,
_ => return,
};
if !matches!(operator, Equal | LessThanOrEqual) {
return;
}

let Some(receiver_text) = receiver.as_dotted_path() else {
return;
};

let replacement = if negate {
format!("!{receiver_text}.is_empty()")
} else {
format!("{receiver_text}.is_empty()")
};
let replacement = format!("{receiver_text}.is_empty()");

ctx.sink
.push(diagnostics::lint::manual_is_empty(span, &replacement));
Expand Down
32 changes: 28 additions & 4 deletions tests/ui/lint/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -844,8 +844,8 @@ fn main() {
}

#[test]
fn manual_is_empty_not_equals_zero() {
assert_lint_snapshot!(
fn manual_is_empty_not_equals_zero_no_warning() {
assert_no_lint_warnings!(
r#"
fn main() {
let xs = [1, 2, 3]
Expand All @@ -856,8 +856,8 @@ fn main() {
}

#[test]
fn manual_is_empty_greater_than_zero() {
assert_lint_snapshot!(
fn manual_is_empty_greater_than_zero_no_warning() {
assert_no_lint_warnings!(
r#"
fn main() {
let xs = [1, 2, 3]
Expand Down Expand Up @@ -931,6 +931,30 @@ fn main() {
);
}

#[test]
fn manual_is_empty_zero_less_than_no_warning() {
assert_no_lint_warnings!(
r#"
fn main() {
let xs = [1, 2, 3]
let _ = 0 < xs.length()
}
"#
);
}

#[test]
fn manual_is_empty_zero_not_equals_no_warning() {
assert_no_lint_warnings!(
r#"
fn main() {
let xs = [1, 2, 3]
let _ = 0 != xs.length()
}
"#
);
}

#[test]
fn manual_is_empty_compare_one_no_warning() {
assert_no_lint_warnings!(
Expand Down
12 changes: 0 additions & 12 deletions tests/ui/lint/snapshots/manual_is_empty_greater_than_zero.snap

This file was deleted.

12 changes: 0 additions & 12 deletions tests/ui/lint/snapshots/manual_is_empty_not_equals_zero.snap

This file was deleted.

Loading