forked from rust-lang/rust-clippy
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Merge code paths for struct and variants * Adjust the span to not include leading whitespace * Don't lint in macros * Add proc macro detection * Don't lint if there're comments inside the brackets.
- Loading branch information
Showing
7 changed files
with
274 additions
and
151 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,61 @@ | ||
#![warn(clippy::empty_enum_variants_with_brackets)] | ||
//@aux-build:proc_macros.rs | ||
#![deny(clippy::empty_enum_variants_with_brackets)] | ||
#![allow(dead_code)] | ||
|
||
extern crate proc_macros; | ||
use proc_macros::{external, with_span}; | ||
|
||
pub enum PublicTestEnum { | ||
NonEmptyBraces { x: i32, y: i32 }, // No error | ||
NonEmptyParentheses(i32, i32), // No error | ||
EmptyBraces, //~ ERROR: enum variant has empty brackets | ||
EmptyParentheses, //~ ERROR: enum variant has empty brackets | ||
NonEmptyBraces { x: i32, y: i32 }, | ||
NonEmptyParentheses(i32, i32), | ||
EmptyBraces, //~ empty_enum_variants_with_brackets | ||
EmptyParentheses, //~ empty_enum_variants_with_brackets | ||
} | ||
|
||
enum TestEnum { | ||
NonEmptyBraces { x: i32, y: i32 }, // No error | ||
NonEmptyParentheses(i32, i32), // No error | ||
EmptyBraces, //~ ERROR: enum variant has empty brackets | ||
EmptyParentheses, //~ ERROR: enum variant has empty brackets | ||
AnotherEnum, // No error | ||
NonEmptyBraces { | ||
x: i32, | ||
y: i32, | ||
}, | ||
NonEmptyParentheses(i32, i32), | ||
EmptyBraces, //~ empty_enum_variants_with_brackets | ||
EmptyParentheses, //~ empty_enum_variants_with_brackets | ||
AnotherEnum, | ||
#[rustfmt::skip] | ||
WithWhitespace, //~ empty_enum_variants_with_brackets | ||
WithComment { | ||
// Some long explanation here | ||
}, | ||
} | ||
|
||
enum TestEnumWithFeatures { | ||
NonEmptyBraces { | ||
#[cfg(feature = "thisisneverenabled")] | ||
x: i32, | ||
}, // No error | ||
NonEmptyParentheses(#[cfg(feature = "thisisneverenabled")] i32), // No error | ||
}, | ||
NonEmptyParentheses(#[cfg(feature = "thisisneverenabled")] i32), | ||
} | ||
|
||
external! { | ||
enum External { | ||
Foo {}, | ||
} | ||
} | ||
|
||
with_span! { | ||
span | ||
enum ProcMacro { | ||
Foo(), | ||
} | ||
} | ||
|
||
macro_rules! m { | ||
($($ty:ty),*) => { | ||
enum Macro { | ||
Foo($($ty),*), | ||
} | ||
} | ||
} | ||
m! {} | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,61 @@ | ||
#![warn(clippy::empty_enum_variants_with_brackets)] | ||
//@aux-build:proc_macros.rs | ||
#![deny(clippy::empty_enum_variants_with_brackets)] | ||
#![allow(dead_code)] | ||
|
||
extern crate proc_macros; | ||
use proc_macros::{external, with_span}; | ||
|
||
pub enum PublicTestEnum { | ||
NonEmptyBraces { x: i32, y: i32 }, // No error | ||
NonEmptyParentheses(i32, i32), // No error | ||
EmptyBraces {}, //~ ERROR: enum variant has empty brackets | ||
EmptyParentheses(), //~ ERROR: enum variant has empty brackets | ||
NonEmptyBraces { x: i32, y: i32 }, | ||
NonEmptyParentheses(i32, i32), | ||
EmptyBraces {}, //~ empty_enum_variants_with_brackets | ||
EmptyParentheses(), //~ empty_enum_variants_with_brackets | ||
} | ||
|
||
enum TestEnum { | ||
NonEmptyBraces { x: i32, y: i32 }, // No error | ||
NonEmptyParentheses(i32, i32), // No error | ||
EmptyBraces {}, //~ ERROR: enum variant has empty brackets | ||
EmptyParentheses(), //~ ERROR: enum variant has empty brackets | ||
AnotherEnum, // No error | ||
NonEmptyBraces { | ||
x: i32, | ||
y: i32, | ||
}, | ||
NonEmptyParentheses(i32, i32), | ||
EmptyBraces {}, //~ empty_enum_variants_with_brackets | ||
EmptyParentheses(), //~ empty_enum_variants_with_brackets | ||
AnotherEnum, | ||
#[rustfmt::skip] | ||
WithWhitespace { }, //~ empty_enum_variants_with_brackets | ||
WithComment { | ||
// Some long explanation here | ||
}, | ||
} | ||
|
||
enum TestEnumWithFeatures { | ||
NonEmptyBraces { | ||
#[cfg(feature = "thisisneverenabled")] | ||
x: i32, | ||
}, // No error | ||
NonEmptyParentheses(#[cfg(feature = "thisisneverenabled")] i32), // No error | ||
}, | ||
NonEmptyParentheses(#[cfg(feature = "thisisneverenabled")] i32), | ||
} | ||
|
||
external! { | ||
enum External { | ||
Foo {}, | ||
} | ||
} | ||
|
||
with_span! { | ||
span | ||
enum ProcMacro { | ||
Foo(), | ||
} | ||
} | ||
|
||
macro_rules! m { | ||
($($ty:ty),*) => { | ||
enum Macro { | ||
Foo($($ty),*), | ||
} | ||
} | ||
} | ||
m! {} | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,36 +1,47 @@ | ||
error: enum variant has empty brackets | ||
--> tests/ui/empty_enum_variants_with_brackets.rs:7:16 | ||
error: non-unit variant contains no fields | ||
--> tests/ui/empty_enum_variants_with_brackets.rs:11:17 | ||
| | ||
LL | EmptyBraces {}, | ||
| ^^^ | ||
| ^^ | ||
| | ||
= note: `-D clippy::empty-enum-variants-with-brackets` implied by `-D warnings` | ||
= help: to override `-D warnings` add `#[allow(clippy::empty_enum_variants_with_brackets)]` | ||
= help: remove the brackets | ||
note: the lint level is defined here | ||
--> tests/ui/empty_enum_variants_with_brackets.rs:2:9 | ||
| | ||
LL | #![deny(clippy::empty_enum_variants_with_brackets)] | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
= help: remove the braces | ||
|
||
error: enum variant has empty brackets | ||
--> tests/ui/empty_enum_variants_with_brackets.rs:8:21 | ||
error: non-unit variant contains no fields | ||
--> tests/ui/empty_enum_variants_with_brackets.rs:12:21 | ||
| | ||
LL | EmptyParentheses(), | ||
| ^^ | ||
| | ||
= help: remove the brackets | ||
= help: remove the parentheses | ||
|
||
error: enum variant has empty brackets | ||
--> tests/ui/empty_enum_variants_with_brackets.rs:14:16 | ||
error: non-unit variant contains no fields | ||
--> tests/ui/empty_enum_variants_with_brackets.rs:21:17 | ||
| | ||
LL | EmptyBraces {}, | ||
| ^^^ | ||
| ^^ | ||
| | ||
= help: remove the brackets | ||
= help: remove the braces | ||
|
||
error: enum variant has empty brackets | ||
--> tests/ui/empty_enum_variants_with_brackets.rs:15:21 | ||
error: non-unit variant contains no fields | ||
--> tests/ui/empty_enum_variants_with_brackets.rs:22:21 | ||
| | ||
LL | EmptyParentheses(), | ||
| ^^ | ||
| | ||
= help: remove the brackets | ||
= help: remove the parentheses | ||
|
||
error: non-unit variant contains no fields | ||
--> tests/ui/empty_enum_variants_with_brackets.rs:25:20 | ||
| | ||
LL | WithWhitespace { }, | ||
| ^^^^ | ||
| | ||
= help: remove the braces | ||
|
||
error: aborting due to 4 previous errors | ||
error: aborting due to 5 previous errors | ||
|
Oops, something went wrong.