bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs')
-rw-r--r--crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs24
1 files changed, 10 insertions, 14 deletions
diff --git a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs b/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs
index 6dc6e12903..ecaa3daeaf 100644
--- a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs
+++ b/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs
@@ -82,10 +82,10 @@ pub(super) struct IntRange {
impl IntRange {
#[inline]
fn is_integral(ty: &Ty) -> bool {
- match ty.kind(&Interner) {
- TyKind::Scalar(Scalar::Char | Scalar::Int(_) | Scalar::Uint(_) | Scalar::Bool) => true,
- _ => false,
- }
+ matches!(
+ ty.kind(&Interner),
+ TyKind::Scalar(Scalar::Char | Scalar::Int(_) | Scalar::Uint(_) | Scalar::Bool)
+ )
}
fn is_singleton(&self) -> bool {
@@ -729,16 +729,12 @@ impl Fields {
})
.collect();
- if let Some((adt, substs)) = pcx.ty.as_adt() {
- if let hir_def::AdtId::EnumId(_) = adt {
- let enum_variant = match ctor {
- &Variant(id) => id,
- _ => unreachable!(),
- };
- PatKind::Variant { substs: substs.clone(), enum_variant, subpatterns }
- } else {
- PatKind::Leaf { subpatterns }
- }
+ if let Some((hir_def::AdtId::EnumId(_), substs)) = pcx.ty.as_adt() {
+ let enum_variant = match ctor {
+ &Variant(id) => id,
+ _ => unreachable!(),
+ };
+ PatKind::Variant { substs: substs.clone(), enum_variant, subpatterns }
} else {
PatKind::Leaf { subpatterns }
}