From b292e1b9da39813e2739cb450c263e7502c97c8d Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sun, 13 Jun 2021 21:44:31 +0300
Subject: internal: refactor missing match arms diagnostics

---
 crates/hir/src/diagnostics.rs | 19 +------------------
 crates/hir/src/lib.rs         | 13 ++++++++-----
 2 files changed, 9 insertions(+), 23 deletions(-)

(limited to 'crates/hir/src')

diff --git a/crates/hir/src/diagnostics.rs b/crates/hir/src/diagnostics.rs
index c2d608eb5..5cffef47f 100644
--- a/crates/hir/src/diagnostics.rs
+++ b/crates/hir/src/diagnostics.rs
@@ -38,6 +38,7 @@ diagnostics![
     MacroError,
     MismatchedArgCount,
     MissingFields,
+    MissingMatchArms,
     MissingOkOrSomeInTailExpr,
     MissingUnsafe,
     NoSuchField,
@@ -149,9 +150,6 @@ pub struct MissingOkOrSomeInTailExpr {
     pub required: String,
 }
 
-// Diagnostic: missing-match-arm
-//
-// This diagnostic is triggered if `match` block is missing one or more match arms.
 #[derive(Debug)]
 pub struct MissingMatchArms {
     pub file: HirFileId,
@@ -159,21 +157,6 @@ pub struct MissingMatchArms {
     pub arms: AstPtr<ast::MatchArmList>,
 }
 
-impl Diagnostic for MissingMatchArms {
-    fn code(&self) -> DiagnosticCode {
-        DiagnosticCode("missing-match-arm")
-    }
-    fn message(&self) -> String {
-        String::from("Missing match arm")
-    }
-    fn display_source(&self) -> InFile<SyntaxNodePtr> {
-        InFile { file_id: self.file, value: self.match_expr.clone().into() }
-    }
-    fn as_any(&self) -> &(dyn Any + Send + 'static) {
-        self
-    }
-}
-
 #[derive(Debug)]
 pub struct InternalBailedOut {
     pub file: HirFileId,
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index fc147ade3..2e794ff4a 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -1209,11 +1209,14 @@ impl Function {
                                 if let (Some(match_expr), Some(arms)) =
                                     (match_expr.expr(), match_expr.match_arm_list())
                                 {
-                                    sink.push(MissingMatchArms {
-                                        file: source_ptr.file_id,
-                                        match_expr: AstPtr::new(&match_expr),
-                                        arms: AstPtr::new(&arms),
-                                    })
+                                    acc.push(
+                                        MissingMatchArms {
+                                            file: source_ptr.file_id,
+                                            match_expr: AstPtr::new(&match_expr),
+                                            arms: AstPtr::new(&arms),
+                                        }
+                                        .into(),
+                                    )
                                 }
                             }
                         }
-- 
cgit v1.2.3