not_exhaustive_enough

jrqc · jrqc · commit 7f65cabb36b1 · 2020-12-30T09:55:28.000+03:00
diff --git a/clippy_lints/src/not_exhaustive_enough.rs b/clippy_lints/src/not_exhaustive_enough.rs
@@ -47,7 +47,6 @@ impl<'tcx> LateLintPass<'tcx> for NotExhaustiveEnough {
         if_chain! {
             if let PatKind::Struct(_, ref field_pats, ref rest_pat) = &pat.kind;
             if let ty::Adt(adt_def, _) = cx.typeck_results().pat_ty(pat).kind();
-            if adt_def.is_struct();
             if is_struct_not_exhaustive(adt_def);
             if *rest_pat;
             if !field_pats.is_empty();
@@ -96,18 +95,17 @@ fn check_struct_pat<'tcx>(
     field_defs: &[ty::FieldDef],
 ) {
     let missing_fields = get_missing_fields(field_pats, field_defs);
-    if missing_fields.len() > 0 {
-    let mut suggestions = vec![];
-    suggestions = missing_fields.iter().map(|v| v.to_owned() + ": _").collect();
-    span_lint_and_sugg(
-        cx,
-        NOT_EXHAUSTIVE_ENOUGH,
-        pat.span,
-        "struct match is not exhaustive enough",
-        "try adding missing fields",
-        suggestions.join(" , "),
-        Applicability::MaybeIncorrect,
-    );
+    if !missing_fields.is_empty() {
+        let suggestions: Vec<String> = missing_fields.iter().map(|v| v.to_owned() + ": _").collect();
+        span_lint_and_sugg(
+            cx,
+            NOT_EXHAUSTIVE_ENOUGH,
+            pat.span,
+            "struct match is not exhaustive enough",
+            "try adding missing fields",
+            suggestions.join(" , "),
+            Applicability::MaybeIncorrect,
+        );
     }
 }
 
@@ -122,16 +120,12 @@ fn get_missing_variants<'tcx>(cx: &LateContext<'tcx>, arms: &[Arm<'_>], e: &'tcx
     for arm in arms {
         if let PatKind::Path(ref path) = arm.pat.kind {
             if let QPath::Resolved(_, p) = path {
-                println!("{:?}", path);
                 missing_variants.retain(|e| e.ctor_def_id != Some(p.res.def_id()));
             }
-        } else if let PatKind::TupleStruct(ref path, ref patterns, ..) = arm.pat.kind {
-            if let QPath::Resolved(_, p) = path {
-                let is_pattern_exhaustive =
-                    |pat: &&Pat<'_>| matches!(pat.kind, PatKind::Wild | PatKind::Binding(.., None));
-                if patterns.iter().all(is_pattern_exhaustive) {
-                    missing_variants.retain(|e| e.ctor_def_id != Some(p.res.def_id()));
-                }
+        } else if let PatKind::TupleStruct(QPath::Resolved(_, p), ref patterns, ..) = arm.pat.kind {
+            let is_pattern_exhaustive = |pat: &&Pat<'_>| matches!(pat.kind, PatKind::Wild | PatKind::Binding(.., None));
+            if patterns.iter().all(is_pattern_exhaustive) {
+                missing_variants.retain(|e| e.ctor_def_id != Some(p.res.def_id()));
             }
         }
     }
diff --git a/clippy_lints/src/types.rs b/clippy_lints/src/types.rs
@@ -1104,9 +1104,7 @@ fn is_empty_block(expr: &Expr<'_>) -> bool {
         expr.kind,
         ExprKind::Block(
             Block {
-                stmts: &[],
-                expr: None,
-                ..
+                stmts: &[], expr: None, ..
             },
             _,
         )
diff --git a/tests/ui/auxiliary/not_exhaustive_enough_helper.rs b/tests/ui/auxiliary/not_exhaustive_enough_helper.rs
@@ -1,5 +1,3 @@
-
-
 #[non_exhaustive]
 pub enum AnotherCrateEnum {
     AFirst,
diff --git a/tests/ui/not_exhaustive_enough.rs b/tests/ui/not_exhaustive_enough.rs
@@ -9,116 +9,124 @@ extern crate not_exhaustive_enough_helper;
 use not_exhaustive_enough_helper::{AnotherCrateEnum, AnotherCrateStruct, TPrivateField};
 
 #[non_exhaustive]
-pub enum E {
+pub enum DefaultEnum {
     First,
     Second,
     Third,
 }
 
 #[non_exhaustive]
-pub enum K {
+pub enum DataEnum {
     First(String),
     Second(u32, u32),
-    Third(String)
+    Third(String),
 }
 
-enum EF {
+pub enum StructVariantEnum1 {
     #[non_exhaustive]
-    V{a: i32, b: i32}
+    V { a: i32, b: i32 },
 }
 
-enum F {
+pub enum StructVariantEnum2 {
     #[non_exhaustive]
-    V{a: i32, b: i32},
-    A{c: u32}
+    V {
+        a: i32,
+        b: i32,
+    },
+    A {
+        c: u32,
+    },
 }
 
 #[derive(Default)]
 #[non_exhaustive]
-pub struct S {
+pub struct DefaultStruct {
     pub a: i32,
     pub b: i32,
     pub c: i32,
 }
 
 #[derive(Default)]
 #[non_exhaustive]
-pub struct T(pub i32, pub i32, pub i32);
-
+pub struct DefaultTuple(pub i32, pub i32, pub i32);
 
 fn main() {
     //////// Enum
 
-    let e = E::First;
+    let default_enum = DefaultEnum::First;
 
-    let ef = EF::V{a: 1, b:2};
+    let struct_variant_enum_1 = StructVariantEnum1::V { a: 1, b: 2 };
 
-    let f = F::V{a:1, b:2};
+    let struct_variant_enum_2 = StructVariantEnum2::V { a: 1, b: 2 };
 
-    match e {
-        E::First => {},
-        E::Second => {},
+    match default_enum {
+        DefaultEnum::First => {},
+        DefaultEnum::Second => {},
         _ => {},
     }
 
-    match ef {
-        EF::V{a:_, ..} => {}
+    match struct_variant_enum_1 {
+        StructVariantEnum1::V { a: _, .. } => {},
     }
 
-    if let F::V{a:_, ..} = f {}
+    match struct_variant_enum_2 {
+        StructVariantEnum2::V { a: _, .. } => {},
+        _ => {},
+    }
 
     //
+
     let example = "Example".to_string();
-    let k = K::First(example);
+    let data_enum = DataEnum::First(example);
 
-    match k {
-        K::First(..) => {},
-        K::Second(..) => {},
+    match data_enum {
+        DataEnum::First(..) => {},
+        DataEnum::Second(..) => {},
         _ => {},
     }
 
     //////// Struct
 
-    let S { a: _, b: _, .. } = S::default();
+    let DefaultStruct { a: _, b: _, .. } = DefaultStruct::default();
 
-    match S::default() {
-        S { a: 42, b: 21, .. } => {},
-        S { a: _, b: _, .. } => {},
+    match DefaultStruct::default() {
+        DefaultStruct { a: 42, b: 21, .. } => {},
+        DefaultStruct { a: _, b: _, .. } => {},
     }
 
-    if let S { a: 42, b: _, .. } = S::default() {}
+    if let DefaultStruct { a: 42, b: _, .. } = DefaultStruct::default() {}
 
-    let v = vec![S::default()];
+    let v = vec![DefaultStruct::default()];
 
-    for S { a: _, b: _, .. } in v {}
+    for DefaultStruct { a: _, b: _, .. } in v {}
 
-    while let S { a: 42, b: _, .. } = S::default() {
+    while let DefaultStruct { a: 42, b: _, .. } = DefaultStruct::default() {
         break;
     }
 
-    pub fn take_s(S { a, b, .. }: S) -> (i32, i32) {
+    pub fn take_s(DefaultStruct { a, b, .. }: DefaultStruct) -> (i32, i32) {
         (a, b)
     }
 
     //////// Tuple Struct
 
-    let T { 0: _, 1: _, .. } = T::default();
+    let DefaultTuple { 0: _, 1: _, .. } = DefaultTuple::default();
 
-    match T::default() {
-        T { 0: 42, 1: 21, .. } => {},
-        T { 0: _, 1: _, .. } => {},
+    match DefaultTuple::default() {
+        DefaultTuple { 0: 42, 1: 21, .. } => {},
+        DefaultTuple { 0: _, 1: _, .. } => {},
     }
 
-    if let T { 0: 42, 1: _, .. } = T::default() {}
+    if let DefaultTuple { 0: 42, 1: _, .. } = DefaultTuple::default() {}
 
-    let v = vec![T::default()];
-    for T { 0: _, 1: _, .. } in v {}
+    let default_tuple = vec![DefaultTuple::default()];
+    for DefaultTuple { 0: _, 1: _, .. } in default_tuple {}
 
-    while let T { 0: 42, 1: _, .. } = T::default() {
+    while let DefaultTuple { 0: 42, 1: _, .. } = DefaultTuple::default() {
         break;
     }
 
-    pub fn take_t(T { 0: _, 1: _, .. }: T) -> (i32, i32) {
+    pub fn take_t(DefaultTuple { 0: _, 1: _, .. }: DefaultTuple) -> (i32, i32) {
         (0, 1)
     }
 
@@ -132,8 +140,8 @@ fn main() {
     }
 
     match TPrivateField::default() {
-        TPrivateField {1: 21, .. } => {},
-        _ => {}
+        TPrivateField { 1: 21, .. } => {},
+        _ => {},
     }
 
     if let TPrivateField { 0: 42, 1: _, .. } = TPrivateField::default() {}
diff --git a/tests/ui/not_exhaustive_enough.stderr b/tests/ui/not_exhaustive_enough.stderr

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-`
`2`		`-`
`3`	`1`	`#[non_exhaustive]`
`4`	`2`	`pub enum AnotherCrateEnum {`
`5`	`3`	`AFirst,`