Skip to content

Don't lint literal None from expansion #9389

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 28, 2022
Merged

Don't lint literal None from expansion #9389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion clippy_lints/src/partialeq_to_none.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ impl<'tcx> LateLintPass<'tcx> for PartialeqToNone {

// If the expression is a literal `Option::None`
let is_none_ctor = |expr: &Expr<'_>| {
matches!(&peel_hir_expr_refs(expr).0.kind,
!expr.span.from_expansion()
&& matches!(&peel_hir_expr_refs(expr).0.kind,
ExprKind::Path(p) if is_lang_ctor(cx, p, LangItem::OptionNone))
};

Expand Down
12 changes: 12 additions & 0 deletions tests/ui/partialeq_to_none.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,18 @@ fn optref() -> &'static &'static Option<()> {
&&None
}

pub fn macro_expansion() {
macro_rules! foo {
() => {
None::<()>
};
}

let _ = foobar() == foo!();
let _ = foo!() == foobar();
let _ = foo!() == foo!();
}

fn main() {
let x = Some(0);

Expand Down
12 changes: 12 additions & 0 deletions tests/ui/partialeq_to_none.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,18 @@ fn optref() -> &'static &'static Option<()> {
&&None
}

pub fn macro_expansion() {
macro_rules! foo {
() => {
None::<()>
};
}

let _ = foobar() == foo!();
let _ = foo!() == foobar();
let _ = foo!() == foo!();
}

fn main() {
let x = Some(0);

Expand Down
28 changes: 14 additions & 14 deletions tests/ui/partialeq_to_none.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,55 +7,55 @@ LL | if f != None { "yay" } else { "nay" }
= note: `-D clippy::partialeq-to-none` implied by `-D warnings`

error: binary comparison to literal `Option::None`
--> $DIR/partialeq_to_none.rs:32:13
--> $DIR/partialeq_to_none.rs:44:13
|
LL | let _ = x == None;
| ^^^^^^^^^ help: use `Option::is_none()` instead: `x.is_none()`

error: binary comparison to literal `Option::None`
--> $DIR/partialeq_to_none.rs:33:13
--> $DIR/partialeq_to_none.rs:45:13
|
LL | let _ = x != None;
| ^^^^^^^^^ help: use `Option::is_some()` instead: `x.is_some()`

error: binary comparison to literal `Option::None`
--> $DIR/partialeq_to_none.rs:34:13
--> $DIR/partialeq_to_none.rs:46:13
|
LL | let _ = None == x;
| ^^^^^^^^^ help: use `Option::is_none()` instead: `x.is_none()`

error: binary comparison to literal `Option::None`
--> $DIR/partialeq_to_none.rs:35:13
--> $DIR/partialeq_to_none.rs:47:13
|
LL | let _ = None != x;
| ^^^^^^^^^ help: use `Option::is_some()` instead: `x.is_some()`

error: binary comparison to literal `Option::None`
--> $DIR/partialeq_to_none.rs:37:8
--> $DIR/partialeq_to_none.rs:49:8
|
LL | if foobar() == None {}
| ^^^^^^^^^^^^^^^^ help: use `Option::is_none()` instead: `foobar().is_none()`

error: binary comparison to literal `Option::None`
--> $DIR/partialeq_to_none.rs:39:8
--> $DIR/partialeq_to_none.rs:51:8
|
LL | if bar().ok() != None {}
| ^^^^^^^^^^^^^^^^^^ help: use `Option::is_some()` instead: `bar().ok().is_some()`

error: binary comparison to literal `Option::None`
--> $DIR/partialeq_to_none.rs:41:13
--> $DIR/partialeq_to_none.rs:53:13
|
LL | let _ = Some(1 + 2) != None;
| ^^^^^^^^^^^^^^^^^^^ help: use `Option::is_some()` instead: `Some(1 + 2).is_some()`

error: binary comparison to literal `Option::None`
--> $DIR/partialeq_to_none.rs:43:13
--> $DIR/partialeq_to_none.rs:55:13
|
LL | let _ = { Some(0) } == None;
| ^^^^^^^^^^^^^^^^^^^ help: use `Option::is_none()` instead: `{ Some(0) }.is_none()`

error: binary comparison to literal `Option::None`
--> $DIR/partialeq_to_none.rs:45:13
--> $DIR/partialeq_to_none.rs:57:13
|
LL | let _ = {
| _____________^
Expand All @@ -77,31 +77,31 @@ LL ~ }.is_some();
|

error: binary comparison to literal `Option::None`
--> $DIR/partialeq_to_none.rs:55:13
--> $DIR/partialeq_to_none.rs:67:13
|
LL | let _ = optref() == &&None;
| ^^^^^^^^^^^^^^^^^^ help: use `Option::is_none()` instead: `optref().is_none()`

error: binary comparison to literal `Option::None`
--> $DIR/partialeq_to_none.rs:56:13
--> $DIR/partialeq_to_none.rs:68:13
|
LL | let _ = &&None != optref();
| ^^^^^^^^^^^^^^^^^^ help: use `Option::is_some()` instead: `optref().is_some()`

error: binary comparison to literal `Option::None`
--> $DIR/partialeq_to_none.rs:57:13
--> $DIR/partialeq_to_none.rs:69:13
|
LL | let _ = **optref() == None;
| ^^^^^^^^^^^^^^^^^^ help: use `Option::is_none()` instead: `optref().is_none()`

error: binary comparison to literal `Option::None`
--> $DIR/partialeq_to_none.rs:58:13
--> $DIR/partialeq_to_none.rs:70:13
|
LL | let _ = &None != *optref();
| ^^^^^^^^^^^^^^^^^^ help: use `Option::is_some()` instead: `optref().is_some()`

error: binary comparison to literal `Option::None`
--> $DIR/partialeq_to_none.rs:61:13
--> $DIR/partialeq_to_none.rs:73:13
|
LL | let _ = None != *x;
| ^^^^^^^^^^ help: use `Option::is_some()` instead: `(*x).is_some()`
Expand Down