Skip to content

Fix wildcard_enum_match_arm suggests wrongly with raw identifiers #15093

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

Merged
merged 1 commit into from
Jun 21, 2025
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
12 changes: 7 additions & 5 deletions clippy_lints/src/matches/match_wild_enum.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use clippy_utils::diagnostics::{span_lint_and_sugg, span_lint_and_then};
use clippy_utils::source::SpanRangeExt;
use clippy_utils::ty::is_type_diagnostic_item;
use clippy_utils::{is_refutable, peel_hir_pat_refs, recurse_or_patterns};
use rustc_errors::Applicability;
Expand Down Expand Up @@ -116,11 +117,12 @@ pub(crate) fn check(cx: &LateContext<'_>, ex: &Expr<'_>, arms: &[Arm<'_>]) {
let format_suggestion = |variant: &VariantDef| {
format!(
"{}{}{}{}",
if let Some(ident) = wildcard_ident {
format!("{} @ ", ident.name)
} else {
String::new()
},
wildcard_ident.map_or(String::new(), |ident| {
ident
.span
.get_source_text(cx)
.map_or_else(|| format!("{} @ ", ident.name), |s| format!("{s} @ "))
}),
if let CommonPrefixSearcher::Path(path_prefix) = path_prefix {
let mut s = String::new();
for seg in path_prefix {
Expand Down
14 changes: 14 additions & 0 deletions tests/ui/wildcard_enum_match_arm.fixed
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,17 @@ fn main() {
}
}
}

fn issue15091() {
enum Foo {
A,
B,
C,
}

match Foo::A {
Foo::A => {},
r#type @ Foo::B | r#type @ Foo::C => {},
//~^ wildcard_enum_match_arm
}
}
14 changes: 14 additions & 0 deletions tests/ui/wildcard_enum_match_arm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,17 @@ fn main() {
}
}
}

fn issue15091() {
enum Foo {
A,
B,
C,
}

match Foo::A {
Foo::A => {},
r#type => {},
//~^ wildcard_enum_match_arm
}
}
8 changes: 7 additions & 1 deletion tests/ui/wildcard_enum_match_arm.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,11 @@ error: wildcard match will also match any future added variants
LL | _ => (),
| ^ help: try: `Enum::B | Enum::__Private`

error: aborting due to 6 previous errors
error: wildcard match will also match any future added variants
--> tests/ui/wildcard_enum_match_arm.rs:118:9
|
LL | r#type => {},
| ^^^^^^ help: try: `r#type @ Foo::B | r#type @ Foo::C`

error: aborting due to 7 previous errors