Skip to content

Improve maybe misused cfg #11840

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
Nov 19, 2023
Merged

Improve maybe misused cfg #11840

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
9 changes: 5 additions & 4 deletions clippy_lints/src/attrs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,15 +929,16 @@ fn check_nested_cfg(cx: &EarlyContext<'_>, items: &[NestedMetaItem]) {
fn check_nested_misused_cfg(cx: &EarlyContext<'_>, items: &[NestedMetaItem]) {
for item in items {
if let NestedMetaItem::MetaItem(meta) = item {
if meta.has_name(sym!(features))
if let Some(ident) = meta.ident()
&& ident.name.as_str() == "features"
&& let Some(val) = meta.value_str()
{
span_lint_and_sugg(
cx,
MAYBE_MISUSED_CFG,
meta.span,
"feature may misspelled as features",
"use",
"'feature' may be misspelled as 'features'",
"did you mean",
format!("feature = \"{val}\""),
Applicability::MaybeIncorrect,
);
Expand All @@ -953,7 +954,7 @@ fn check_nested_misused_cfg(cx: &EarlyContext<'_>, items: &[NestedMetaItem]) {
MAYBE_MISUSED_CFG,
meta.span,
&format!("'test' may be misspelled as '{}'", ident.name.as_str()),
"do you mean",
"did you mean",
"test".to_string(),
Applicability::MaybeIncorrect,
);
Expand Down
8 changes: 4 additions & 4 deletions tests/ui/cfg_features.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

fn main() {
#[cfg(feature = "not-really-a-feature")]
//~^ ERROR: feature may misspelled as features
//~^ ERROR: 'feature' may be misspelled as 'features'
//~| NOTE: `-D clippy::maybe-misused-cfg` implied by `-D warnings`
let _ = 1 + 2;

#[cfg(all(feature = "right", feature = "wrong"))]
//~^ ERROR: feature may misspelled as features
//~^ ERROR: 'feature' may be misspelled as 'features'
let _ = 1 + 2;

#[cfg(all(feature = "wrong1", any(feature = "right", feature = "wrong2", feature, features)))]
//~^ ERROR: feature may misspelled as features
//~| ERROR: feature may misspelled as features
//~^ ERROR: 'feature' may be misspelled as 'features'
//~| ERROR: 'feature' may be misspelled as 'features'
let _ = 1 + 2;

#[cfg(test)]
Expand Down
8 changes: 4 additions & 4 deletions tests/ui/cfg_features.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

fn main() {
#[cfg(features = "not-really-a-feature")]
//~^ ERROR: feature may misspelled as features
//~^ ERROR: 'feature' may be misspelled as 'features'
//~| NOTE: `-D clippy::maybe-misused-cfg` implied by `-D warnings`
let _ = 1 + 2;

#[cfg(all(feature = "right", features = "wrong"))]
//~^ ERROR: feature may misspelled as features
//~^ ERROR: 'feature' may be misspelled as 'features'
let _ = 1 + 2;

#[cfg(all(features = "wrong1", any(feature = "right", features = "wrong2", feature, features)))]
//~^ ERROR: feature may misspelled as features
//~| ERROR: feature may misspelled as features
//~^ ERROR: 'feature' may be misspelled as 'features'
//~| ERROR: 'feature' may be misspelled as 'features'
let _ = 1 + 2;

#[cfg(tests)]
Expand Down
24 changes: 12 additions & 12 deletions tests/ui/cfg_features.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
error: feature may misspelled as features
error: 'feature' may be misspelled as 'features'
--> $DIR/cfg_features.rs:4:11
|
LL | #[cfg(features = "not-really-a-feature")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use: `feature = "not-really-a-feature"`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: did you mean: `feature = "not-really-a-feature"`
|
= note: `-D clippy::maybe-misused-cfg` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::maybe_misused_cfg)]`

error: feature may misspelled as features
error: 'feature' may be misspelled as 'features'
--> $DIR/cfg_features.rs:9:34
|
LL | #[cfg(all(feature = "right", features = "wrong"))]
| ^^^^^^^^^^^^^^^^^^ help: use: `feature = "wrong"`
| ^^^^^^^^^^^^^^^^^^ help: did you mean: `feature = "wrong"`

error: feature may misspelled as features
error: 'feature' may be misspelled as 'features'
--> $DIR/cfg_features.rs:13:15
|
LL | #[cfg(all(features = "wrong1", any(feature = "right", features = "wrong2", feature, features)))]
| ^^^^^^^^^^^^^^^^^^^ help: use: `feature = "wrong1"`
| ^^^^^^^^^^^^^^^^^^^ help: did you mean: `feature = "wrong1"`

error: feature may misspelled as features
error: 'feature' may be misspelled as 'features'
--> $DIR/cfg_features.rs:13:59
|
LL | #[cfg(all(features = "wrong1", any(feature = "right", features = "wrong2", feature, features)))]
| ^^^^^^^^^^^^^^^^^^^ help: use: `feature = "wrong2"`
| ^^^^^^^^^^^^^^^^^^^ help: did you mean: `feature = "wrong2"`

error: 'test' may be misspelled as 'tests'
--> $DIR/cfg_features.rs:18:11
|
LL | #[cfg(tests)]
| ^^^^^ help: do you mean: `test`
| ^^^^^ help: did you mean: `test`

error: 'test' may be misspelled as 'Test'
--> $DIR/cfg_features.rs:21:11
|
LL | #[cfg(Test)]
| ^^^^ help: do you mean: `test`
| ^^^^ help: did you mean: `test`

error: 'test' may be misspelled as 'tests'
--> $DIR/cfg_features.rs:25:15
|
LL | #[cfg(all(tests, Test))]
| ^^^^^ help: do you mean: `test`
| ^^^^^ help: did you mean: `test`

error: 'test' may be misspelled as 'Test'
--> $DIR/cfg_features.rs:25:22
|
LL | #[cfg(all(tests, Test))]
| ^^^^ help: do you mean: `test`
| ^^^^ help: did you mean: `test`

error: aborting due to 8 previous errors